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/Route7SaffronGate.asm | |
parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route7SaffronGate.asm')
-rw-r--r-- | maps/Route7SaffronGate.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 4835a87ed..7aca3e901 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route7SaffronGuardScript: faceplayer @@ -46,15 +46,15 @@ Route7SaffronGuardSeriousText: Route7SaffronGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 0, 4, ROUTE_7, 1 warp_event 0, 5, ROUTE_7, 2 warp_event 9, 4, SAFFRON_CITY, 10 warp_event 9, 5, SAFFRON_CITY, 11 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 |