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

View File

@@ -7146,7 +7146,7 @@ Function11b483: ; 11b483
pop de
push de
ld b, OTPARTYMON
predef CalcPkmnStats
predef CalcMonStats
pop de
ld h, d
ld l, e
@@ -7565,7 +7565,7 @@ Function11b6b4: ; 11b6b4
ld hl, $c60d + MON_STAT_EXP - 1
ld de, $c60d + MON_MAXHP
ld b, $1
predef CalcPkmnStats
predef CalcMonStats
ld de, $c60d + MON_MAXHP
ld hl, $c60d + MON_HP
ld a, [de]

View File

@@ -220,7 +220,7 @@ Function170c8b: ; 170c8b
CheckBTMonMovesForErrors: ; 170c98
ld c, BATTLETOWER_PARTY_LENGTH
ld hl, wBT_OTTempPkmn1Moves
ld hl, wBT_OTTempMon1Moves
.loop
push hl
ld a, [hl]

View File

@@ -2442,7 +2442,7 @@ Function17ded9: ; 17ded9
ld e, l
push hl
ld b, $0
farcall CalcPkmnStats
farcall CalcMonStats
ld a, [wPartyCount]
dec a
ld hl, wPartyMon1HP
@@ -2531,7 +2531,7 @@ Function17e026: ; 17e026
push bc
push hl
farcall LoadEnemyMon
farcall SendPkmnIntoBox
farcall SendMonIntoBox
farcall SetBoxMonCaughtData
pop hl
pop bc