diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-29 16:06:46 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-07-29 16:06:46 +0100 |
| commit | cd07734f6129367e7b67bd96a55c72c9b78f31da (patch) | |
| tree | 2875f4937515642799476f8c395c9d702ddb47a4 | |
| parent | 1f1fd07d7b36b7ad37af5cebc300f53482875672 (diff) | |
mod63_021DB580
| -rw-r--r-- | arm9/modules/63/asm/mod63_021DB450_asm.s | 13 | ||||
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 9 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 10 |
3 files changed, 19 insertions, 13 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index 23e0b3a9..b9ac26f3 100644 --- a/arm9/modules/63/asm/mod63_021DB450_asm.s +++ b/arm9/modules/63/asm/mod63_021DB450_asm.s @@ -6,19 +6,6 @@ .extern MOD63_021DBEC0 .extern MOD63_021DBEDC - thumb_func_start MOD63_021DB580 -MOD63_021DB580: ; 0x021DB580 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4, #0x18] - bl FUN_02012DE4 - ldr r0, [r4, #0x14] - bl FreeToHeap - ldr r0, [r4] - bl FUN_020072E8 - pop {r4, pc} - thumb_func_end MOD63_021DB580 - thumb_func_start MOD63_021DB598 MOD63_021DB598: ; 0x021DB598 push {r3, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 5f3aaa03..917cf859 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -26,9 +26,18 @@ typedef struct UnkStruct63_021DBEF0 u32 field_04; } UnkStruct63_021DBEF0; +typedef struct UnkStruct63_021DB580 //possibly part of the above structs? +{ + u32 field_00; + u8 filler[0x10]; + void *field_20; + u32 field_24; +} UnkStruct63_021DB580; + 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); #endif //POKEDIAMOND_MOD63_021DB450_H diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 9593d612..fd221b2c 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -22,6 +22,9 @@ extern u32 FUN_0201343C(void); extern void FUN_02013194(void *, u32, u32, u32); extern u32 FUN_0201318C(u32, u32, u32); +extern void FUN_02012DE4(u32); +extern void FUN_020072E8(u32); + //todo funcs void MOD63_021DB720(); void MOD63_021DB784(); @@ -77,6 +80,13 @@ THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB49C * arg FUN_02013194(arg0->field_18, FUN_0201318C(0x3D, 4, 0x4C), 10, 1); } +THUMB_FUNC void MOD63_021DB580(UnkStruct63_021DB580 *param0) +{ + FUN_02012DE4(param0->field_24); + FreeToHeap(param0->field_20); + FUN_020072E8(param0->field_00); +} + void * const MOD63_021DBED8 = MOD63_021DB720; void * const MOD63_021DBEDC[5] = { MOD63_021DB784, MOD63_021DB7D0, MOD63_021DB838, MOD63_021DB884, MOD63_021DB8E8 }; |