diff options
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 10 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 6 |
4 files changed, 10 insertions, 10 deletions
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 0298c075b..73d92b21f 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7145,8 +7145,8 @@ Function11b483: ; 11b483 add hl, de pop de push de - ld b, OTPARTYMON - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop de ld h, d ld l, e @@ -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 @@ -7564,8 +7564,8 @@ Function11b6b4: ; 11b6b4 ld hl, $c60d + MON_STAT_EXP - 1 ld de, $c60d + MON_MAXHP - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + 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..862076fd1 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -2441,8 +2441,8 @@ Function17ded9: ; 17ded9 ld d, h ld e, l push hl - ld b, $0 - farcall CalcPkmnStats + ld b, FALSE + 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 |