diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 20:12:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 20:12:59 -0500 |
| commit | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (patch) | |
| tree | b7444d7ddc95703ef9e3a2f5a2f14c21664bb8f8 /maps | |
| parent | f404af8a4326e4cc632a3810ff77a013c1d3e24f (diff) | |
| parent | 3d34f5a5a371ad2b9979ae36763cdfb52c581dab (diff) | |
Merge pull request #477 from mid-kid/master
Medium-sized cleanups
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTower1F.asm | 10 | ||||
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0816b5e8d..e9b18be7a 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -188,7 +188,7 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK special Special_BattleTowerAction - if_not_equal $0, Script_APkmnLevelExceeds + if_not_equal $0, Script_AMonLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK special Special_BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 @@ -225,8 +225,8 @@ UnreferencedScript_0x9e53b: waitbutton jump Script_BattleTowerHopeToServeYouAgain -Script_APkmnLevelExceeds: ; 0x9e542 - writetext Text_APkmnLevelExceeds +Script_AMonLevelExceeds: ; 0x9e542 + writetext Text_AMonLevelExceeds waitbutton jump Script_Menu_ChallengeExplanationCancel @@ -628,7 +628,7 @@ Text_BattleTower_LeftWithoutSaving: line "invalid." done -Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92 +Text_YourMonWillBeHealedToFullHealth: ; 0x9ee92 text "Your #MON will" line "be healed to full" cont "health." @@ -732,7 +732,7 @@ Text_RegisterRecordTimedOut_Mobile: cont "challenge." done -Text_APkmnLevelExceeds: ; 0x9f1e5 +Text_AMonLevelExceeds: ; 0x9f1e5 text "One or more of" line "your #MON's" cont "levels exceeds @" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..de86e6eee 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -44,7 +44,7 @@ Script_BattleRoomLoop: ; 0x9f425 applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist opentext - writetext Text_YourPkmnWillBeHealedToFullHealth + writetext Text_YourMonWillBeHealedToFullHealth waitbutton closetext playmusic MUSIC_HEAL |