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/daycare.s | |
| parent | c6eacc9be5423fab39c90ade16b147de4cd032fe (diff) | |
label pokemon2 and some box stuff
Diffstat (limited to 'asm/daycare.s')
| -rw-r--r-- | asm/daycare.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index 608e2b9ca..ea2edb0b5 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -226,7 +226,7 @@ _0806FBBC: movs r2, 0x50 bl memcpy adds r0, r5, 0 - bl pokemon_restore_pp + bl RestoreBoxMonMovesPP adds r1, r5, 0 adds r1, 0x88 movs r0, 0 @@ -234,7 +234,7 @@ _0806FBBC: adds r0, r6, 0 bl ZeroMonData bl party_compaction - bl calc_player_party_count + bl CalculatePlayerPartyCount pop {r4-r6} pop {r0} bx r0 @@ -433,7 +433,7 @@ _0806FD74: movs r0, 0 str r0, [r1] bl party_compaction - bl calc_player_party_count + bl CalculatePlayerPartyCount adds r0, r7, 0 add sp, 0x68 pop {r4-r7} @@ -829,7 +829,7 @@ _08070090: movs r0, 0x8C muls r0, r4 adds r0, r6, r0 - bl pokemon_roll_gender + bl GetBoxMonGender lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE @@ -1795,7 +1795,7 @@ _080707FE: b _0807083E _08070826: adds r0, r5, 0 - bl pokemon_roll_gender + bl GetBoxMonGender lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE @@ -1856,7 +1856,7 @@ _0807088C: movs r0, 0x8C muls r0, r1 adds r0, r7, r0 - bl pokemon_roll_gender + bl GetBoxMonGender lsls r0, 24 lsrs r0, 24 cmp r0, 0xFE @@ -1928,7 +1928,7 @@ _08070918: movs r2, 0x64 bl memcpy bl party_compaction - bl calc_player_party_count + bl CalculatePlayerPartyCount adds r0, r6, 0 bl sub_8070710 add sp, 0x6C @@ -2751,7 +2751,7 @@ sub_8070F98: @ 8070F98 push {r4,lr} adds r4, r0, 0 adds r0, r1, 0 - bl pokemon_roll_gender + bl GetBoxMonGender adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 |