pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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

20
data/battle/battle_text.asm
View File

@@ -137,14 +137,14 @@ BattleText_SafeguardFaded: ; 0x808d2
prompt
; 0x808e7
BattleText_PkmnLightScreenFell: ; 0x808e7
BattleText_MonsLightScreenFell: ; 0x808e7
text_from_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
; 0x80905
BattleText_PkmnReflectFaded: ; 0x80905
BattleText_MonsReflectFaded: ; 0x80905
text_from_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
@@ -186,7 +186,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
prompt
; 0x809a8
BattleText_EnemyPkmnFainted: ; 0x809a8
BattleText_EnemyMonFainted: ; 0x809a8
text "Enemy @"
text_from_ram wEnemyMonNick
text_start
@@ -236,7 +236,7 @@ BattleText_0x80a4f: ; 0x80a4f
prompt
; 0x80a75
BattleText_PkmnFainted: ; 0x80a75
BattleText_MonFainted: ; 0x80a75
text_from_ram wBattleMonNick
text_start
line "fainted!"
@@ -261,7 +261,7 @@ LostAgainstText: ; 0x80ab9
prompt
; 0x80aca
BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
text "<ENEMY>"
line "is about to use"
cont "@"
@@ -353,14 +353,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
prompt
; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
BattleText_MonIsAlreadyOut: ; 0x80c0d
text_from_ram wBattleMonNick
text_start
line "is already out."
prompt
; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22
BattleText_MonCantBeRecalled: ; 0x80c22
text_from_ram wBattleMonNick
text_start
line "can't be recalled!"
@@ -379,7 +379,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
prompt
; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
BattleText_MonHasNoMovesLeft: ; 0x80c72
text_from_ram wBattleMonNick
text_start
line "has no moves left!"
@@ -402,7 +402,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
db "@@"
; 0x80cb9
BattleText_WildPkmnIsEating: ; 0x80cba
BattleText_WildMonIsEating: ; 0x80cba
text "Wild @"
text_from_ram wEnemyMonNick
text_start
@@ -410,7 +410,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba
prompt
; 0x80cd1
BattleText_WildPkmnIsAngry: ; 0x80cd1
BattleText_WildMonIsAngry: ; 0x80cd1
text "Wild @"
text_from_ram wEnemyMonNick
text_start

2
data/common_text/common_text_1.asm
View File

@@ -1121,7 +1121,7 @@ Text_RemainingTime::
text "Remaining Time"
done
Text_YourPkmnsHPWasHealed::
Text_YourMonsHPWasHealed::
text "Your #MON's HP"
line "was healed."
prompt

10
data/common_text/common_text_2.asm
View File

@@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints::
text " EXP. Points!"
prompt
Text_GoPkmn::
Text_GoMon::
text "Go! @@"
Text_DoItPkmn::
Text_DoItMon::
text "Do it! @@"
Text_GoForItPkmn::
Text_GoForItMon::
text "Go for it,"
line "@@"
Text_YourFoesWeakGetmPkmn::
Text_YourFoesWeakGetmMon::
text "Your foe's weak!"
line "Get'm, @@"
@@ -618,7 +618,7 @@ UnknownText_0x1c0bee::
cont "time to use that!"
prompt
Text_YouDontHaveAPkmn::
Text_YouDontHaveAMon::
text "You don't have a"
line "#MON!"
prompt

6
data/common_text/common_text_3.asm
View File

@@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3::
para ""
done
Text_OnlyThreePkmnMayBeEntered::
Text_OnlyThreeMonMayBeEntered::
text "Only three #MON"
line "may be entered."
para ""
done
Text_ThePkmnMustAllBeDifferentKinds::
Text_TheMonMustAllBeDifferentKinds::
text "The @"
text_from_ram wStringBuffer2
text " #MON"
@@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
para ""
done
Text_ThePkmnMustNotHoldTheSameItems::
Text_TheMonMustNotHoldTheSameItems::
text "The @"
text_from_ram wStringBuffer2
text " #MON"

12
data/predef_pointers.asm
View File

@@ -15,19 +15,19 @@ PredefPointers:: ; 856b
add_predef FillPP
add_predef TryAddMonToParty
add_predef AddTempmonToParty
add_predef SendGetPkmnIntoFromBox
add_predef SendPkmnIntoBox
add_predef SendGetMonIntoFromBox
add_predef SendMonIntoBox
add_predef GiveEgg
add_predef AnimateHPBar
add_predef CalcPkmnStats
add_predef CalcPkmnStatC
add_predef CalcMonStats
add_predef CalcMonStatC
add_predef CanLearnTMHMMove
add_predef GetTMHMMove
add_predef LinkTextboxAtHL ; $ 10
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef PlaceGraphic
add_predef CheckPlayerPartyForFitPkmn
add_predef CheckPlayerPartyForFitMon
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
@@ -38,7 +38,7 @@ PredefPointers:: ; 856b
add_predef EvolveAfterBattle
add_predef TradeAnimationPlayer2
add_predef TradeAnimation
add_predef CopyPkmnToTempMon
add_predef CopyMonToTempMon
add_predef ListMoves ; $20
add_predef PlaceNonFaintStatus
add_predef Unused_PlaceEnemyHPLevel

4
data/radio/oaks_pkmn_talk_routes.asm
View File

@@ -1,6 +1,6 @@
; Oak's Pokémon Talk will list wild Pokémon on these maps.
OaksPkmnTalkRoutes:
OaksPKMNTalkRoutes:
map ROUTE_29
map ROUTE_46
map ROUTE_30
@@ -16,4 +16,4 @@ OaksPkmnTalkRoutes:
map ROUTE_45
map ROUTE_36
map ROUTE_31
OaksPkmnTalkRoutesEnd
OaksPKMNTalkRoutesEnd