diff options
| -rw-r--r-- | arm9/modules/21/asm/mod21_02254A6C_asm.s | 20 | ||||
| -rw-r--r-- | arm9/modules/21/include/mod21_02254854.h | 2 | ||||
| -rw-r--r-- | arm9/modules/21/include/mod21_02254A6C.h | 1 | ||||
| -rw-r--r-- | arm9/modules/21/src/mod21_02254854.c | 1 | ||||
| -rw-r--r-- | arm9/modules/21/src/mod21_02254A6C_src.c | 7 |
5 files changed, 9 insertions, 22 deletions
diff --git a/arm9/modules/21/asm/mod21_02254A6C_asm.s b/arm9/modules/21/asm/mod21_02254A6C_asm.s index f1cc2984..3848695a 100644 --- a/arm9/modules/21/asm/mod21_02254A6C_asm.s +++ b/arm9/modules/21/asm/mod21_02254A6C_asm.s @@ -3,26 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD21_02254B10 -MOD21_02254B10: ; 0x02254B10 - push {lr} - sub sp, #0xc - add r2, r0, #0 - add r0, #8 - str r0, [sp] - mov r0, #2 - str r0, [sp, #4] - mov r0, #8 - str r0, [sp, #8] - ldr r0, _02254B30 ; =MOD21_02254DAC - ldr r3, [r2] - bl MOD20_022537E0 - add sp, #0xc - pop {pc} - nop -_02254B30: .word MOD21_02254DAC - thumb_func_end MOD21_02254B10 - thumb_func_start MOD21_02254B34 MOD21_02254B34: ; 0x02254B34 ldr r3, _02254B3C ; =MOD20_02253794 diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index cc716a1d..26501f35 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -12,7 +12,7 @@ typedef struct UnkStruct02254854 u32 Unk14[2]; u8 padding1[4]; u32 Unk20; - u32 Unk24; + void *Unk24; u32 Unk28; } UnkStruct02254854; diff --git a/arm9/modules/21/include/mod21_02254A6C.h b/arm9/modules/21/include/mod21_02254A6C.h index 493c2746..64857190 100644 --- a/arm9/modules/21/include/mod21_02254A6C.h +++ b/arm9/modules/21/include/mod21_02254A6C.h @@ -15,5 +15,6 @@ typedef struct UnkStruct02254A6C BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1); void MOD21_02254AD4(void *param0, void *param1); void MOD21_02254B04(void *param0); +void MOD21_02254B10(u32 *param0, u32 param1); #endif //POKEDIAMOND_MOD21_02254A6C_H diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c index 0cdb0c32..0f706f4d 100644 --- a/arm9/modules/21/src/mod21_02254854.c +++ b/arm9/modules/21/src/mod21_02254854.c @@ -12,7 +12,6 @@ extern void MOD20_02252C14(u32 param0, BOOL param1); extern void MOD20_02254198(BOOL param0); extern void MOD20_022529A0(u32 param0); -extern void MOD21_02254B10(void *param0, u32 param1); extern BOOL MOD21_02254B34(void *param0, u32 param1); extern BOOL MOD21_02254B40(void *param0); extern void MOD20_0225298C(u32 param0); diff --git a/arm9/modules/21/src/mod21_02254A6C_src.c b/arm9/modules/21/src/mod21_02254A6C_src.c index a37b5728..7a792c50 100644 --- a/arm9/modules/21/src/mod21_02254A6C_src.c +++ b/arm9/modules/21/src/mod21_02254A6C_src.c @@ -6,6 +6,8 @@ extern void MOD20_022536F4(u32 *param0, u32 param1); extern u32 MOD20_02252D34(void); extern void *FUN_02006BDC(u32 param0, u32 param1, u32 param2, void *param3, u32 param4); +extern void MOD20_022537E0(void *param0, u32 param1, void *param2, u32 param3, void *param4, u32 param5, u32 param6); +extern void MOD21_02254DAC(void); THUMB_FUNC BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) { @@ -50,3 +52,8 @@ THUMB_FUNC void MOD21_02254B04(void *param0) FreeToHeap(param0); } } + +THUMB_FUNC void MOD21_02254B10(u32 *param0, u32 param1) +{ + MOD20_022537E0(MOD21_02254DAC, param1, param0, *param0, (void *)(param0 + 2), 2, 8); +} |