diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-29 20:59:45 +0100 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-03 15:58:15 -0400 |
| commit | fe3c0487d74c741efa45e9ac65f93d11d8664338 (patch) | |
| tree | 3ae48b4eedbcc5349b3b799d9e5baf8fa7f3acb9 | |
| parent | 01313d4a57b84519f6aa3612e19ebebc3bcbf154 (diff) | |
mod63_021DB598
| -rw-r--r-- | arm9/modules/63/asm/mod63_021DB450_asm.s | 12 | ||||
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 6 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 11 |
3 files changed, 17 insertions, 12 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index b9ac26f3..131804c3 100644 --- a/arm9/modules/63/asm/mod63_021DB450_asm.s +++ b/arm9/modules/63/asm/mod63_021DB450_asm.s @@ -6,18 +6,6 @@ .extern MOD63_021DBEC0 .extern MOD63_021DBEDC - thumb_func_start MOD63_021DB598 -MOD63_021DB598: ; 0x021DB598 - push {r3, lr} - cmp r0, #0 - beq _021DB5A4 - ldr r0, [r0] - bl FUN_020081C4 -_021DB5A4: - pop {r3, pc} - .align 2, 0 - thumb_func_end MOD63_021DB598 - thumb_func_start MOD63_021DB5A8 MOD63_021DB5A8: ; 0x021DB5A8 push {r4, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 917cf859..5e869f1e 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -34,10 +34,16 @@ typedef struct UnkStruct63_021DB580 //possibly part of the above structs? u32 field_24; } UnkStruct63_021DB580; +typedef struct UnkStruct63_021DB598 //part of the above? +{ + u32 field_00; +} UnkStruct63_021DB598; + 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); #endif //POKEDIAMOND_MOD63_021DB450_H diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index fd221b2c..c3e6c84a 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -25,6 +25,8 @@ extern u32 FUN_0201318C(u32, u32, u32); extern void FUN_02012DE4(u32); extern void FUN_020072E8(u32); +extern void FUN_020081C4(u32); + //todo funcs void MOD63_021DB720(); void MOD63_021DB784(); @@ -87,6 +89,15 @@ THUMB_FUNC void MOD63_021DB580(UnkStruct63_021DB580 *param0) FUN_020072E8(param0->field_00); } +THUMB_FUNC void MOD63_021DB598(UnkStruct63_021DB598 *param0) +{ + if (param0 == NULL) + { + return; + } + FUN_020081C4(param0->field_00); +} + void * const MOD63_021DBED8 = MOD63_021DB720; void * const MOD63_021DBEDC[5] = { MOD63_021DB784, MOD63_021DB7D0, MOD63_021DB838, MOD63_021DB884, MOD63_021DB8E8 }; |