diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/emerald.s | 16 | ||||
| -rw-r--r-- | asm/macros.s | 11 |
2 files changed, 19 insertions, 8 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 578c974b0..8ad49c7e5 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -194146,7 +194146,7 @@ GetEvolutionTargetSpecies: ; 806D098 @0806D136: movs r2, 0 str r2, [sp, 0x4] - ldr r3, =gUnknown_0832531C + ldr r3, =gEvolutionTable lsls r6, r7, 2 b @0806D38E .align 2, 0 @@ -194170,7 +194170,7 @@ GetEvolutionTargetSpecies: ; 806D098 str r0, [sp, 0x4] lsls r6, r7, 2 @0806D16A: - ldr r1, =gUnknown_0832531C + ldr r1, =gEvolutionTable ldr r0, [sp, 0x4] lsls r2, r0, 3 adds r0, r6, r7 @@ -194252,7 +194252,7 @@ GetEvolutionTargetSpecies: ; 806D098 bhi @0806D21E b @0806D332 @0806D21E: - ldr r1, =gUnknown_0832531C + ldr r1, =gEvolutionTable adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 @@ -194402,7 +194402,7 @@ GetEvolutionTargetSpecies: ; 806D098 b @0806D3AE @0806D340: lsls r6, r7, 2 - ldr r1, =gUnknown_0832531C + ldr r1, =gEvolutionTable adds r0, r6, r7 lsls r0, 3 adds r4, r0, r1 @@ -200354,7 +200354,7 @@ sub_8070004: ; 8070004 lsrs r2, r0, 16 movs r0, 0 mov r8, r0 - ldr r0, =gUnknown_0832531C + ldr r0, =gEvolutionTable mov r12, r0 @08070016: movs r7, 0 @@ -612823,7 +612823,7 @@ sub_813E3DC: ; 813E3DC str r0, [sp, 0x8] add r0, r10 lsls r7, r0, 3 - ldr r1, =gUnknown_0832531C + ldr r1, =gEvolutionTable adds r1, r7 mov r8, r1 ldrh r0, [r1] @@ -612848,7 +612848,7 @@ sub_813E3DC: ; 813E3DC ldrb r0, [r6] muls r0, r5 adds r0, r4 - ldr r1, =gUnknown_0832531C + ldr r1, =gEvolutionTable adds r2, r1, r7 adds r2, 0xC movs r1, 0xB @@ -612932,7 +612932,7 @@ sub_813E3DC: ; 813E3DC adds r0, r5 bl pokemon_calc_effective_stats bl calc_player_party_count - ldr r0, =gUnknown_0832531C + ldr r0, =gEvolutionTable mov r4, r8 add r4, r10 lsls r4, 3 diff --git a/asm/macros.s b/asm/macros.s index 807245d73..619bd7a61 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -93,3 +93,14 @@ .macro level_up_move level, move .2byte (\level << 9) | \move .endm + + .macro evo_entry method, parameter, target_pokemon + .2byte \method + .2byte \parameter + .2byte \target_pokemon + .2byte 0 ; padding + .endm + + .macro empty_evo_entries count + .fill 8 * \count, 1, 0 + .endm |