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/Colosseum.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Colosseum.asm')
| -rw-r--r-- | maps/Colosseum.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a26dcec34..85f1b2c27 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 Colosseum_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .InitializeColosseum ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene2 ; unused - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F @@ -63,16 +63,16 @@ CableClubFriendScript: Colosseum_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 3 warp_event 5, 7, POKECENTER_2F, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 4, BGEVENT_RIGHT, ColosseumConsoleScript bg_event 5, 4, BGEVENT_LEFT, ColosseumConsoleScript - db 2 ; object events + def_object_events object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 |