pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 23:31:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge structs

Browse Source
This commit is contained in:
PikalaxALT
2020-08-01 09:44:12 -04:00
parent feaa5cf511
commit 2a752368b7
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm9/modules/63/include/mod63_021DB450.h
+1 -9
View File
@@ -35,14 +35,6 @@ typedef struct UnkStruct63_021DBEF0
u32 field_04;
} UnkStruct63_021DBEF0;
typedef struct UnkStruct63_021DB580
{
u32 field_00;
u8 filler[0x10];
void *field_20;
u32 field_24;
} UnkStruct63_021DB580;
typedef struct UnkStruct63_021DBED8
{
BOOL (*unk_00)(struct UnkStruct63_021DB450 *, u32);
@@ -53,7 +45,7 @@ u32 MOD63_021DB450(u32 param0, u32 param1);
u32 MOD63_021DB474(u32 param0, u32 param1);
u32 MOD63_021DB498(void);
void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0);
void MOD63_021DB580(UnkStruct63_021DB580 *param0);
void MOD63_021DB580(UnkStruct63_021DB450 *param0);
void MOD63_021DB598(UnkStruct63_021DB450 *param0);
void MOD63_021DB5A8(UnkStruct63_021DB450 *param0);
BOOL MOD63_021DB5CC(UnkStruct63_021DB450 *param0, u32 param1, s32 param2);
arm9/modules/63/src/mod63_021DB450.c
+5 -5
View File
@@ -23,8 +23,8 @@ 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);
extern void FUN_02012DE4(void *);
extern void FUN_020072E8(struct UnkStruct63_021DB450 *);
extern void FUN_020081C4(struct UnkStruct63_021DB450 *);
@@ -91,10 +91,10 @@ THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg
FUN_02013194(arg0->field_18, FUN_0201318C(0x3D, 4, 0x4C), 10, 1);
}
THUMB_FUNC void MOD63_021DB580(UnkStruct63_021DB580 *param0)
THUMB_FUNC void MOD63_021DB580(UnkStruct63_021DB450 *param0)
{
FUN_02012DE4(param0->field_24);
FreeToHeap(param0->field_20);
FUN_02012DE4(param0->field_18);
FreeToHeap(param0->field_14);
FUN_020072E8(param0->field_00);
}