diff options
author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-04-03 18:10:46 +0200 |
---|---|---|
committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-04-03 18:10:46 +0200 |
commit | c54ec6c98fa9ac1affed7fb1233e9b9aa84a27c2 (patch) | |
tree | 6e6595b81495df893355b1b0bbb3523886bda3ae | |
parent | 2f95637c2d2e57e06e7e9567f9a45980125ba332 (diff) |
run clang-format
-rw-r--r-- | arm9/src/unk_0205FA2C.c | 51 | ||||
-rw-r--r-- | include/unk_0205FA2C.h | 52 |
2 files changed, 47 insertions, 56 deletions
diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c index 25411c1a..93bd2e4e 100644 --- a/arm9/src/unk_0205FA2C.c +++ b/arm9/src/unk_0205FA2C.c @@ -25,9 +25,6 @@ extern void FUN_0202A2C4(u32 param0, u32 param1, u32 *param2); extern u32 FUN_0202A240(u32 param0, u32 param1, u32 param2); extern int FUN_0202A538(u32 param0, u16 param1, u32 param2); - - - const u8 UNK_020F7454[] = { 0x00, 0x01, @@ -43,11 +40,11 @@ const u8 UNK_020F7454[] = { 0x00, }; - -THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id) +THUMB_FUNC u32 FUN_0205FA2C( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id) { - struct UnkPlayerStruct1_0205FA2C *ptr = - (struct UnkPlayerStruct1_0205FA2C *)AllocFromHeapAtEnd(heap_id, sizeof(struct UnkPlayerStruct1_0205FA2C)); + struct UnkPlayerStruct1_0205FA2C *ptr = (struct UnkPlayerStruct1_0205FA2C *)AllocFromHeapAtEnd( + heap_id, sizeof(struct UnkPlayerStruct1_0205FA2C)); struct SaveBlock2 *sav2 = (struct SaveBlock2 *)(param1->unkC); MI_CpuFill8(ptr, 0, sizeof(struct UnkPlayerStruct1_0205FA2C)); @@ -68,9 +65,7 @@ THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct U for (u8 i = 0; i < 6; i++) { ptr->unk2c[i] = param0->unk0e[i]; - } - FUN_020373D4(param1, (u32)&UNK_020F96DC, (u32)ptr); @@ -79,7 +74,8 @@ THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct U return 1; } -THUMB_FUNC u32 FUN_0205FAD8(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1) +THUMB_FUNC u32 FUN_0205FAD8( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1) { if (FUN_0204647C(param1)) { @@ -113,15 +109,13 @@ THUMB_FUNC u32 FUN_0205FAD8(struct UnkCallbackStruct1_0205FA2C *param0, struct U return 2; } - - - - -THUMB_FUNC u32 FUN_0205FB34(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id) +THUMB_FUNC u32 FUN_0205FB34( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id) { struct SaveBlock2 *sav2 = (struct SaveBlock2 *)(param1->unkC); - struct UnkPlayerStruct2_0205FA2C *ptr = (struct UnkPlayerStruct2_0205FA2C *)AllocFromHeapAtEnd(heap_id, sizeof(struct UnkPlayerStruct2_0205FA2C)); + struct UnkPlayerStruct2_0205FA2C *ptr = (struct UnkPlayerStruct2_0205FA2C *)AllocFromHeapAtEnd( + heap_id, sizeof(struct UnkPlayerStruct2_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkPlayerStruct2_0205FA2C)); ptr->options = Sav2_PlayerData_GetOptionsAddr(sav2); @@ -150,7 +144,8 @@ THUMB_FUNC u32 FUN_0205FB34(struct UnkCallbackStruct1_0205FA2C *param0, struct U return 3; } -THUMB_FUNC u32 FUN_0205FBC0(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1) +THUMB_FUNC u32 FUN_0205FBC0( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1) { if (FUN_0204647C(param1)) { @@ -169,7 +164,8 @@ THUMB_FUNC u32 FUN_0205FBC0(struct UnkCallbackStruct1_0205FA2C *param0, struct U THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0) { struct UnkStruct_0204639C *res = FUN_02046528(param0); - struct UnkCallbackStruct1_0205FA2C *res2 = (struct UnkCallbackStruct1_0205FA2C *)FUN_0204652C(param0); + struct UnkCallbackStruct1_0205FA2C *res2 = + (struct UnkCallbackStruct1_0205FA2C *)FUN_0204652C(param0); switch (res2->unk04) { case 0: @@ -192,7 +188,6 @@ THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0) return 0; } - THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, void **param1, u8 param2, @@ -204,7 +199,8 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, { struct UnkStruct_0204639C *res = FUN_02046528(param0); - struct UnkCallbackStruct1_0205FA2C *ptr = (struct UnkCallbackStruct1_0205FA2C *)AllocFromHeap(0xb, sizeof(struct UnkCallbackStruct1_0205FA2C)); + struct UnkCallbackStruct1_0205FA2C *ptr = (struct UnkCallbackStruct1_0205FA2C *)AllocFromHeap( + 0xb, sizeof(struct UnkCallbackStruct1_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkCallbackStruct1_0205FA2C)); ptr->unk08 = param2; @@ -218,8 +214,8 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, FUN_0204640C(res->unk10, &FUN_0205FBE8, (u32 *)ptr); } - -THUMB_FUNC u32 FUN_0205FC9C(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1) +THUMB_FUNC u32 FUN_0205FC9C( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1) { if (FUN_0203384C(param1->unkC)) { @@ -232,7 +228,8 @@ THUMB_FUNC u32 FUN_0205FC9C(struct UnkCallbackStruct2_0205FA2C *param0, struct U return 2; } -THUMB_FUNC u32 FUN_0205FCC4(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1) +THUMB_FUNC u32 FUN_0205FCC4( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1) { if (FUN_0204647C(param1)) { @@ -248,7 +245,8 @@ THUMB_FUNC u32 FUN_0205FCC4(struct UnkCallbackStruct2_0205FA2C *param0, struct U THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0) { struct UnkStruct_0204639C *res = FUN_02046528(param0); - struct UnkCallbackStruct2_0205FA2C *res2 = (struct UnkCallbackStruct2_0205FA2C *)FUN_0204652C(param0); + struct UnkCallbackStruct2_0205FA2C *res2 = + (struct UnkCallbackStruct2_0205FA2C *)FUN_0204652C(param0); switch (res2->unk04) { @@ -269,12 +267,11 @@ THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0) return 0; } - - THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3) { struct UnkStruct_0204639C *res = FUN_02046528(param0); - struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)AllocFromHeap(0xb, sizeof(struct UnkCallbackStruct2_0205FA2C)); + struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)AllocFromHeap( + 0xb, sizeof(struct UnkCallbackStruct2_0205FA2C)); MI_CpuFill8(ptr, 0, sizeof(struct UnkCallbackStruct2_0205FA2C)); ptr->unk12 = param1; diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index c8d6da6d..99cf7606 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -1,7 +1,6 @@ #ifndef POKEDIAMOND_UNK_0205FA2C_H #define POKEDIAMOND_UNK_0205FA2C_H - #include "global.h" #include "MI_memory.h" #include "bag.h" @@ -9,12 +8,11 @@ #include "party.h" #include "player_data.h" #include "script.h" +#include "unk_020286F8.h" +#include "unk_02029FB0.h" #include "unk_0202A8F4.h" #include "unk_0204639C.h" #include "unk_0206BB28.h" -#include "unk_02029FB0.h" -#include "unk_020286F8.h" - struct UnkPlayerStruct1_0205FA2C { @@ -29,14 +27,14 @@ struct UnkPlayerStruct1_0205FA2C u8 unk23; u32 unk24[2]; u8 unk2c[6]; - u8 unk32:4; - u8 unk322:4; + u8 unk32 : 4; + u8 unk322 : 4; u8 unk33; u32 unk34[3]; }; - -struct UnkPlayerStruct2_0205FA2C { +struct UnkPlayerStruct2_0205FA2C +{ /* 0x00 */ struct PlayerParty *player_party; /* 0x04 */ struct Options *options; u32 unk08; @@ -54,12 +52,10 @@ struct UnkPlayerStruct2_0205FA2C { u32 unk24; u32 unk28; u32 unk2c; - }; - - -struct UnkCallbackStruct1_0205FA2C { +struct UnkCallbackStruct1_0205FA2C +{ u32 unk00; u32 unk04; u8 unk08; @@ -72,10 +68,8 @@ struct UnkCallbackStruct1_0205FA2C { void **unk14; }; - - - -struct UnkCallbackStruct2_0205FA2C { +struct UnkCallbackStruct2_0205FA2C +{ u32 unk00; u32 unk04; u32 *unk08; @@ -85,15 +79,14 @@ struct UnkCallbackStruct2_0205FA2C { u16 unk14; }; - - - - - -THUMB_FUNC u32 FUN_0205FA2C(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); -THUMB_FUNC u32 FUN_0205FAD8(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); -THUMB_FUNC u32 FUN_0205FB34(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); -THUMB_FUNC u32 FUN_0205FBC0(struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FA2C( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FAD8( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FB34( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); +THUMB_FUNC u32 FUN_0205FBC0( + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, void **param1, @@ -104,12 +97,13 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, u8 param6, u8 param7); -THUMB_FUNC u32 FUN_0205FC9C(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); -THUMB_FUNC u32 FUN_0205FCC4(struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FC9C( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); +THUMB_FUNC u32 FUN_0205FCC4( + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3); - THUMB_FUNC int FUN_0205FD70(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FDDC(struct UnkStruct_0204639C *param0, u16 param1, u16 param2); @@ -123,4 +117,4 @@ THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2); THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2); THUMB_FUNC BOOL FUN_02060144(u32 **param0); -#endif //POKEDIAMOND_UNK_0205FA2C_H
\ No newline at end of file +#endif // POKEDIAMOND_UNK_0205FA2C_H
\ No newline at end of file |