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/Route36NationalParkGate.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route36NationalParkGate.asm')
| -rw-r--r-- | maps/Route36NationalParkGate.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index adf57ce0d..c0fd51773 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 @@ -13,12 +13,12 @@ const ROUTE36NATIONALPARKGATE_OFFICER2 Route36NationalParkGate_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -852,18 +852,18 @@ Route36NationalParkGateOfficer1HeresThePrizeText: Route36NationalParkGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 0, 4, NATIONAL_PARK, 1 warp_event 0, 5, NATIONAL_PARK, 2 warp_event 9, 4, ROUTE_36, 1 warp_event 9, 5, ROUTE_36, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 6, 0, BGEVENT_READ, BugCatchingContestExplanationSign - db 12 ; object events + def_object_events object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1BScript, EVENT_BUG_CATCHING_CONTESTANT_1B object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2BScript, EVENT_BUG_CATCHING_CONTESTANT_2B |