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/Route43Gate.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route43Gate.asm')
| -rw-r--r-- | maps/Route43Gate.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 747dd3f45..7645fdcc4 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,16 +1,16 @@ ROUTE43GATE_TOLL EQU 1000 - object_const_def ; object_event constants + object_const_def const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 Route43Gate_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .RocketShakedown ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: @@ -248,17 +248,17 @@ OfficerText_AvoidGrass: Route43Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 4, 0, ROUTE_43, 4 warp_event 5, 0, ROUTE_43, 5 warp_event 4, 7, ROUTE_43, 3 warp_event 5, 7, ROUTE_43, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS |