diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-01 17:50:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 17:50:52 +0300 |
| commit | 1e25e489913a0712722839fdd6b4b39ba4c59bc2 (patch) | |
| tree | 49ab21f6a62265627cc3ae548b10416f3cd4e5b1 | |
| parent | 9ce38edeb117172f1066607671a1610aa5a9f266 (diff) | |
| parent | da3e1d6ab550bd76dbc1001e447138237fbdf063 (diff) | |
Merge pull request #207 from CelestialAmber/master
Decompile unk_0200CA44.asm
| -rw-r--r-- | arm9/asm/unk_0200CA44.s | 73 | ||||
| -rw-r--r-- | arm9/src/unk_0200CA44.c | 31 | ||||
| -rw-r--r-- | include/unk_0200CA44.h | 10 |
3 files changed, 41 insertions, 73 deletions
diff --git a/arm9/asm/unk_0200CA44.s b/arm9/asm/unk_0200CA44.s deleted file mode 100644 index d3bb9e9c..00000000 --- a/arm9/asm/unk_0200CA44.s +++ /dev/null @@ -1,73 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .extern gUnknown21C48B8 - - .text - - thumb_func_start FUN_0200CA44 -FUN_0200CA44: ; 0x0200CA44 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0200CA5C ; =gUnknown21C48B8 - add r4, r1, #0x0 - add r3, r2, #0x0 - ldr r0, [r0, #0x18] - add r1, r5, #0x0 - add r2, r4, #0x0 - bl FUN_0201B60C - pop {r3-r5, pc} - nop -_0200CA5C: .word gUnknown21C48B8 - - thumb_func_start FUN_0200CA60 -FUN_0200CA60: ; 0x0200CA60 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0200CA78 ; =gUnknown21C48B8 - add r4, r1, #0x0 - add r3, r2, #0x0 - ldr r0, [r0, #0x1c] - add r1, r5, #0x0 - add r2, r4, #0x0 - bl FUN_0201B60C - pop {r3-r5, pc} - nop -_0200CA78: .word gUnknown21C48B8 - - thumb_func_start FUN_0200CA7C -FUN_0200CA7C: ; 0x0200CA7C - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0200CA94 ; =gUnknown21C48B8 - add r4, r1, #0x0 - add r3, r2, #0x0 - ldr r0, [r0, #0x24] - add r1, r5, #0x0 - add r2, r4, #0x0 - bl FUN_0201B60C - pop {r3-r5, pc} - nop -_0200CA94: .word gUnknown21C48B8 - - thumb_func_start FUN_0200CA98 -FUN_0200CA98: ; 0x0200CA98 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0200CAB0 ; =gUnknown21C48B8 - add r4, r1, #0x0 - add r3, r2, #0x0 - ldr r0, [r0, #0x20] - add r1, r5, #0x0 - add r2, r4, #0x0 - bl FUN_0201B60C - pop {r3-r5, pc} - nop -_0200CAB0: .word gUnknown21C48B8 - - thumb_func_start FUN_0200CAB4 -FUN_0200CAB4: ; 0x0200CAB4 - ldr r3, _0200CAB8 ; =FUN_0201B6A0 - bx r3 - .balign 4 -_0200CAB8: .word FUN_0201B6A0 diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c new file mode 100644 index 00000000..5c422ba7 --- /dev/null +++ b/arm9/src/unk_0200CA44.c @@ -0,0 +1,31 @@ +#include "global.h" +#include "main.h" +#include "unk_0200CA44.h" + +extern void FUN_0201B60C(s32, u16, u16, u16); +extern void FUN_0201B6A0(s32); + +THUMB_FUNC void FUN_0200CA44(u16 r0, u16 r1, u16 r2) +{ + FUN_0201B60C(gUnknown21C48B8.unk18,r0,r1,r2); +} + +THUMB_FUNC void FUN_0200CA60(u16 r0, u16 r1, u16 r2) +{ + FUN_0201B60C(gUnknown21C48B8.unk1C,r0,r1,r2); +} + +THUMB_FUNC void FUN_0200CA7C(u16 r0, u16 r1, u16 r2) +{ + FUN_0201B60C(gUnknown21C48B8.unk24,r0,r1,r2); +} + +THUMB_FUNC void FUN_0200CA98(u16 r0, u16 r1, u16 r2) +{ + FUN_0201B60C(gUnknown21C48B8.unk20,r0,r1,r2); +} + +THUMB_FUNC void FUN_0200CAB4(s32 unk1) +{ + FUN_0201B6A0(unk1); +} diff --git a/include/unk_0200CA44.h b/include/unk_0200CA44.h new file mode 100644 index 00000000..2c681b8d --- /dev/null +++ b/include/unk_0200CA44.h @@ -0,0 +1,10 @@ +#ifndef POKEDIAMOND_UNK_0200CA44_H +#define POKEDIAMOND_UNK_0200CA44_H + +void FUN_0200CA44(u16 r0, u16 r1, u16 r2); +void FUN_0200CA60(u16 r0, u16 r1, u16 r2); +void FUN_0200CA7C(u16 r0, u16 r1, u16 r2); +void FUN_0200CA98(u16 r0, u16 r1, u16 r2); +void FUN_0200CAB4(s32 unk1); + +#endif //POKEDIAMOND_UNK_0200CA44_H |