From e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 22 Feb 2018 17:13:29 +0100 Subject: Pkmn -> Mon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 or 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. --- mobile/mobile_46.asm | 4 ++-- mobile/mobile_5c.asm | 2 +- mobile/mobile_5f.asm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mobile') 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 -- cgit v1.2.3 From a22343d32c9f81b9cd2a4f2ff49725cfbed6671d Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 22 Feb 2018 18:12:43 +0100 Subject: Fix TRUE/FALSE constants for CalcMonStats --- mobile/mobile_46.asm | 4 ++-- mobile/mobile_5f.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mobile') diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 670dd1a6e..3d8a126f7 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7145,7 +7145,7 @@ Function11b483: ; 11b483 add hl, de pop de push de - ld b, OTPARTYMON + ld b, TRUE predef CalcMonStats pop de ld h, d @@ -7564,7 +7564,7 @@ Function11b6b4: ; 11b6b4 ld hl, $c60d + MON_STAT_EXP - 1 ld de, $c60d + MON_MAXHP - ld b, $1 + ld b, TRUE predef CalcMonStats ld de, $c60d + MON_MAXHP ld hl, $c60d + MON_HP diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 25f410349..862076fd1 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -2441,7 +2441,7 @@ Function17ded9: ; 17ded9 ld d, h ld e, l push hl - ld b, $0 + ld b, FALSE farcall CalcMonStats ld a, [wPartyCount] dec a -- cgit v1.2.3 From 3d34f5a5a371ad2b9979ae36763cdfb52c581dab Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 22 Feb 2018 21:35:11 +0100 Subject: Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox It takes a clearly different parameter, completely unrelated and different in function to PC_DEPOSIT and PC_WITHDRAW. --- mobile/mobile_40.asm | 2 +- mobile/mobile_46.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mobile') diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index b96e6c470..1c1ae16ee 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -5410,7 +5410,7 @@ Function1023c6: ; 1023c6 ld a, [wcd4c] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld hl, wPartyCount diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 3d8a126f7..73d92b21f 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7323,7 +7323,7 @@ Function11b5c0: ; 11b5c0 ld a, [wcd82] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox farcall Function170807 -- cgit v1.2.3