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/Route40.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'maps/Route40.asm') diff --git a/maps/Route40.asm b/maps/Route40.asm index 7f0563f60..4e9abcade 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 @@ -13,9 +13,9 @@ const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: @@ -338,16 +338,16 @@ Route40SignText: Route40_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 10, BGEVENT_READ, Route40Sign bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion - db 12 ; object events + def_object_events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 -- cgit v1.2.3