diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-29 22:19:14 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-07-29 22:19:14 +0100 |
| commit | 90b0ca8e0ed243029c773428e98f5e56319f2b60 (patch) | |
| tree | e7b759e3d7a23b254ccff29e845df4421257a571 | |
| parent | 815cbf5facc2d811ee7a8c39bfee8eda9055f5d8 (diff) | |
mod63_021DB5A8
| -rw-r--r-- | arm9/modules/63/asm/mod63_021DB450_asm.s | 18 | ||||
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 6 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 19 |
3 files changed, 25 insertions, 18 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index 131804c3..e32c5ccf 100644 --- a/arm9/modules/63/asm/mod63_021DB450_asm.s +++ b/arm9/modules/63/asm/mod63_021DB450_asm.s @@ -6,24 +6,6 @@ .extern MOD63_021DBEC0 .extern MOD63_021DBEDC - thumb_func_start MOD63_021DB5A8 -MOD63_021DB5A8: ; 0x021DB5A8 - push {r4, lr} - add r4, r0, #0 - beq _021DB5C8 - bl FUN_020222AC - bl FUN_020B02C8 - ldr r0, [r4] - bl FUN_02006ED4 - bl MOD63_021DB934 - mov r0, #1 - mov r1, #0 - bl FUN_020222B4 -_021DB5C8: - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD63_021DB5A8 - thumb_func_start MOD63_021DB5CC MOD63_021DB5CC: ; 0x021DB5CC push {r3, r4, r5, r6, r7, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 5e869f1e..2fd902ce 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -39,11 +39,17 @@ typedef struct UnkStruct63_021DB598 //part of the above? u32 field_00; } UnkStruct63_021DB598; +typedef struct UnkStruct63_021DB5A8 //possibly the same as above +{ + u32 field_00; +} UnkStruct63_021DB5A8; + u32 MOD63_021DB450(u32 param0, u32 param1); u32 MOD63_021DB474(u32 param0, u32 param1); u32 MOD63_021DB498(void); void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB49C * arg0); void MOD63_021DB580(UnkStruct63_021DB580 *param0); void MOD63_021DB598(UnkStruct63_021DB598 *param0); +void MOD63_021DB5A8(UnkStruct63_021DB5A8 *param0); #endif //POKEDIAMOND_MOD63_021DB450_H diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index c3e6c84a..20aaa310 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -27,6 +27,12 @@ extern void FUN_020072E8(u32); extern void FUN_020081C4(u32); +extern void FUN_020222AC(void); +extern void FUN_020B02C8(void); +extern u32 FUN_02006ED4(u32 param0); +extern void MOD63_021DB934(void); +extern void FUN_020222B4(u32, u32); + //todo funcs void MOD63_021DB720(); void MOD63_021DB784(); @@ -98,6 +104,19 @@ THUMB_FUNC void MOD63_021DB598(UnkStruct63_021DB598 *param0) FUN_020081C4(param0->field_00); } +THUMB_FUNC void MOD63_021DB5A8(UnkStruct63_021DB5A8 *param0) +{ + if (param0 == NULL) + { + return; + } + FUN_020222AC(); + FUN_020B02C8(); + (void)FUN_02006ED4(param0->field_00); + MOD63_021DB934(); + FUN_020222B4(1, 0); +} + void * const MOD63_021DBED8 = MOD63_021DB720; void * const MOD63_021DBEDC[5] = { MOD63_021DB784, MOD63_021DB7D0, MOD63_021DB838, MOD63_021DB884, MOD63_021DB8E8 }; |