diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 8 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 4 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 2 |
4 files changed, 11 insertions, 11 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 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 5ba98611..0e2dd1b6 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4864,7 +4864,7 @@ _0223BA42: cmp r0, #0 bne _0223BA8C add r0, r7, #0 - bl FUN_0204A1D8 + bl GetFirstAliveMonInParty_CrashIfNone mov r1, #1 str r1, [sp, #0x34] mov r1, #0xa0 @@ -5646,7 +5646,7 @@ _0223C0CE: cmp r0, #0 bne _0223C118 add r0, r6, #0 - bl FUN_0204A1D8 + bl GetFirstAliveMonInParty_CrashIfNone mov r1, #1 str r1, [sp, #0x2c] mov r1, #0xa0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 06169afb..b33bacf9 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -24516,7 +24516,7 @@ _0223B1F6: add r0, r6, #0 lsr r1, r1, #0x10 lsr r2, r2, #0x18 - bl FUN_020697CC + bl MonSetMoveInSlot ldr r1, [r4, #4] ldr r0, _0223B2D8 ; =0x0000219C add r2, r1, r7 |