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/05 | |
| parent | ca2af0a5d0cf80c38995dde9e4d05246c11128e7 (diff) | |
Decompile unk_02046294.s --> event_data.c
Diffstat (limited to 'arm9/modules/05')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 12 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 14425f2d..15241646 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -318,7 +318,7 @@ _021D8342: lsr r0, r0, #0x1f bne _021D8384 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A248 add r6, r0, #0 ldr r0, [r4, #0xc] @@ -385,7 +385,7 @@ _021D83C2: orr r6, r0 _021D83E4: ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x7f bl FUN_0204A138 cmp r0, #0xff @@ -1471,7 +1471,7 @@ _021D8C88: cmp r0, #0 beq _021D8CE0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x39 bl FUN_0204A138 cmp r0, #0xff @@ -1762,7 +1762,7 @@ MOD05_021D8F38: ; 0x021D8F38 push {r3, r4, r5, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r5, r0, #0 ldr r0, [r4, #0xc] bl FUN_02023D58 @@ -1842,7 +1842,7 @@ MOD05_021D8FD0: ; 0x021D8FD0 push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] @@ -1874,7 +1874,7 @@ MOD05_021D9010: ; 0x021D9010 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r4, r0, #0 ldr r0, [r5, #0xc] bl FUN_02034E30 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 1172f733..6d2dcb07 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -9333,7 +9333,7 @@ MOD05_021E72E8: ; 0x021E72E8 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0 bl GetPartyMonByIndex pop {r4, pc} @@ -19634,7 +19634,7 @@ _021EC544: bl FUN_02023CA0 ldr r1, [sp] add r0, r6, #0 - bl FUN_0206B938 + bl RemoveMonFromParty ldr r1, _021EC578 ; =0x000001B9 add r0, r6, #0 bl PartyHasMon @@ -19828,7 +19828,7 @@ _021EC6E0: _021EC6FA: ldr r0, [sp] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty add r0, r5, #0 bl ZeroBoxMonData add r0, r6, #0 @@ -21149,7 +21149,7 @@ _021ED168: bl SetMonData ldr r0, [sp, #4] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty add r0, r5, #0 bl MOD05_021ECD64 add r0, r4, #0 @@ -34755,7 +34755,7 @@ MOD05_021F3A18: ; 0x021F3A18 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0 bl GetPartyMonByIndex mov r1, #5 @@ -34824,7 +34824,7 @@ MOD05_021F3AB4: ; 0x021F3AB4 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0 bl GetPartyMonByIndex bl MOD05_021F38CC @@ -34920,7 +34920,7 @@ MOD05_021F3B7C: ; 0x021F3B7C ldr r0, [r5, #0xc] add r4, r3, #0 add r7, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0 bl GetPartyMonByIndex mov r1, #5 |