diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-14 10:48:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-15 11:41:45 -0400 |
| commit | 154b07917927bd37d7780e1a8bc8f307dad8d70c (patch) | |
| tree | 004219bc1b62d65a388865f14660c2e1eafdc36b /arm9/modules/05 | |
| parent | 62afe08422b65aef839d74ec248d67d48be6bf55 (diff) | |
Name some script mon related routines
Diffstat (limited to 'arm9/modules/05')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 8 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 81ff471b..f1a29149 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -319,7 +319,7 @@ _021D8342: bne _021D8384 ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get - bl FUN_0204A248 + bl HasEnoughAlivePokemonForDoubleBattle add r6, r0, #0 ldr r0, [r4, #0xc] bl SavArray_Flags_get @@ -387,7 +387,7 @@ _021D83E4: ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get mov r1, #0x7f - bl FUN_0204A138 + bl GetIdxOfFirstPartyMonWithMove cmp r0, #0xff beq _021D83F8 mov r0, #2 @@ -1473,7 +1473,7 @@ _021D8C88: ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get mov r1, #0x39 - bl FUN_0204A138 + bl GetIdxOfFirstPartyMonWithMove cmp r0, #0xff beq _021D8CE0 ldr r0, _021D8D1C ; =0x00002714 @@ -1899,7 +1899,7 @@ _021D903E: lsl r1, r1, #0x10 add r0, r4, #0 lsr r1, r1, #0x10 - bl FUN_0204A29C + bl ApplyPoisonStep cmp r0, #0 beq _021D9060 cmp r0, #1 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index cb2a013d..a6ee875d 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -3914,10 +3914,10 @@ _021E497A: mov r6, #0 _021E4980: ldr r0, [r5, #4] - bl FUN_0204A1D8 + bl GetFirstAliveMonInParty_CrashIfNone add r7, r0, #0 ldr r0, [r5, #8] - bl FUN_0204A1D8 + bl GetFirstAliveMonInParty_CrashIfNone str r0, [sp] add r0, r7, #0 mov r1, #0xa0 @@ -20875,8 +20875,8 @@ _021ECF08: .word 0x0000013A _021ECF0C: .word 0x00000139 _021ECF10: .word 0x000001EA - thumb_func_start MOD05_021ECF14 -MOD05_021ECF14: ; 0x021ECF14 + thumb_func_start MOD05_SetEggStats +MOD05_SetEggStats: ; 0x021ECF14 push {r0, r1, r2, r3} push {r4, r5, r6, lr} sub sp, #0x20 |