diff options
| -rw-r--r-- | arm9/modules/20/asm/module_20.s | 12 | ||||
| -rw-r--r-- | arm9/src/unk_0200CA44.c | 18 | ||||
| -rw-r--r-- | include/unk_0200CA44.h | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 107de27a..6794fd36 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -197,7 +197,7 @@ MOD20_0225257C: ; 0x0225257C add r0, r4, #0 bl MOD20_02252A08 add r0, r4, #0 - bl MOD20_022528FC + bl ClosePoketchApp ldr r0, [r4, #0x1c] bl MOD20_02252E18 pop {r4, pc} @@ -443,7 +443,7 @@ _02252750: cmp r0, #0 beq _022527AA add r0, r4, #0 - bl MOD20_022528FC + bl ClosePoketchApp bl FUN_020893E0 add r0, r4, #0 mov r1, #2 @@ -610,7 +610,7 @@ _02252890: cmp r0, #0 beq _022528AC add r0, r4, #0 - bl MOD20_022528FC + bl ClosePoketchApp bl FUN_0201CD04 add r0, r4, #0 mov r1, #4 @@ -663,8 +663,8 @@ _022528F4: .word sPoketchAppOverlayMapping _022528F8: .word sPoketchAppOverlayMapping + 4 thumb_func_end LoadPoketchApp - thumb_func_start MOD20_022528FC -MOD20_022528FC: ; 0x022528FC + thumb_func_start ClosePoketchApp +ClosePoketchApp: ; 0x022528FC push {r4, lr} add r4, r0, #0 mov r0, #0 @@ -679,7 +679,7 @@ MOD20_022528FC: ; 0x022528FC str r0, [r4, #0x14] _02252916: pop {r4, pc} - thumb_func_end MOD20_022528FC + thumb_func_end ClosePoketchApp thumb_func_start MOD20_02252918 MOD20_02252918: ; 0x02252918 diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c index 5c422ba7..90b07f59 100644 --- a/arm9/src/unk_0200CA44.c +++ b/arm9/src/unk_0200CA44.c @@ -2,27 +2,27 @@ #include "main.h" #include "unk_0200CA44.h" -extern void FUN_0201B60C(s32, u16, u16, u16); +extern void FUN_0201B60C(s32, void (*)(void *, void *), void *, void *); extern void FUN_0201B6A0(s32); -THUMB_FUNC void FUN_0200CA44(u16 r0, u16 r1, u16 r2) +THUMB_FUNC void FUN_0200CA44(void (*r0)(void *, void *), void * r1, void * r2) { - FUN_0201B60C(gUnknown21C48B8.unk18,r0,r1,r2); + FUN_0201B60C(gUnknown21C48B8.unk18, r0, r1, r2); } -THUMB_FUNC void FUN_0200CA60(u16 r0, u16 r1, u16 r2) +THUMB_FUNC void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2) { - FUN_0201B60C(gUnknown21C48B8.unk1C,r0,r1,r2); + FUN_0201B60C(gUnknown21C48B8.unk1C, r0, r1, r2); } -THUMB_FUNC void FUN_0200CA7C(u16 r0, u16 r1, u16 r2) +THUMB_FUNC void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2) { - FUN_0201B60C(gUnknown21C48B8.unk24,r0,r1,r2); + FUN_0201B60C(gUnknown21C48B8.unk24, r0, r1, r2); } -THUMB_FUNC void FUN_0200CA98(u16 r0, u16 r1, u16 r2) +THUMB_FUNC void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2) { - FUN_0201B60C(gUnknown21C48B8.unk20,r0,r1,r2); + FUN_0201B60C(gUnknown21C48B8.unk20, r0, r1, r2); } THUMB_FUNC void FUN_0200CAB4(s32 unk1) diff --git a/include/unk_0200CA44.h b/include/unk_0200CA44.h index 2c681b8d..27d58c5c 100644 --- a/include/unk_0200CA44.h +++ b/include/unk_0200CA44.h @@ -1,10 +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_0200CA44(void (*r0)(void *, void *), void * r1, void * r2); +void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2); +void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2); +void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2); void FUN_0200CAB4(s32 unk1); #endif //POKEDIAMOND_UNK_0200CA44_H |