summaryrefslogtreecommitdiff
path: root/maps/Route25.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-31 23:16:51 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-31 23:16:51 -0500
commita17623d96b25d6733846f5774fd10bb317862b43 (patch)
treefe13b09b13f1eb102c31dd31ce0cc8d0c2d6ae02 /maps/Route25.asm
parent7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6 (diff)
Add scene ID constants (TODO: meaningful names)
Diffstat (limited to 'maps/Route25.asm')
-rw-r--r--maps/Route25.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a67718922..d6cd9ba09 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -13,8 +13,8 @@
Route25_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE25_0
+ scene_script .DummyScene1 ; SCENE_ROUTE25_1
db 0 ; callbacks
@@ -46,7 +46,7 @@ Route25MistyDate1Script:
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
- setscene 0
+ setscene SCENE_ROUTE25_0
special RestartMapMusic
end
@@ -72,7 +72,7 @@ Route25MistyDate2Script:
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
- setscene 0
+ setscene SCENE_ROUTE25_0
special RestartMapMusic
end
@@ -434,8 +434,8 @@ Route25_MapEvents:
warp_event 47, 5, 1, BILLS_HOUSE
db 2 ; coord events
- coord_event 42, 6, 1, Route25MistyDate1Script
- coord_event 42, 7, 1, Route25MistyDate2Script
+ coord_event 42, 6, SCENE_ROUTE25_1, Route25MistyDate1Script
+ coord_event 42, 7, SCENE_ROUTE25_1, Route25MistyDate2Script
db 2 ; bg events
bg_event 45, 5, BGEVENT_READ, BillsHouseSign