From a125d1fb025c9fbf1d6857722a5cf591f430bf48 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 16 May 2021 20:47:51 -0400
Subject: More prototype fixing

---
 include/main.h            | 8 ++++----
 include/overlay_manager.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/main.h b/include/main.h
index d40e22f9..2e424e09 100644
--- a/include/main.h
+++ b/include/main.h
@@ -20,7 +20,7 @@ struct UnkStruct_02006234
     struct Unk21DBE18 ovly_mgr;
     u32 unk10;
     u32 unk14;
-    int * unk18;
+    s32 * unk18;
     void * unk1C;
     struct SaveBlock2 * unk20;
     u32 unk24;
@@ -31,9 +31,9 @@ struct Unk2106FA0
     PMBackLightSwitch unk0;
     s32 unk4;
     FSOverlayID unk8;
-    s32 unkC;
+    struct UnkStruct_02006234 *unkC;
     FSOverlayID unk10;
-    struct Unk21DBE18 * unk14;
+    const struct Unk21DBE18 * unk14;
     s32 unk18;
     s32 unk1C;
     struct SaveBlock2 * unk20;
@@ -113,7 +113,7 @@ extern struct Main gMain;
 
 void FUN_02000DF4(void);
 void Main_RunOverlayManager(void);
-void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1);
+void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1);
 void FUN_02000E9C(void);
 void FUN_02000EC8(u32 parameter);
 void FUN_02000EE8(void);
diff --git a/include/overlay_manager.h b/include/overlay_manager.h
index 193bc7e8..534af18d 100644
--- a/include/overlay_manager.h
+++ b/include/overlay_manager.h
@@ -5,7 +5,7 @@
 
 struct Unk21DBE18;
 
-struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id);
+struct UnkStruct_02006234 * OverlayManager_new(const struct Unk21DBE18 * ovly_mgr, s32 * a1, u32 heap_id);
 void OverlayManager_delete(struct UnkStruct_02006234 * a0);
 void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id);
 void * OverlayManager_GetData(struct UnkStruct_02006234 * a0);
-- 
cgit v1.2.3


From 1c7120ac14f155f47dca5c4ff6059121382a562c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 17 May 2021 08:22:16 -0400
Subject: UnkStruct_0202E29C.unkDAD is a bitfield

---
 include/overlay_manager.h | 2 +-
 include/unk_0202E29C.h    | 7 ++++++-
 include/unk_0202F150.h    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/overlay_manager.h b/include/overlay_manager.h
index 534af18d..8d9bd6e3 100644
--- a/include/overlay_manager.h
+++ b/include/overlay_manager.h
@@ -10,7 +10,7 @@ void OverlayManager_delete(struct UnkStruct_02006234 * a0);
 void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id);
 void * OverlayManager_GetData(struct UnkStruct_02006234 * a0);
 void OverlayManager_FreeData(struct UnkStruct_02006234 * a0);
-int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0);
+s32 * OverlayManager_GetField18(struct UnkStruct_02006234 * a0);
 BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0);
 
 #endif //POKEDIAMOND_OVERLAY_MANAGER_H
diff --git a/include/unk_0202E29C.h b/include/unk_0202E29C.h
index d4316336..92998f7c 100644
--- a/include/unk_0202E29C.h
+++ b/include/unk_0202E29C.h
@@ -68,7 +68,12 @@ struct UnkStruct_0202E29C
     u8 unkDAA;
     u8 unkDAB;
     u8 unkDAC;
-    u8 unkDAD;
+    u8 unkDAD_0:1;
+    u8 unkDAD_1:1;
+    u8 unkDAD_2:1;
+    u8 unkDAD_3:1;
+    u8 unkDAD_4:1;
+    u8 unkDAD_5:1;
     u8 unkDAE[0x2];
 };
 
diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h
index ea0846c6..8f5cdd3e 100644
--- a/include/unk_0202F150.h
+++ b/include/unk_0202F150.h
@@ -93,7 +93,7 @@ THUMB_FUNC void FUN_0202F5A4();
 THUMB_FUNC void FUN_0202F820(int param0);
 THUMB_FUNC void FUN_0202F8D4();
 THUMB_FUNC void FUN_0202F910(int param0);
-THUMB_FUNC u32 FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3);
+THUMB_FUNC BOOL FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3);
 THUMB_FUNC u32 FUN_0202F950(u32 param0, u32 param1, u32 param2);
 THUMB_FUNC void FUN_0202F984();
 THUMB_FUNC void FUN_0202F9E0(u32 param0);
-- 
cgit v1.2.3