summaryrefslogtreecommitdiff
path: root/maps/Pokecenter2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Pokecenter2F.asm')
-rw-r--r--maps/Pokecenter2F.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 8b7eafc61..7bdc6e670 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -6,12 +6,12 @@
Pokecenter2F_MapScripts:
db 6 ; scene scripts
- scene_script .Scene0
- scene_script .Scene1
- scene_script .Scene2
- scene_script .Scene3
- scene_script .Scene4
- scene_script .Scene5
+ scene_script .Scene0 ; SCENE_POKECENTER2F_0
+ scene_script .Scene1 ; SCENE_POKECENTER2F_1
+ scene_script .Scene2 ; SCENE_POKECENTER2F_2
+ scene_script .Scene3 ; SCENE_POKECENTER2F_3
+ scene_script .Scene4 ; SCENE_POKECENTER2F_4
+ scene_script .Scene5 ; SCENE_POKECENTER2F_5
db 0 ; callbacks
@@ -374,15 +374,15 @@ LinkReceptionistScript_TimeCapsule:
Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom
- setscene 0
- setmapscene TRADE_CENTER, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene TRADE_CENTER, SCENE_TRADECENTER_0
end
Script_LeftMobileTradeRoom:
special Function101220
scall Script_WalkOutOfMobileTradeRoom
- setscene 0
- setmapscene MOBILE_TRADE_ROOM_MOBILE, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene MOBILE_TRADE_ROOM_MOBILE, SCENE_MOBILETRADEROOMMOBILE_0
end
Script_WalkOutOfMobileTradeRoom:
@@ -394,15 +394,15 @@ Script_WalkOutOfMobileTradeRoom:
Script_LeftCableColosseum:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom
- setscene 0
- setmapscene COLOSSEUM, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene COLOSSEUM, SCENE_COLOSSEUM_0
end
Script_LeftMobileBattleRoom:
special Function101220
scall Script_WalkOutOfMobileBattleRoom
- setscene 0
- setmapscene MOBILE_BATTLE_ROOM, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_0
end
Script_WalkOutOfMobileBattleRoom:
@@ -577,8 +577,8 @@ Script_LeftTimeCapsule:
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done:
- setscene 0
- setmapscene TIME_CAPSULE, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_0
end
MapPokecenter2FSignpost0Script: