diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/Route36.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route36.asm')
| -rw-r--r-- | maps/Route36.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm index 68132ef83..9ad2c83f4 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE @@ -10,11 +10,11 @@ const ROUTE36_SUICUNE Route36_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: @@ -660,23 +660,23 @@ Route36TrainerTips2Text: Route36_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3 warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4 warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1 warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2 - db 2 ; coord events + def_coord_events coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript - db 4 ; bg events + def_bg_events bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign bg_event 55, 7, BGEVENT_READ, Route36Sign bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 - db 9 ; object events + def_object_events object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO |