Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pkmn -> Mon

Browse Source 
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.
This commit is contained in:
mid-kid
2018-02-22 17:13:29 +01:00
parent c3abe8f88b
commit e8bc86d1fe
41 changed files with 333 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/BattleTower1F.asm
View File

@@ -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 @"

2
maps/BattleTowerBattleRoom.asm
View File

@@ -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