diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 2 | ||||
| -rw-r--r-- | maps/Route36.asm | 2 | ||||
| -rw-r--r-- | maps/TinTower1F.asm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 17939e77d..8d05ee828 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -30,7 +30,7 @@ Script_BattleRoomLoop: battletowertext BATTLETOWERTEXT_INTRO promptbutton closetext - special BattleTowerBattle ; calls predef startbattle + special BattleTowerBattle ; predef StartBattle special FadeOutPalettes reloadmap ifnotequal $0, Script_FailedBattleTowerChallenge diff --git a/maps/Route36.asm b/maps/Route36.asm index 35e838d01..11e144fee 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -365,7 +365,7 @@ Route36FruitTree: fruittree FRUITTREE_ROUTE_36 SudowoodoShakeMovement: - tree_shake ; shake + tree_shake step_end WeirdTreeMovement_Flee: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index b9343b851..b2ac94059 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -86,7 +86,7 @@ TinTower1F_MapScripts: pause 15 setval RAIKOU special MonCheck - iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower + iftrue .Next1 ; if player caught Raikou, it doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 turnobject PLAYER, LEFT cry RAIKOU @@ -99,7 +99,7 @@ TinTower1F_MapScripts: .Next1: setval ENTEI special MonCheck - iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower + iftrue .Next2 ; if player caught Entei, it doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 turnobject PLAYER, RIGHT cry ENTEI |