diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:13:29 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:39:06 +0100 |
| commit | e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 (patch) | |
| tree | dabac449a3cf7bf08c6cb134701ce296a5403c61 /maps | |
| parent | c3abe8f88b62b121ec7e76cac91467df7471223a (diff) | |
Pkmn -> Mon
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
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 910d27a69..e4edf7b04 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 |