diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 18:34:18 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 18:34:18 +0200 |
| commit | 0cc4cadd2f02b19cea6eba1826aab8c3668dc677 (patch) | |
| tree | 9df3d79d001686d0817659de8aa7aade4b906752 /asm/rom_8034C54.s | |
| parent | c6eacc9be5423fab39c90ade16b147de4cd032fe (diff) | |
label pokemon2 and some box stuff
Diffstat (limited to 'asm/rom_8034C54.s')
| -rw-r--r-- | asm/rom_8034C54.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index d89cecbff..8cf508e34 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -5139,7 +5139,7 @@ _08037A12: bl GetMonData str r0, [r6, 0x18] adds r0, r4, 0 - bl pokemon_get_gender + bl GetMonGender strb r0, [r6, 0x1C] adds r0, r7, 0 bl StripExtCtrlCodes @@ -11038,7 +11038,7 @@ _0803AD0E: ldrh r0, [r1] ldrb r1, [r1, 0x17] lsrs r1, 7 - bl sub_806B694 + bl GetAbilityBySpecies mov r2, r9 ldrb r1, [r2] muls r1, r7 @@ -13364,7 +13364,7 @@ _0803C1CA: ldrb r1, [r1] lsls r2, r4, 24 lsrs r2, 24 - bl CalcPPWithPPUps + bl CalculatePPWithBonus mov r2, r10 adds r1, r2, r4 strb r0, [r1] @@ -13612,7 +13612,7 @@ _0803C42E: b _0803C6C4 .pool _0803C440: - bl sub_806B8B0 + bl PlayerPartyAndPokemonStorageFull lsls r0, 24 cmp r0, 0 bne _0803C44C |