From dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 24 Jul 2020 09:49:26 -0400 Subject: Use def_* macros for automatic map event counts Resolves #742 --- maps/Route2Gate.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'maps/Route2Gate.asm') diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 0bc8e9fd4..a037c6023 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route2GateScientistScript: jumptextfaceplayer Route2GateScientistText @@ -26,15 +26,15 @@ Route2GateScientistText: Route2Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 4, 0, ROUTE_2, 3 warp_event 5, 0, ROUTE_2, 4 warp_event 4, 7, ROUTE_2, 2 warp_event 5, 7, ROUTE_2, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 -- cgit v1.2.3