diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 15:19:31 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 15:19:31 -0400 |
commit | dda861d78ad47a85a54c4c6a2dd3f7e301e65fa5 (patch) | |
tree | 6b521d42b21dd9f932806ca5ef6c7a83c50a0b24 /arm9/modules/11 | |
parent | ca2af0a5d0cf80c38995dde9e4d05246c11128e7 (diff) |
Decompile unk_02046294.s --> event_data.c
Diffstat (limited to 'arm9/modules/11')
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb1.s | 20 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index ed9b4dc3..3da91ac5 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -1153,7 +1153,7 @@ _0222DFE4: _0222DFEC: ldr r0, [r5, #0x68] ldr r1, [r6, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r5, #0x68] bl FreeToHeap add r1, r6, #0 @@ -1945,7 +1945,7 @@ _0222E69E: mov r7, #5 _0222E6D2: add r0, r7, #0 - bl FUN_0206B8AC + bl SavArray_Party_alloc str r0, [r5, #0x68] add r6, r6, #1 add r5, r5, #4 @@ -1997,7 +1997,7 @@ _0222E734: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2102,7 +2102,7 @@ _0222E810: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2212,7 +2212,7 @@ _0222E8FE: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2342,7 +2342,7 @@ _0222EA0C: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount @@ -2428,7 +2428,7 @@ _0222EAC0: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2555,7 +2555,7 @@ _0222EBC6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2664,7 +2664,7 @@ _0222ECA6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2797,7 +2797,7 @@ _0222EDBC: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 92756469..1dae40e9 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -25766,7 +25766,7 @@ _0223BC8A: bl MOD11_022564A8 ldr r0, [sp, #0x28] add r1, r6, #0 - bl FUN_0206B900 + bl AddMonToParty cmp r0, #1 bne _0223BD1E ldr r0, [r4, #0x28] @@ -63816,7 +63816,7 @@ MOD11_0224E130: ; 0x0224E130 ldr r1, [r4, #8] str r0, [r1, #4] mov r0, #5 - bl FUN_0206B8AC + bl SavArray_Party_alloc ldr r1, [r4, #8] mov r6, #0 ldr r1, [r1, #4] @@ -70358,7 +70358,7 @@ _02251662: mov r1, #6 ldr r0, [r0, #4] ldr r0, [r0] - bl FUN_0206B8CC + bl InitPartyWithMaxSize ldr r0, [sp, #0x14] mov r6, #0 bl GetPartyCount @@ -70376,7 +70376,7 @@ _02251680: ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty ldr r1, [r4, #8] ldrb r0, [r5, #0x18] ldr r1, [r1, #4] @@ -71710,7 +71710,7 @@ _02252146: bl AllocFromHeap str r0, [r4, #4] mov r0, #5 - bl FUN_0206B8AC + bl SavArray_Party_alloc ldr r1, [r4, #4] str r0, [r1] ldr r0, [r4] @@ -71753,7 +71753,7 @@ _022521AE: ldr r0, [r4, #4] add r1, r6, #0 ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty add r5, r5, #1 cmp r5, #6 blt _022521AE @@ -71904,7 +71904,7 @@ _022522E2: add r1, r0, #0 ldr r0, [r4, #4] ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [r4, #4] ldrb r1, [r6, #0x1c] add r0, r0, r5 |