diff options
Diffstat (limited to 'arm9/asm')
34 files changed, 183 insertions, 863 deletions
diff --git a/arm9/asm/party.s b/arm9/asm/party.s index 12a63f73..de141e25 100644 --- a/arm9/asm/party.s +++ b/arm9/asm/party.s @@ -153,13 +153,13 @@ _0206B992: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0206B9AC -FUN_0206B9AC: ; 0x0206B9AC + thumb_func_start GetPartyCount +GetPartyCount: ; 0x0206B9AC ldr r0, [r0, #0x4] bx lr - thumb_func_start FUN_0206B9B0 -FUN_0206B9B0: ; 0x0206B9B0 + thumb_func_start GetPartyMonByIndex +GetPartyMonByIndex: ; 0x0206B9B0 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s index 472197ae..7e0497d2 100644 --- a/arm9/asm/pokemon_s.s +++ b/arm9/asm/pokemon_s.s @@ -9,693 +9,13 @@ .text - thumb_func_start FUN_02069818 -FUN_02069818: ; 0x02069818 - push {r3-r7, lr} - sub sp, #0x10 - add r7, r0, #0x0 - add r5, r1, #0x0 - mov r0, #0x0 - mov r1, #0x2c - str r2, [sp, #0x0] - str r0, [sp, #0x8] - bl AllocFromHeap - add r4, r0, #0x0 - add r0, r7, #0x0 - mov r1, #0x5 - mov r2, #0x0 - bl GetMonData - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - str r0, [sp, #0x4] - add r0, r7, #0x0 - mov r1, #0x70 - mov r2, #0x0 - bl GetMonData - str r0, [sp, #0xc] - add r0, r7, #0x0 - mov r1, #0xa0 - mov r2, #0x0 - bl GetMonData - lsl r0, r0, #0x18 - lsr r6, r0, #0x18 - ldr r0, [sp, #0x4] - ldr r1, [sp, #0xc] - add r2, r4, #0x0 - bl LoadWotbl_HandleAlternateForme - ldr r0, [r5, #0x0] - lsl r0, r0, #0x1 - ldrh r2, [r4, r0] - ldr r0, _020698D8 ; =0x0000FFFF - cmp r2, r0 - bne _0206987A - add r0, r4, #0x0 - bl FreeToHeap - add sp, #0x10 - mov r0, #0x0 - pop {r3-r7, pc} -_0206987A: - mov r0, #0xfe - lsl r0, r0, #0x8 - add r3, r2, #0x0 - and r3, r0 - lsl r6, r6, #0x9 - cmp r6, r3 - beq _020698AC - ldr r1, _020698D8 ; =0x0000FFFF -_0206988A: - ldr r2, [r5, #0x0] - add r2, r2, #0x1 - str r2, [r5, #0x0] - lsl r2, r2, #0x1 - ldrh r2, [r4, r2] - cmp r2, r1 - bne _020698A4 - add r0, r4, #0x0 - bl FreeToHeap - add sp, #0x10 - mov r0, #0x0 - pop {r3-r7, pc} -_020698A4: - add r3, r2, #0x0 - and r3, r0 - cmp r6, r3 - bne _0206988A -_020698AC: - cmp r6, r3 - bne _020698CC - ldr r0, _020698DC ; =0x000001FF - add r1, r2, #0x0 - and r1, r0 - ldr r0, [sp, #0x0] - strh r1, [r0, #0x0] - ldr r0, [r5, #0x0] - ldr r1, [sp, #0x0] - add r0, r0, #0x1 - str r0, [r5, #0x0] - ldrh r1, [r1, #0x0] - add r0, r7, #0x0 - bl FUN_02069698 - str r0, [sp, #0x8] -_020698CC: - add r0, r4, #0x0 - bl FreeToHeap - ldr r0, [sp, #0x8] - add sp, #0x10 - pop {r3-r7, pc} - .balign 4 -_020698D8: .word 0x0000FFFF -_020698DC: .word 0x000001FF - - thumb_func_start FUN_020698E0 -FUN_020698E0: ; 0x020698E0 - ldr r3, _020698E4 ; =FUN_020698E8 - bx r3 - .balign 4 -_020698E4: .word FUN_020698E8 - - thumb_func_start FUN_020698E8 -FUN_020698E8: ; 0x020698E8 - push {r4-r6, lr} - sub sp, #0x8 - add r4, r1, #0x0 - add r6, r2, #0x0 - add r1, #0x36 - mov r2, #0x0 - add r5, r0, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strh r0, [r1, #0x4] - add r1, r4, #0x0 - add r0, r5, #0x0 - add r1, #0x3a - mov r2, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strb r0, [r1, #0x2] - add r1, r4, #0x0 - add r0, r5, #0x0 - add r1, #0x3e - mov r2, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strb r0, [r1, #0x0] - add r1, r6, #0x0 - add r0, r5, #0x0 - add r1, #0x36 - mov r2, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strh r0, [r1, #0x6] - add r1, r6, #0x0 - add r0, r5, #0x0 - add r1, #0x3a - mov r2, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strb r0, [r1, #0x3] - add r1, r6, #0x0 - add r0, r5, #0x0 - add r1, #0x3e - mov r2, #0x0 - bl GetBoxMonData - add r1, sp, #0x0 - strb r0, [r1, #0x1] - add r1, r4, #0x0 - add r2, sp, #0x4 - add r0, r5, #0x0 - add r1, #0x36 - add r2, #0x2 - bl SetBoxMonData - add r1, r4, #0x0 - add r2, sp, #0x0 - add r0, r5, #0x0 - add r1, #0x3a - add r2, #0x3 - bl SetBoxMonData - add r4, #0x3e - add r2, sp, #0x0 - add r0, r5, #0x0 - add r1, r4, #0x0 - add r2, #0x1 - bl SetBoxMonData - add r1, r6, #0x0 - add r0, r5, #0x0 - add r1, #0x36 - add r2, sp, #0x4 - bl SetBoxMonData - add r1, r6, #0x0 - add r2, sp, #0x0 - add r0, r5, #0x0 - add r1, #0x3a - add r2, #0x2 - bl SetBoxMonData - add r6, #0x3e - add r0, r5, #0x0 - add r1, r6, #0x0 - add r2, sp, #0x0 - bl SetBoxMonData - add sp, #0x8 - pop {r4-r6, pc} - .balign 4 - - thumb_func_start FUN_020699A4 -FUN_020699A4: ; 0x020699A4 - push {r3-r7, lr} - add r4, r1, #0x0 - add r5, r0, #0x0 - cmp r4, #0x3 - bhs _02069A0A - mov r7, #0x0 - add r6, sp, #0x0 -_020699B2: - add r1, r4, #0x0 - add r0, r5, #0x0 - add r1, #0x37 - add r2, r7, #0x0 - bl GetMonData - add r1, r4, #0x0 - strh r0, [r6, #0x2] - add r0, r5, #0x0 - add r1, #0x3b - mov r2, #0x0 - bl GetMonData - add r1, r4, #0x0 - strb r0, [r6, #0x1] - add r0, r5, #0x0 - add r1, #0x3f - mov r2, #0x0 - bl GetMonData - add r1, r4, #0x0 - add r2, sp, #0x0 - strb r0, [r6, #0x0] - add r0, r5, #0x0 - add r1, #0x36 - add r2, #0x2 - bl SetMonData - add r1, r4, #0x0 - add r2, sp, #0x0 - add r0, r5, #0x0 - add r1, #0x3a - add r2, #0x1 - bl SetMonData - add r1, r4, #0x0 - add r0, r5, #0x0 - add r1, #0x3e - add r2, sp, #0x0 - bl SetMonData - add r4, r4, #0x1 - cmp r4, #0x3 - blo _020699B2 -_02069A0A: - mov r1, #0x0 - add r0, sp, #0x0 - strh r1, [r0, #0x2] - strb r1, [r0, #0x1] - strb r1, [r0, #0x0] - add r2, sp, #0x0 - add r0, r5, #0x0 - mov r1, #0x39 - add r2, #0x2 - bl SetMonData - add r2, sp, #0x0 - add r0, r5, #0x0 - mov r1, #0x3d - add r2, #0x1 - bl SetMonData - add r0, r5, #0x0 - mov r1, #0x41 - add r2, sp, #0x0 - bl SetMonData - pop {r3-r7, pc} - - thumb_func_start MonHasMove -MonHasMove: ; 0x02069A38 - push {r3-r7, lr} - mov r4, #0x0 - add r6, r0, #0x0 - add r5, r1, #0x0 - add r7, r4, #0x0 -_02069A42: - add r1, r4, #0x0 - add r0, r6, #0x0 - add r1, #0x36 - add r2, r7, #0x0 - bl GetMonData - cmp r5, r0 - beq _02069A58 - add r4, r4, #0x1 - cmp r4, #0x4 - blt _02069A42 -_02069A58: - cmp r4, #0x4 - beq _02069A60 - mov r0, #0x1 - pop {r3-r7, pc} -_02069A60: - mov r0, #0x0 - pop {r3-r7, pc} - - thumb_func_start FUN_02069A64 -FUN_02069A64: ; 0x02069A64 - push {r4-r5, lr} - sub sp, #0x1c - add r5, r0, #0x0 - add r4, r1, #0x0 - mov r0, #0x0 - str r0, [sp, #0x0] - add r3, r4, #0x0 - mov r2, #0x11 -_02069A74: - ldmia r5!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _02069A74 - ldrh r1, [r4, #0x4] - lsl r0, r1, #0x1e - lsr r0, r0, #0x1f - beq _02069A8E - mov r0, #0x1 - bic r1, r0 - mov r0, #0x1 - orr r0, r1 - strh r0, [r4, #0x4] -_02069A8E: - add r0, r4, #0x0 - mov r1, #0x9f - add r2, sp, #0x0 - bl SetMonData - add r0, r4, #0x0 - mov r1, #0xa2 - add r2, sp, #0x0 - bl SetMonData - add r0, r4, #0x0 - mov r1, #0xa3 - add r2, sp, #0x0 - bl SetMonData - mov r0, #0x0 - bl CreateNewSealsObject - add r5, r0, #0x0 - add r0, r4, #0x0 - mov r1, #0xa9 - add r2, r5, #0x0 - bl SetMonData - add r0, r5, #0x0 - bl FreeToHeap - add r0, r4, #0x0 - mov r1, #0xa1 - add r2, sp, #0x0 - bl SetMonData - mov r0, #0x0 - add r1, sp, #0x4 - mov r2, #0x18 - bl MIi_CpuClearFast - add r0, r4, #0x0 - mov r1, #0xaa - add r2, sp, #0x4 - bl SetMonData - add r0, r4, #0x0 - bl CalcMonLevelAndStats - add sp, #0x1c - pop {r4-r5, pc} - - thumb_func_start FUN_02069AEC -FUN_02069AEC: ; 0x02069AEC - push {r3-r7, lr} - str r0, [sp, #0x0] - bl FUN_0206B9AC - add r7, r0, #0x0 - mov r6, #0x1 - mov r5, #0x0 - cmp r7, #0x0 - ble _02069B3C -_02069AFE: - ldr r0, [sp, #0x0] - add r1, r5, #0x0 - bl FUN_0206B9B0 - mov r1, #0x5 - mov r2, #0x0 - add r4, r0, #0x0 - bl GetMonData - cmp r0, #0x0 - beq _02069B36 - add r0, r4, #0x0 - mov r1, #0x4c - mov r2, #0x0 - bl GetMonData - cmp r0, #0x0 - bne _02069B36 - add r0, r4, #0x0 - mov r1, #0xa0 - mov r2, #0x0 - bl GetMonData - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - cmp r0, r6 - bls _02069B36 - add r6, r0, #0x0 -_02069B36: - add r5, r5, #0x1 - cmp r5, r7 - blt _02069AFE -_02069B3C: - add r0, r6, #0x0 - pop {r3-r7, pc} - - thumb_func_start FUN_02069B40 -FUN_02069B40: ; 0x02069B40 - push {r3, lr} - sub sp, #0x8 - add r3, r0, #0x0 - mov r0, #0x2 - str r0, [sp, #0x0] - add r0, sp, #0x4 - mov r1, #0x6d ; NARC_POKETOOL_POKEZUKAN - mov r2, #0x0 - lsl r3, r3, #0x1 - bl ReadFromNarcMemberByIdPair - add r0, sp, #0x4 - ldrh r0, [r0, #0x0] - add sp, #0x8 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_02069B60 -FUN_02069B60: ; 0x02069B60 - push {r3, lr} - sub sp, #0x8 - add r3, r0, #0x0 - mov r2, #0x0 - add r0, sp, #0x4 - strh r2, [r0, #0x0] - cmp r3, #0x97 - bhi _02069B7E - mov r0, #0x2 - str r0, [sp, #0x0] - add r0, sp, #0x4 - mov r1, #0x91 ; NARC_POKETOOL_SHINZUKAN - lsl r3, r3, #0x1 - bl ReadFromNarcMemberByIdPair -_02069B7E: - add r0, sp, #0x4 - ldrh r0, [r0, #0x0] - add sp, #0x8 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_02069B88 -FUN_02069B88: ; 0x02069B88 - push {r3-r4} - add r4, r0, #0x0 - add r3, r1, #0x0 - mov r2, #0x1d -_02069B90: - ldmia r4!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _02069B90 - ldr r0, [r4, #0x0] - str r0, [r3, #0x0] - pop {r3-r4} - bx lr - - thumb_func_start FUN_02069BA0 -FUN_02069BA0: ; 0x02069BA0 - push {r3-r4} - add r4, r0, #0x0 - add r3, r1, #0x0 - mov r2, #0x11 -_02069BA8: - ldmia r4!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _02069BA8 - pop {r3-r4} - bx lr - - thumb_func_start FUN_02069BB4 -FUN_02069BB4: ; 0x02069BB4 - push {r3-r4} - add r4, r0, #0x0 - add r3, r1, #0x0 - mov r2, #0x11 -_02069BBC: - ldmia r4!, {r0-r1} - stmia r3!, {r0-r1} - sub r2, r2, #0x1 - bne _02069BBC - pop {r3-r4} - bx lr - - thumb_func_start FUN_02069BC8 -FUN_02069BC8: ; 0x02069BC8 - ldr r3, _02069BCC ; =FUN_02069BD0 - bx r3 - .balign 4 -_02069BCC: .word FUN_02069BD0 - - thumb_func_start FUN_02069BD0 -FUN_02069BD0: ; 0x02069BD0 - push {r4, lr} - add r4, r1, #0x0 - mov r1, #0x0 - add r2, r1, #0x0 - bl GetBoxMonData - add r1, r4, #0x0 - bl FUN_02069BE4 - pop {r4, pc} - - thumb_func_start FUN_02069BE4 -FUN_02069BE4: ; 0x02069BE4 - push {r4, lr} - add r4, r1, #0x0 - bl GetNatureFromPersonality - lsl r1, r0, #0x2 - add r1, r0, r1 - ldr r0, _02069BF8 ; =UNK_020F7F16 - add r0, r0, r1 - ldrsb r0, [r4, r0] - pop {r4, pc} - .balign 4 -_02069BF8: .word UNK_020F7F16 - - thumb_func_start FUN_02069BFC -FUN_02069BFC: ; 0x02069BFC - push {r3-r7, lr} - add r4, r0, #0x0 - add r7, r1, #0x0 - mov r0, #0x0 - mov r1, #0x2c - add r5, r2, #0x0 - bl AllocFromHeap - add r6, r0, #0x0 - add r0, r4, #0x0 - add r1, r7, #0x0 - add r2, r6, #0x0 - bl LoadWotbl_HandleAlternateForme - ldrh r1, [r6, #0x0] - ldr r0, _02069C44 ; =0x0000FFFF - mov r4, #0x0 - cmp r1, r0 - beq _02069C3A - ldr r1, _02069C48 ; =0x000001FF - ldr r2, _02069C44 ; =0x0000FFFF - add r0, r6, #0x0 -_02069C28: - ldrh r3, [r0, #0x0] - add r0, r0, #0x2 - add r4, r4, #0x1 - and r3, r1 - strh r3, [r5, #0x0] - ldrh r3, [r0, #0x0] - add r5, r5, #0x2 - cmp r3, r2 - bne _02069C28 -_02069C3A: - add r0, r6, #0x0 - bl FreeToHeap - add r0, r4, #0x0 - pop {r3-r7, pc} - .balign 4 -_02069C44: .word 0x0000FFFF -_02069C48: .word 0x000001FF - - thumb_func_start FUN_02069C4C -FUN_02069C4C: ; 0x02069C4C - push {r3-r7, lr} - add r5, r0, #0x0 - bl FUN_0206B9AC - add r6, r0, #0x0 - bl rand_LC - mov r1, #0x1 - lsl r1, r1, #0xe - cmp r0, r1 - beq _02069C70 - lsl r1, r1, #0x1 - cmp r0, r1 - beq _02069C70 - mov r1, #0x3 - lsl r1, r1, #0xe - cmp r0, r1 - bne _02069CF2 -_02069C70: - bl rand_LC - add r1, r6, #0x0 - bl _s32_div_f - add r0, r5, #0x0 - add r7, r1, #0x0 - bl FUN_0206B9B0 - mov r1, #0x5 - mov r2, #0x0 - add r4, r0, #0x0 - bl GetMonData - cmp r0, #0x0 - beq _02069C70 - add r0, r4, #0x0 - mov r1, #0x4c - mov r2, #0x0 - bl GetMonData - cmp r0, #0x0 - bne _02069C70 - add r0, r7, #0x0 - bl MaskOfFlagNo - add r1, r0, #0x0 - lsl r1, r1, #0x18 - add r0, r5, #0x0 - lsr r1, r1, #0x18 - bl FUN_02069CF4 - cmp r0, #0x0 - bne _02069CF2 - add r5, sp, #0x0 - mov r6, #0x7 -_02069CB8: - bl rand_LC - strb r0, [r5, #0x0] - ldrb r2, [r5, #0x0] - add r1, r2, #0x0 - and r1, r6 - beq _02069CB8 - mov r0, #0xf0 - tst r0, r2 - beq _02069CD0 - add r0, sp, #0x0 - strb r1, [r0, #0x0] -_02069CD0: - add r1, sp, #0x0 - ldrb r2, [r1, #0x0] - lsl r0, r2, #0x4 - orr r0, r2 - strb r0, [r1, #0x0] - ldrb r2, [r1, #0x0] - mov r0, #0xf3 - and r0, r2 - strb r0, [r1, #0x0] - ldrb r0, [r1, #0x0] - add r2, sp, #0x0 - add r0, r0, #0x1 - strb r0, [r1, #0x0] - add r0, r4, #0x0 - mov r1, #0x99 - bl SetMonData -_02069CF2: - pop {r3-r7, pc} - - thumb_func_start FUN_02069CF4 -FUN_02069CF4: ; 0x02069CF4 - push {r3-r7, lr} - mov r6, #0x0 - add r5, r1, #0x0 - str r0, [sp, #0x0] - mov r4, #0x1 - add r7, r6, #0x0 - cmp r5, #0x0 - beq _02069D32 -_02069D04: - mov r0, #0x1 - tst r0, r5 - beq _02069D26 - ldr r0, [sp, #0x0] - add r1, r6, #0x0 - bl FUN_0206B9B0 - mov r1, #0x99 - mov r2, #0x0 - bl GetMonData - cmp r0, #0x0 - beq _02069D26 - add r0, r7, #0x0 - orr r0, r4 - lsl r0, r0, #0x18 - lsr r7, r0, #0x18 -_02069D26: - lsl r0, r5, #0x17 - add r6, r6, #0x1 - lsl r4, r4, #0x1 - lsr r5, r0, #0x18 - bne _02069D04 - b _02069D4A -_02069D32: - add r1, r6, #0x0 - bl FUN_0206B9B0 - mov r1, #0x99 - add r2, r6, #0x0 - bl GetMonData - cmp r0, #0x0 - beq _02069D4A - add r0, r7, #0x1 - lsl r0, r0, #0x18 - lsr r7, r0, #0x18 -_02069D4A: - add r0, r7, #0x0 - pop {r3-r7, pc} - .balign 4 - thumb_func_start FUN_02069D50 FUN_02069D50: ; 0x02069D50 push {r4-r7, lr} sub sp, #0xc str r0, [sp, #0x0] add r5, r1, #0x0 - bl FUN_0206B9AC + bl GetPartyCount mov r6, #0x0 str r0, [sp, #0x4] cmp r0, #0x0 @@ -704,7 +24,7 @@ FUN_02069D50: ; 0x02069D50 _02069D66: ldr r0, [sp, #0x0] add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r7, r0, #0x0 @@ -759,7 +79,7 @@ FUN_02069DC8: ; 0x02069DC8 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 - bl FUN_0206B9AC + bl GetPartyCount add r7, r0, #0x0 bl rand_LC mov r1, #0x3 @@ -774,7 +94,7 @@ FUN_02069DC8: ; 0x02069DC8 _02069DEC: add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r6, r0, #0x0 @@ -796,7 +116,7 @@ _02069DEC: beq _02069E40 add r0, r5, #0x0 sub r1, r4, #0x1 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x99 mov r2, #0x0 add r6, r0, #0x0 @@ -814,7 +134,7 @@ _02069E40: bge _02069E6A add r0, r5, #0x0 add r1, r4, #0x1 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x99 mov r2, #0x0 add r6, r0, #0x0 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 8594afe7..4a3c3f82 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -3953,7 +3953,7 @@ FUN_0203B8A0: ; 0x0203B8A0 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_020690CC strh r0, [r4, #0x0] mov r0, #0x0 @@ -4602,7 +4602,7 @@ FUN_0203BDB8: ; 0x0203BDB8 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -5526,7 +5526,7 @@ FUN_0203C520: ; 0x0203C520 ldr r0, [r4, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x74 add r2, sp, #0xc add r7, r0, #0x0 @@ -6063,7 +6063,7 @@ FUN_0203C990: ; 0x0203C990 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -10081,7 +10081,7 @@ FUN_0203E9CC: ; 0x0203E9CC ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 mov r1, #0xd mov r2, #0x0 @@ -10193,7 +10193,7 @@ FUN_0203EAB0: ; 0x0203EAB0 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 bl GetMonData @@ -10703,7 +10703,7 @@ FUN_0203EED8: ; 0x0203EED8 ldr r0, [r0, #0xc] bl FUN_0206BB1C str r0, [sp, #0x0] - bl FUN_0206B9AC + bl GetPartyCount add r4, #0x80 add r6, r0, #0x0 ldr r0, [r4, #0x0] @@ -10716,7 +10716,7 @@ FUN_0203EED8: ; 0x0203EED8 _0203EF18: ldr r0, [sp, #0x0] add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r4, r0, #0x0 @@ -10761,7 +10761,7 @@ FUN_0203EF58: ; 0x0203EF58 ldr r0, [r0, #0xc] bl FUN_0206BB1C str r0, [sp, #0xc] - bl FUN_0206B9AC + bl GetPartyCount add r2, sp, #0x18 mov r4, #0x0 ldr r3, _0203F008 ; =UNK_020F34FC @@ -10782,7 +10782,7 @@ FUN_0203EF58: ; 0x0203EF58 _0203EFA2: ldr r0, [sp, #0xc] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 mov r1, #0x5 mov r2, #0x0 diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 3c0ac2f0..e97249d2 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -284,7 +284,7 @@ FUN_02042F10: ; 0x02042F10 push {r3, lr} ldr r0, [r0, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount cmp r0, #0x6 bge _02042F24 mov r0, #0x1 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 4b248a90..bcd4dc70 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -91,7 +91,7 @@ FUN_0204434C: ; 0x0204434C ldr r0, [r5, #0xc] bl FUN_0206BB1C ldrh r1, [r6, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r5, r0, #0x0 @@ -138,7 +138,7 @@ FUN_020443A8: ; 0x020443A8 ldr r0, [r5, #0xc] bl FUN_0206BB1C ldrh r1, [r6, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x7 mov r2, #0x0 bl GetMonData @@ -187,7 +187,7 @@ FUN_02044414: ; 0x02044414 ldr r0, [r4, #0xc] bl FUN_0206BB1C add r6, r0, #0x0 - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r0, #0x6 @@ -289,7 +289,7 @@ FUN_020444F4: ; 0x020444F4 ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r2, #0x0 mov r1, #0x4c add r4, r0, #0x0 @@ -358,7 +358,7 @@ FUN_02044598: ; 0x02044598 ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r7, r0, #0x18 ldr r1, _02044650 ; =0x00000006 @@ -371,7 +371,7 @@ _020445E4: ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -444,7 +444,7 @@ FUN_02044658: ; 0x02044658 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_0204A32C strh r0, [r4, #0x0] mov r0, #0x0 @@ -474,7 +474,7 @@ FUN_0204469C: ; 0x0204469C str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x8] @@ -489,7 +489,7 @@ _020446EA: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r6, r0, #0x0 @@ -544,7 +544,7 @@ FUN_02044730: ; 0x02044730 ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r2, #0x0 mov r1, #0x4c add r5, r0, #0x0 @@ -585,7 +585,7 @@ FUN_0204478C: ; 0x0204478C add r6, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r6, r0 @@ -597,7 +597,7 @@ _020447D2: ldr r0, [r5, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r5, r0, #0x0 @@ -639,7 +639,7 @@ FUN_02044800: ; 0x02044800 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r6, r0, #0x18 ldr r1, _02044884 ; =0x000000FF @@ -651,7 +651,7 @@ _02044848: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -704,7 +704,7 @@ FUN_0204488C: ; 0x0204488C ldr r0, [r4, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x9 mov r2, #0x0 bl GetMonData @@ -744,7 +744,7 @@ FUN_020448D4: ; 0x020448D4 ldr r0, [r6, #0xc] bl FUN_0206BB1C ldr r1, [sp, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x9 mov r2, #0x0 add r5, r0, #0x0 @@ -834,7 +834,7 @@ FUN_020449A4: ; 0x020449A4 ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x9 mov r2, #0x0 add r5, r0, #0x0 @@ -890,7 +890,7 @@ FUN_02044A0C: ; 0x02044A0C ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, #0x13 add r1, r4, #0x0 mov r2, #0x0 @@ -952,7 +952,7 @@ FUN_02044A94: ; 0x02044A94 ldr r0, [r4, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, r0, #0x0 mov r1, #0xb0 mov r2, #0x0 @@ -982,7 +982,7 @@ FUN_02044B00: ; 0x02044B00 add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} @@ -1003,7 +1003,7 @@ FUN_02044B2C: ; 0x02044B2C str r0, [sp, #0x0] ldr r0, [r6, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount mov r5, #0x0 add r7, r0, #0x0 add r4, r5, #0x0 @@ -1013,7 +1013,7 @@ _02044B5A: ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 bl GetMonData @@ -1055,7 +1055,7 @@ FUN_02044B84: ; 0x02044B84 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount mov r5, #0x0 add r4, r5, #0x0 str r0, [sp, #0x8] @@ -1068,7 +1068,7 @@ _02044BC8: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r6, r0, #0x0 @@ -1114,7 +1114,7 @@ FUN_02044C0C: ; 0x02044C0C str r0, [sp, #0x4] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount mov r5, #0x0 add r4, r5, #0x0 str r0, [sp, #0x8] @@ -1124,7 +1124,7 @@ _02044C44: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r6, r0, #0x0 @@ -1168,7 +1168,7 @@ FUN_02044C88: ; 0x02044C88 str r0, [sp, #0x0] ldr r0, [r6, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount mov r5, #0x0 add r7, r0, #0x0 add r4, r5, #0x0 @@ -1178,7 +1178,7 @@ _02044CB6: ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 bl GetMonData @@ -1211,7 +1211,7 @@ FUN_02044CE0: ; 0x02044CE0 str r0, [sp, #0x0] ldr r0, [r5, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 ldr r4, _02044D40 ; =0x00000000 @@ -1223,7 +1223,7 @@ _02044D12: ldr r0, [r5, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r7, #0x0 mov r2, #0x0 bl GetMonData @@ -1269,7 +1269,7 @@ FUN_02044D44: ; 0x02044D44 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x6f mov r2, #0x0 bl GetMonData @@ -1301,7 +1301,7 @@ FUN_02044D8C: ; 0x02044D8C ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r6, r0, #0x0 @@ -1382,7 +1382,7 @@ FUN_02044E34: ; 0x02044E34 ldr r0, [r5, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r4, #0x0 bl FUN_020699A4 mov r0, #0x0 @@ -1420,7 +1420,7 @@ FUN_02044E78: ; 0x02044E78 ldr r0, [r5, #0xc] bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, #0x36 add r1, r4, #0x0 mov r2, #0x0 @@ -1454,7 +1454,7 @@ FUN_02044ED8: ; 0x02044ED8 ldr r0, [r4, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x6 mov r2, #0x0 bl GetMonData @@ -1478,7 +1478,7 @@ FUN_02044F20: ; 0x02044F20 ldr r0, [r4, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r2, #0x0 add r1, sp, #0x0 strh r2, [r1, #0x0] @@ -1512,7 +1512,7 @@ FUN_02044F58: ; 0x02044F58 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x18 lsr r6, r0, #0x18 ldr r5, _02044FE4 ; =0x00000000 @@ -1523,7 +1523,7 @@ _02044F9E: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -1580,7 +1580,7 @@ FUN_02044FE8: ; 0x02044FE8 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r4, #0x0 add r6, r0, #0x0 add r5, r4, #0x0 @@ -1628,7 +1628,7 @@ FUN_0204505C: ; 0x0204505C ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 add r4, #0x80 lsr r6, r0, #0x10 @@ -1649,7 +1649,7 @@ _0204509A: _020450A6: ldr r0, [sp, #0xc] add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -1725,7 +1725,7 @@ FUN_02045104: ; 0x02045104 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 lsl r0, r6, #0x18 lsr r0, r0, #0x18 @@ -1768,7 +1768,7 @@ FUN_02045170: ; 0x02045170 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -1800,7 +1800,7 @@ FUN_020451D0: ; 0x020451D0 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 add r4, #0x80 lsr r6, r0, #0x10 @@ -1817,7 +1817,7 @@ _0204520C: _02045212: add r0, r7, #0x0 add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index ed57d780..85f03ebe 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -102,7 +102,7 @@ FUN_02045E20: ; 0x02045E20 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x20 bl FUN_02088DF8 add r5, r0, #0x0 @@ -185,7 +185,7 @@ FUN_02045EE4: ; 0x02045EE4 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, r0, #0x0 mov r1, #0x20 bl FUN_02088DF8 @@ -222,7 +222,7 @@ FUN_02045F24: ; 0x02045F24 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 mov r0, #0x20 mov r1, #0x4 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 54c1e00c..959b85d1 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -119,7 +119,7 @@ FUN_0203FF10: ; 0x0203FF10 ldr r0, [r0, #0xc] bl FUN_0206BB1C add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [sp, #0x10] add r0, r4, #0x0 mov r1, #0x4 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index ad51e8aa..078e899f 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -92,7 +92,7 @@ FUN_02040748: ; 0x02040748 ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r2, r0, #0x0 ldr r0, [r7, #0x0] add r1, r4, #0x0 @@ -315,7 +315,7 @@ FUN_0204091C: ; 0x0204091C ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r2, r0, #0x0 ldr r0, [r7, #0x0] add r1, r4, #0x0 @@ -943,7 +943,7 @@ FUN_02040E4C: ; 0x02040E4C ldr r0, [r6, #0xc] bl FUN_0206BB1C ldr r1, [sp, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, #0x36 add r1, r4, #0x0 mov r2, #0x0 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index 0a13ac22..bb5b7be6 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -75,7 +75,7 @@ FUN_020411C4: ; 0x020411C4 str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 ldr r0, _0204133C ; =0x00000000 @@ -87,7 +87,7 @@ _0204123C: ldr r0, [r7, #0xc] bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index f75ac5ce..8ea6313d 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -253,7 +253,7 @@ FUN_02042000: ; 0x02042000 bl FUN_020394F0 add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] @@ -417,7 +417,7 @@ _02042170: bl FUN_020394F0 add r1, r0, #0x0 add r0, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 add r0, r4, #0x0 mov r2, #0x4 diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s index b18eca9c..9cf2dfa2 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -109,14 +109,14 @@ FUN_020256DC: ; 0x020256DC str r0, [r5, #0x0] ldr r0, [sp, #0x0] mov r6, #0x0 - bl FUN_0206B9AC + bl GetPartyCount cmp r4, r0 bge _020257AE add r5, #0x18 _0202572A: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r7, r0, #0x0 @@ -170,7 +170,7 @@ _0202572A: lsl r0, r0, #0x18 lsr r4, r0, #0x18 ldr r0, [sp, #0x0] - bl FUN_0206B9AC + bl GetPartyCount cmp r4, r0 blt _0202572A _020257AE: diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s index 1f26f48a..2708bee6 100644 --- a/arm9/asm/unk_0202B034.s +++ b/arm9/asm/unk_0202B034.s @@ -58,7 +58,7 @@ _0202B07E: add r0, r0, r2 str r0, [sp, #0x14] ldr r0, [sp, #0x4] - bl FUN_0206B9AC + bl GetPartyCount str r0, [sp, #0x10] mov r0, #0xb mov r1, #0x0 @@ -77,7 +77,7 @@ _0202B07E: _0202B0BA: ldr r0, [sp, #0x4] add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, r0, #0x0 bl AcquireMonLock str r0, [sp, #0xc] diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 3b0e21b2..6cb0e026 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -1855,7 +1855,7 @@ _02035ECC: ldrb r0, [r0, #0x0] strb r0, [r7, #0x14] ldr r0, [r7, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r7, #0x13] mov r0, #0x0 strh r0, [r7, #0x18] @@ -2050,7 +2050,7 @@ _020360AC: add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 add r0, r5, #0x0 mov r2, #0xb @@ -2444,7 +2444,7 @@ _020363F6: add r5, r0, #0x0 ldr r0, [sp, #0x4] add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [sp, #0xc] mov r0, #0x7f lsl r0, r0, #0x2 @@ -3277,7 +3277,7 @@ _02036B0E: ldr r0, [r6, #0xc] bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r2, r0, #0x0 ldr r0, [r5, #0x14] add r1, r6, #0x0 @@ -3547,7 +3547,7 @@ FUN_02036CEC: ; 0x02036CEC str r5, [r4, #0x1c] ldrb r1, [r7, #0x2] ldr r0, [r4, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 mov r0, #0x7e lsl r0, r0, #0x2 @@ -3648,7 +3648,7 @@ FUN_02036E08: ; 0x02036E08 bl FUN_0206BB1C ldrb r1, [r5, #0x0] str r0, [sp, #0x20] - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [sp, #0x24] ldrb r0, [r5, #0x1] cmp r0, #0x0 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 3959856b..2e9774eb 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -732,7 +732,7 @@ FUN_02037C00: ; 0x02037C00 strb r0, [r4, #0x11] strb r6, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] @@ -789,7 +789,7 @@ FUN_02037C7C: ; 0x02037C7C mov r0, #0x0 strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] @@ -1231,7 +1231,7 @@ FUN_0203800C: ; 0x0203800C add r0, r5, #0x0 bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [r4, #0x0] add r0, r5, #0x0 bl FUN_02027E24 @@ -1652,7 +1652,7 @@ _02038386: beq _020383C8 ldr r0, [r4, #0xc] ldr r1, [r4, #0x30] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, [r4, #0x44] bl FUN_02069B88 @@ -1906,7 +1906,7 @@ _02038590: ldr r0, [r5, #0xc] bl FUN_0206BB1C ldr r1, [r4, #0x4] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r2, [r4, #0xc] mov r1, #0x75 add r2, #0x1c @@ -1973,7 +1973,7 @@ _02038620: ldr r0, [r7, #0xc] bl FUN_0206BB1C ldr r1, [r4, #0x4] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x6f mov r2, #0x0 add r6, r0, #0x0 diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index cc6edb17..8a0cf5cd 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -945,7 +945,7 @@ _02046CAA: ldr r0, [r5, #0x10] mov r1, #0x0 ldr r0, [r0, #0x8] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, [sp, #0x4] bl FUN_02060FE0 @@ -1025,7 +1025,7 @@ _02046D5C: cmp r0, #0x12 bne _02046D8C add r0, r5, #0x0 - bl FUN_0206B9AC + bl GetPartyCount cmp r0, #0x6 bne _02046D8C mov r2, #0x0 @@ -1711,7 +1711,7 @@ _0204732A: bne _020473C8 ldr r0, [r1, #0x8] mov r1, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 bl GetMonData @@ -1758,7 +1758,7 @@ _02047390: bne _020473C8 ldr r0, [r1, #0x8] mov r1, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 bl GetMonData @@ -1827,7 +1827,7 @@ _02047400: blo _020474FC ldr r0, [r4, #0x8] mov r1, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02023918 @@ -1871,7 +1871,7 @@ _02047470: lsl r0, r0, #0x2 add r0, r4, r0 ldr r0, [r0, #0x4] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02023918 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 619b8594..e167517a 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -649,19 +649,19 @@ FUN_02047BC0: ; 0x02047BC0 bl AllocMonZeroed add r5, r0, #0x0 ldr r0, [sp, #0x14] - bl FUN_0206B9AC + bl GetPartyCount add r1, r0, #0x0 ldr r0, [r6, #0x4] bl FUN_0206B8CC ldr r0, [sp, #0x14] mov r4, #0x0 - bl FUN_0206B9AC + bl GetPartyCount cmp r0, #0x0 ble _02047C98 _02047C40: ldr r0, [sp, #0x14] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r5, #0x0 bl FUN_02069B88 add r0, r5, #0x0 @@ -692,7 +692,7 @@ _02047C82: bl FUN_020479FC ldr r0, [sp, #0x14] add r4, r4, #0x1 - bl FUN_0206B9AC + bl GetPartyCount cmp r4, r0 blt _02047C40 _02047C98: @@ -856,7 +856,7 @@ _02047DEE: ldrb r1, [r7, r6] ldr r0, [sp, #0x4] sub r1, r1, #0x1 - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r1, [sp, #0x8] bl FUN_02069B88 ldr r1, [sp, #0x8] diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index 5ea5d8c5..10664314 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -130,7 +130,7 @@ FUN_0204A120: ; 0x0204A120 push {r3-r5, lr} add r5, r2, #0x0 add r4, r3, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex lsl r2, r5, #0x18 add r1, r4, #0x0 lsr r2, r2, #0x18 @@ -143,7 +143,7 @@ FUN_0204A138: ; 0x0204A138 push {r3-r7, lr} str r0, [sp, #0x0] add r5, r1, #0x0 - bl FUN_0206B9AC + bl GetPartyCount add r7, r0, #0x0 mov r6, #0x0 cmp r7, #0x0 @@ -151,7 +151,7 @@ FUN_0204A138: ; 0x0204A138 _0204A14A: ldr r0, [sp, #0x0] add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -198,7 +198,7 @@ _0204A1A2: FUN_0204A1A8: ; 0x0204A1A8 push {r3-r7, lr} add r7, r0, #0x0 - bl FUN_0206B9AC + bl GetPartyCount mov r5, #0x0 add r6, r0, #0x0 add r4, r5, #0x0 @@ -207,7 +207,7 @@ FUN_0204A1A8: ; 0x0204A1A8 _0204A1BA: add r0, r7, #0x0 add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_0204A01C cmp r0, #0x0 beq _0204A1CC @@ -225,7 +225,7 @@ _0204A1D2: FUN_0204A1D8: ; 0x0204A1D8 push {r3-r7, lr} add r6, r0, #0x0 - bl FUN_0206B9AC + bl GetPartyCount add r5, r0, #0x0 mov r4, #0x0 cmp r5, #0x0 @@ -233,7 +233,7 @@ FUN_0204A1D8: ; 0x0204A1D8 _0204A1E8: add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r7, r0, #0x0 bl FUN_0204A01C cmp r0, #0x0 @@ -253,7 +253,7 @@ _0204A204: FUN_0204A20C: ; 0x0204A20C push {r3-r7, lr} add r6, r0, #0x0 - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 lsr r5, r0, #0x10 ldr r4, _0204A244 ; =0x00000000 @@ -261,7 +261,7 @@ FUN_0204A20C: ; 0x0204A20C _0204A21C: add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r7, r0, #0x0 @@ -302,7 +302,7 @@ FUN_0204A25C: ; 0x0204A25C add r1, sp, #0x0 add r7, r0, #0x0 strb r2, [r1, #0x0] - bl FUN_0206B9AC + bl GetPartyCount add r6, r0, #0x0 mov r5, #0x0 cmp r6, #0x0 @@ -310,7 +310,7 @@ FUN_0204A25C: ; 0x0204A25C _0204A272: add r0, r7, #0x0 add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x4c mov r2, #0x0 add r4, r0, #0x0 @@ -337,7 +337,7 @@ FUN_0204A29C: ; 0x0204A29C str r0, [sp, #0x0] str r1, [sp, #0x4] add r6, r7, #0x0 - bl FUN_0206B9AC + bl GetPartyCount add r4, r7, #0x0 str r0, [sp, #0x8] cmp r0, #0x0 @@ -345,7 +345,7 @@ FUN_0204A29C: ; 0x0204A29C _0204A2B4: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 bl FUN_0204A01C cmp r0, #0x0 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 08d3b46d..d2267271 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -50,7 +50,7 @@ FUN_02050E48: ; 0x02050E48 ldr r0, [sp, #0x4] strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] @@ -957,7 +957,7 @@ _020515BA: add r1, #0x84 ldrb r1, [r1, #0x0] ldr r0, [r4, #0x50] - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_020690E4 add r2, r0, #0x0 ldr r0, [r4, #0x28] @@ -1482,7 +1482,7 @@ _02051A16: ldrb r1, [r1, #0x0] ldr r0, [sp, #0x0] sub r1, r1, #0x1 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r4, #0x0 add r2, r6, #0x0 bl MI_CpuCopy8 diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index a2114d7c..1c47a7c6 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -289,7 +289,7 @@ FUN_02054DEC: ; 0x02054DEC push {r3-r7, lr} add r6, r0, #0x0 bl FUN_0206BB1C - bl FUN_0206B9AC + bl GetPartyCount lsl r0, r0, #0x10 lsr r5, r0, #0x10 ldr r4, _02054E2C ; =0x00000000 @@ -299,7 +299,7 @@ _02054E02: add r0, r6, #0x0 bl FUN_0206BB1C add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r7, #0x0 mov r2, #0x0 bl GetMonData @@ -326,7 +326,7 @@ FUN_02054E30: ; 0x02054E30 mov r7, #0x0 bl FUN_0206BB1C str r0, [sp, #0x0] - bl FUN_0206B9AC + bl GetPartyCount add r4, r0, #0x0 add r6, r7, #0x0 cmp r4, #0x0 @@ -335,7 +335,7 @@ FUN_02054E30: ; 0x02054E30 _02054E4A: ldr r0, [sp, #0x0] add r1, r6, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 bl GetMonData diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s index 21beb029..c06deaff 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -175,7 +175,7 @@ FUN_0205FB34: ; 0x0205FB34 ldrb r0, [r6, #0xd] strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r0, #0x0 strh r0, [r4, #0x18] diff --git a/arm9/asm/unk_0206439C.s b/arm9/asm/unk_0206439C.s index e9d72f9f..76ea9f7f 100644 --- a/arm9/asm/unk_0206439C.s +++ b/arm9/asm/unk_0206439C.s @@ -14,7 +14,7 @@ FUN_0206439C: ; 0x0206439C add r0, r6, #0x0 bl FUN_0206BB1C add r1, r5, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [r4, #0x0] mov r0, #0x0 str r0, [r4, #0x4] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index cc2e0ae8..ec33a0a1 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1810,7 +1810,7 @@ FUN_020661F8: ; 0x020661F8 bl FUN_020377AC bl FUN_0206BB1C add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r2, r0, #0x0 mov r0, #0x6b lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_0206BB5C.s b/arm9/asm/unk_0206BB5C.s index 29d28032..afcace47 100644 --- a/arm9/asm/unk_0206BB5C.s +++ b/arm9/asm/unk_0206BB5C.s @@ -193,7 +193,7 @@ _0206BCBC: beq _0206BD0A ldr r0, [sp, #0x4] sub r1, r1, #0x1 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r2, [sp, #0x8] @@ -407,7 +407,7 @@ FUN_0206BE48: ; 0x0206BE48 add r0, r1, #0x0 str r1, [sp, #0x10] str r2, [sp, #0x14] - bl FUN_0206B9AC + bl GetPartyCount str r0, [sp, #0x20] add r6, r0, #0x0 add r0, sp, #0x30 @@ -423,7 +423,7 @@ FUN_0206BE48: ; 0x0206BE48 _0206BE72: ldr r0, [sp, #0x10] add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [sp, #0x24] mov r1, #0x5 mov r2, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 270bcd79..81a90ae3 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2085,7 +2085,7 @@ _0206D854: cmp r0, #0x0 beq _0206D86C ldr r0, [r4, #0x24] - bl FUN_0206B9AC + bl GetPartyCount cmp r0, #0x6 blt _0206D86E _0206D86C: diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 05ed529d..4534dc1b 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1666,7 +1666,7 @@ FUN_0207008C: ; 0x0207008C ldr r0, _020701DC ; =0x000005A4 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9AC + bl GetPartyCount ldr r1, [sp, #0x0] cmp r0, r1 bgt _020700BC @@ -1677,7 +1677,7 @@ _020700BC: ldr r0, _020701DC ; =0x000005A4 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r7, r0, #0x0 @@ -2809,7 +2809,7 @@ FUN_020709FC: ; 0x020709FC add r6, r1, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r1, _02070A7C ; =0x00000B23 ldrb r2, [r5, r1] lsl r3, r2, #0x19 @@ -3755,7 +3755,7 @@ FUN_0207117C: ; 0x0207117C ldr r1, [sp, #0x0] ldr r0, [r0, #0x0] ldrb r1, [r1, r2] - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [sp, #0x8] ldr r0, [sp, #0x4] mov r1, #0x1 @@ -3996,7 +3996,7 @@ FUN_02071340: ; 0x02071340 cmp r0, #0x0 beq _0207136E ldr r0, [r2, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, _020713E0 ; =0x000005A4 ldr r2, _020713E4 ; =0x00000B34 @@ -5033,7 +5033,7 @@ _02071B34: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, _02071C3C ; =0x0000069C mov r1, #0x40 @@ -5244,7 +5244,7 @@ _02071D14: add r1, r6, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldrh r1, [r7, r4] add r2, sp, #0x0 str r1, [sp, #0x0] @@ -5426,7 +5426,7 @@ _02071E5A: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, _02071F1C ; =0x000005A4 mov r2, #0x3 @@ -5460,7 +5460,7 @@ _02071ECC: ldr r0, [r1, #0x0] ldr r1, _02071F20 ; =0x00000B25 ldrb r1, [r5, r1] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, _02071F1C ; =0x000005A4 ldr r2, [r5, r0] @@ -5526,7 +5526,7 @@ FUN_02071F58: ; 0x02071F58 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 mov r7, #0x89 add r0, r5, #0x0 @@ -5804,7 +5804,7 @@ _020721B0: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r7, r0, #0x0 ldr r0, _020722A8 ; =0x000005A4 ldr r0, [r5, r0] @@ -5968,7 +5968,7 @@ FUN_0207230C: ; 0x0207230C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r7, r0, #0x0 ldr r0, _02072410 ; =0x000005A4 ldr r0, [r5, r0] diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index ca80e1db..062862b7 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -582,7 +582,7 @@ _0207297E: ldr r1, _020729CC ; =0x00000B25 ldr r0, [r2, #0x0] ldrb r1, [r5, r1] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, _020729D0 ; =0x0000069C mov r1, #0x25 @@ -1211,7 +1211,7 @@ _02072E98: add r1, r4, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 mov r0, #0x0 ldr r3, _02072EE0 ; =0x000005A4 @@ -1280,7 +1280,7 @@ _02072F2C: add r1, r4, #0x0 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 add r0, r5, #0x0 bl FUN_02076AA0 @@ -1983,7 +1983,7 @@ FUN_020734C0: ; 0x020734C0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa3 mov r2, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s index b7a572da..16631f9e 100644 --- a/arm9/asm/unk_02073710.s +++ b/arm9/asm/unk_02073710.s @@ -218,7 +218,7 @@ FUN_020737D0: ; 0x020737D0 add r4, r2, #0x0 ldr r0, [r0, #0x0] add r7, r1, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex lsl r1, r4, #0x10 asr r6, r1, #0x10 mov r1, #0x2c diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 94f4426e..cb5d7a22 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -199,7 +199,7 @@ FUN_02073EEC: ; 0x02073EEC bne _02073F66 ldr r0, [r5, r0] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r2, _02074058 ; =0x0000069C add r6, r0, #0x0 ldr r0, [r5, r2] @@ -238,7 +238,7 @@ _02073F66: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x0 str r1, [sp, #0x0] add r6, r0, #0x0 @@ -530,7 +530,7 @@ FUN_02074200: ; 0x02074200 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r0, #0x0 ldr r0, _02074268 ; =0x000005A4 mov r2, #0xc @@ -625,7 +625,7 @@ FUN_020742A8: ; 0x020742A8 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x0 str r1, [sp, #0x0] add r5, r0, #0x0 @@ -789,7 +789,7 @@ FUN_02074428: ; 0x02074428 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_0206AA84 ldr r0, _0207444C ; =0x000005A4 mov r1, #0x0 @@ -2383,7 +2383,7 @@ FUN_02075118: ; 0x02075118 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa1 mov r2, #0x0 bl GetMonData diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index dfbddd58..995ebf7e 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -365,7 +365,7 @@ FUN_020757F4: ; 0x020757F4 ldrb r1, [r4, r1] ldr r0, [r0, #0x0] add r5, r2, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex bl FUN_020690E4 add r2, r0, #0x0 mov r0, #0x6a @@ -1045,7 +1045,7 @@ FUN_02075DC0: ; 0x02075DC0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xd mov r2, #0x0 add r4, r0, #0x0 @@ -1243,7 +1243,7 @@ FUN_02075F60: ; 0x02075F60 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa2 mov r2, #0x0 str r0, [sp, #0x8] @@ -1372,7 +1372,7 @@ FUN_020760A0: ; 0x020760A0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa2 mov r2, #0x0 bl GetMonData @@ -1558,7 +1558,7 @@ _02076212: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020772CC @@ -1646,7 +1646,7 @@ _020762DC: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa2 mov r2, #0x0 bl GetMonData @@ -1782,7 +1782,7 @@ FUN_0207640C: ; 0x0207640C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xa3 mov r2, #0x0 add r4, r0, #0x0 @@ -2056,7 +2056,7 @@ _02076680: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r1, _02076878 ; =0x000005A4 add r5, r0, #0x0 ldr r2, [r4, r1] @@ -2196,7 +2196,7 @@ _020767A4: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r2, _02076878 ; =0x000005A4 add r1, r0, #0x0 ldr r2, [r4, r2] @@ -2241,7 +2241,7 @@ _02076814: ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 ldr r0, _02076878 ; =0x000005A4 ldr r0, [r4, r0] @@ -2307,7 +2307,7 @@ FUN_02076890: ; 0x02076890 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 bl FUN_020690E4 add r2, r0, #0x0 @@ -2586,7 +2586,7 @@ FUN_02076AF8: ; 0x02076AF8 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r6, r0, #0x0 add r0, r4, #0x0 add r1, r6, #0x0 @@ -2775,7 +2775,7 @@ FUN_02076C94: ; 0x02076C94 ldr r0, [r4, r0] ldrb r1, [r4, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r5, r0, #0x0 bl FUN_020690E4 add r2, r0, #0x0 @@ -2854,7 +2854,7 @@ FUN_02076D3C: ; 0x02076D3C ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r2, _02076DC4 ; =0x000005A4 add r1, r0, #0x0 ldr r2, [r5, r2] @@ -3138,7 +3138,7 @@ FUN_02076FB0: ; 0x02076FB0 ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r1, r6, #0x0 add r1, #0x36 mov r2, #0x0 @@ -3375,7 +3375,7 @@ _0207716A: ldr r0, [r5, r0] ldrb r1, [r5, r1] ldr r0, [r0, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r4, #0x36 add r1, r4, #0x0 mov r2, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 8b972fcc..9da982ce 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -3169,7 +3169,7 @@ _0207B588: _0207B58E: ldr r0, [r1, #0x0] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0x5 mov r2, #0x0 add r6, r0, #0x0 @@ -3269,7 +3269,7 @@ _0207B640: _0207B64E: ldrb r1, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9B0 + bl GetPartyMonByIndex pop {r4, pc} _0207B658: bl FUN_020690C8 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index bf8c6901..86eedd81 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -108,7 +108,7 @@ _02080CB4: ldr r0, [r6, #0xc] bl FUN_0206BB1C mov r1, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_020377AC diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s index a1b65c4a..b4f2fa48 100644 --- a/arm9/asm/unk_020842DC.s +++ b/arm9/asm/unk_020842DC.s @@ -616,7 +616,7 @@ FUN_020847F8: ; 0x020847F8 add r5, r1, #0x0 add r1, r2, #0x0 add r4, r3, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r3, [sp, #0x10] add r1, r5, #0x0 add r2, r4, #0x0 @@ -1320,7 +1320,7 @@ FUN_02084DD0: ; 0x02084DD0 add r5, r1, #0x0 add r1, r2, #0x0 add r4, r3, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex ldr r1, [sp, #0x14] add r3, sp, #0x0 str r1, [sp, #0x0] @@ -1787,7 +1787,7 @@ FUN_02085140: ; 0x02085140 push {r4-r7, lr} sub sp, #0xc str r0, [sp, #0x0] - bl FUN_0206B9AC + bl GetPartyCount mov r7, #0x0 str r0, [sp, #0x4] cmp r0, #0x0 @@ -1796,7 +1796,7 @@ FUN_02085140: ; 0x02085140 _02085154: ldr r0, [sp, #0x0] add r1, r7, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex mov r1, #0xab mov r2, #0x0 add r5, r0, #0x0 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 8eb483b3..0111206a 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -573,7 +573,7 @@ _02085DDC: ldr r0, [r6, #0x10] bl FUN_0206BB1C str r0, [r7, #0x1c] - bl FUN_0206B9AC + bl GetPartyCount mov r4, #0x0 str r0, [sp, #0x0] str r0, [r7, #0x0] @@ -583,7 +583,7 @@ _02085DDC: _02085E0A: ldr r0, [r7, #0x1c] add r1, r4, #0x0 - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [r5, #0x4] ldr r0, [sp, #0x0] add r4, r4, #0x1 diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 835e4fea..644d8dc5 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -446,7 +446,7 @@ _02087FFE: strb r0, [r4, #0x11] strb r6, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r1, #0x0 strh r1, [r4, #0x18] @@ -540,7 +540,7 @@ FUN_020880A0: ; 0x020880A0 ldr r0, [r5, #0xc] ldrb r1, [r5, #0x8] ldr r0, [r0, #0x10] - bl FUN_0206B9B0 + bl GetPartyMonByIndex str r0, [r4, #0x0] ldr r0, [r5, #0xc] ldr r0, [r0, #0x18] @@ -608,7 +608,7 @@ FUN_02088130: ; 0x02088130 ldrb r0, [r5, #0x8] strb r0, [r4, #0x14] ldr r0, [r4, #0x0] - bl FUN_0206B9AC + bl GetPartyCount strb r0, [r4, #0x13] mov r1, #0x0 strh r1, [r4, #0x18] |