diff options
Diffstat (limited to 'maps/BattleTowerHallway.asm')
| -rw-r--r-- | maps/BattleTowerHallway.asm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 52ef201fd..f541da05d 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BATTLETOWERHALLWAY_RECEPTIONIST + BattleTowerHallway_MapScriptHeader: .MapTriggers: db 2 @@ -16,7 +19,7 @@ BattleTowerHallway_MapScriptHeader: end .ChooseBattleRoom: - follow $2, PLAYER + follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER callasm .asm_load_battle_room jump .WalkToChosenBattleRoom @@ -47,33 +50,33 @@ BattleTowerHallway_MapScriptHeader: if_equal 8, .L70L80 if_equal 9, .L90L100 if_equal 10, .L90L100 - applymovement $2, MovementData_0x9e57a + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room jump .EnterBattleRoom .L30L40: ; 0x9f603 - applymovement $2, MovementData_0x9e57c + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room jump .EnterBattleRoom .L50L60: ; 0x9f60a - applymovement $2, MovementData_0x9e586 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room jump .EnterBattleRoom .L70L80: ; 0x9f611 - applymovement $2, MovementData_0x9e584 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room jump .EnterBattleRoom .L90L100: ; 0x9f618 - applymovement $2, MovementData_0x9e582 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, $2 - loadfont + faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST + opentext writetext Text_PleaseStepThisWay + waitbutton closetext - loadmovesprites stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end |