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 /mobile | |
| 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 'mobile')
| -rwxr-xr-x | mobile/mobile_46.asm | 4 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 0298c075b..670dd1a6e 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -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] diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 474dde270..ec5b5428d 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -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] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index be9578d22..25f410349 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -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 |