From fcfe77bc3db73afd2001c21ec9cc1cfb1beca20e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 1 Feb 2018 12:40:58 -0500 Subject: Meaningful scene constant names (Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event) --- maps/Route25.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maps/Route25.asm') diff --git a/maps/Route25.asm b/maps/Route25.asm index d6cd9ba09..7732f06bf 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -13,8 +13,8 @@ Route25_MapScripts: db 2 ; scene scripts - scene_script .DummyScene0 ; SCENE_ROUTE25_0 - scene_script .DummyScene1 ; SCENE_ROUTE25_1 + scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE db 0 ; callbacks @@ -46,7 +46,7 @@ Route25MistyDate1Script: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene SCENE_ROUTE25_0 + setscene SCENE_ROUTE25_NOTHING special RestartMapMusic end @@ -72,7 +72,7 @@ Route25MistyDate2Script: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene SCENE_ROUTE25_0 + setscene SCENE_ROUTE25_NOTHING special RestartMapMusic end @@ -434,8 +434,8 @@ Route25_MapEvents: warp_event 47, 5, 1, BILLS_HOUSE db 2 ; coord events - coord_event 42, 6, SCENE_ROUTE25_1, Route25MistyDate1Script - coord_event 42, 7, SCENE_ROUTE25_1, Route25MistyDate2Script + coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script + coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script db 2 ; bg events bg_event 45, 5, BGEVENT_READ, BillsHouseSign -- cgit v1.2.3