summaryrefslogtreecommitdiff
path: root/maps/PowerPlant.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/PowerPlant.asm
parent7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6 (diff)
Add scene ID constants (TODO: meaningful names)
Diffstat (limited to 'maps/PowerPlant.asm')
-rw-r--r--maps/PowerPlant.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 1ecdc7656..e52e9f540 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -9,8 +9,8 @@
PowerPlant_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_POWERPLANT_0
+ scene_script .DummyScene1 ; SCENE_POWERPLANT_1
db 0 ; callbacks
@@ -40,7 +40,7 @@ PowerPlantGuardPhoneScript:
closetext
spriteface PLAYER, DOWN
applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
- setscene 0
+ setscene SCENE_POWERPLANT_0
end
OfficerScript_0x188df5:
@@ -146,8 +146,8 @@ PowerPlantManager:
setevent EVENT_MET_MANAGER_AT_POWER_PLANT
clearevent EVENT_CERULEAN_GYM_ROCKET
clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
- setmapscene CERULEAN_GYM, 1
- setscene 1
+ setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_1
+ setscene SCENE_POWERPLANT_1
end
UnknownScript_0x188e8d:
@@ -394,7 +394,7 @@ PowerPlant_MapEvents:
warp_event 3, 17, 2, ROUTE_10_NORTH
db 1 ; coord events
- coord_event 5, 12, 1, PowerPlantGuardPhoneScript
+ coord_event 5, 12, SCENE_POWERPLANT_1, PowerPlantGuardPhoneScript
db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf