Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use def_* macros for automatic map event counts

Browse Source 
Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/Route3.asm
View File

@@ -1,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const ROUTE3_FISHER1
const ROUTE3_YOUNGSTER1
const ROUTE3_YOUNGSTER2
const ROUTE3_FISHER2
Route3_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerFirebreatherOtis:
trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
@@ -133,15 +133,15 @@ Route3MtMoonSquareSignText:
Route3_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 52, 1, MOUNT_MOON, 1
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 49, 13, BGEVENT_READ, Route3MtMoonSquareSign
db 4 ; object events
def_object_events
object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1