diff --git a/data/data_8115F5C_2.s b/data/data_8115F5C_2.s
index a249c9547..d44663496 100644
--- a/data/data_8115F5C_2.s
+++ b/data/data_8115F5C_2.s
@@ -5,111 +5,6 @@
 
 
 
-.global gUnknown_8116238
-gUnknown_8116238: @ 8116238
-.4byte 1
-.4byte sub_802B2D4
-.4byte sub_802B3B8
-.4byte sub_802B358
-
-.global gUnknown_8116248
-gUnknown_8116248: @ 8116248
-.4byte 1
-.4byte CreateThankYouMailPelipper
-.4byte CleanThankYouMailPelipper
-.4byte ThankYouMailPelipperCallback
-
-.global gUnknown_8116258
-gUnknown_8116258: @ 8116258
-.4byte 1
-.4byte 0
-.4byte CleanHelperPelipper
-.4byte HelperPelipperCallback
-
-.global gUnknown_8116268
-gUnknown_8116268: @ 8116268
-.4byte 1
-.4byte sub_802E864
-.4byte sub_809C550
-.4byte sub_802E890
-
-.global gUnknown_8116278
-gUnknown_8116278: @ 8116278
-.4byte 1
-.4byte sub_802DFB0
-.4byte sub_802E06C
-.4byte sub_802DFD8
-
-.global gUnknown_8116288
-gUnknown_8116288: @ 8116288
-.4byte 1
-.4byte 0
-.4byte sub_802DC00
-.4byte sub_802DBD4
-
-.global gUnknown_8116298
-gUnknown_8116298: @ 8116298
-.4byte 1
-.4byte 0
-.4byte MakuhitaDojo_Delete
-.4byte HandleMakuhitaDojoState
-
-.global gUnknown_81162A8
-gUnknown_81162A8: @ 81162A8
-.4byte 1
-.4byte 0
-.4byte MakuhitaDojo_Delete
-.4byte HandleMakuhitaDojoState
-
-.global gUnknown_81162B8
-gUnknown_81162B8: @ 81162B8
-        .4byte 1
-        .4byte 0
-        .4byte MakuhitaDojo_Delete
-        .4byte HandleMakuhitaDojoState
-
-.global gUnknown_81162C8
-gUnknown_81162C8: @ 81162C8
-        .4byte 0
-        .4byte CreateTestTracker
-        .4byte sub_809C464
-        .4byte HandleTestTrackerState
-
-.global gUnknown_81162D8
-gUnknown_81162D8: @ 81162D8
-        .4byte 0
-        .4byte sub_8035678
-        .4byte sub_809C478
-        .4byte sub_80356A0
-
-.global gUnknown_81162E8
-gUnknown_81162E8: @ 81162E8
-        .4byte 0
-        .4byte 0
-        .4byte sub_809C4B0
-        .4byte sub_803B120
-
-.global gUnknown_81162F8
-gUnknown_81162F8: @ 81162F8
-        .4byte 1
-        .4byte 0
-        .4byte sub_809C414
-        .4byte sub_8025354
-
-.global gUnknown_8116308
-gUnknown_8116308: @ 8116308
-        .4byte 0
-        .4byte 0
-        .4byte 0
-        .4byte sub_809CD48
-
-.global gUnknown_8116318
-gUnknown_8116318: @ 8116318
-        .4byte 1
-        .4byte 0
-        .4byte sub_801B72C
-        .4byte sub_801B6AC
-
 .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64
 .byte 0x69, 0x72, 0x30, 0x00
 
diff --git a/include/code_801D014.h b/include/code_801D014.h
index e808c5a8c..63168f5b7 100644
--- a/include/code_801D014.h
+++ b/include/code_801D014.h
@@ -32,7 +32,7 @@ struct TeamBadgeData
 };
 
 bool8 sub_801D014(PokemonStruct1 *);
-s32 sub_801D0DC(void);
+u32 sub_801D0DC(void);
 u32 sub_801D178(void);
 u8 sub_801D1D4(void);
 void sub_801D1E0(void);
diff --git a/include/credits2.h b/include/credits2.h
index 3e57f03b5..9f815bfa6 100644
--- a/include/credits2.h
+++ b/include/credits2.h
@@ -12,4 +12,4 @@ bool8 sub_8035678(void);
 u32 sub_80356A0(void);
 void sub_8035758(void);
 
-#endif // GUARD_CREDITS2_H
\ No newline at end of file
+#endif // GUARD_CREDITS2_H
diff --git a/include/felicity_bank.h b/include/felicity_bank.h
index 4c8598284..42c65e138 100644
--- a/include/felicity_bank.h
+++ b/include/felicity_bank.h
@@ -28,6 +28,6 @@ typedef struct FelicityBankWork
 bool8 CreateFelicityBank(s32 mode);
 void DestroyFelicityBank(void);
 void DrawTeamMoneyBox(u32);
-s32 FelicityBankCallback(void);
+u32 FelicityBankCallback(void);
 
 #endif // GUARD_FELICITY_BANK_H
diff --git a/include/gulpin_shop_801FB50.h b/include/gulpin_shop_801FB50.h
index dfbeea9c7..a3bc8f0f8 100644
--- a/include/gulpin_shop_801FB50.h
+++ b/include/gulpin_shop_801FB50.h
@@ -39,7 +39,7 @@ typedef struct unkStruct_203B27C
 } unkStruct_203B27C;
 
 bool8 sub_801FB50(u32 mode);
-s32 sub_801FC40(void);
+u32 sub_801FC40(void);
 void sub_801FD7C(void);
 
 #endif // GUARD_GULPIN_SHOP_801FB50_H
diff --git a/include/kangaskhan_storage1.h b/include/kangaskhan_storage1.h
index b569e45a8..08f4edffe 100644
--- a/include/kangaskhan_storage1.h
+++ b/include/kangaskhan_storage1.h
@@ -52,6 +52,6 @@ struct KangaskhanStorageWork
 
 bool8 CreateKangaskhanStorage(u32 mode);
 void DeleteKangaskhanStorage(void);
-s32 KangaskhanStorageCallback(void);
+u32 KangaskhanStorageCallback(void);
 
 #endif // GUARD_KANGASKHAN_STORAGE1_H
diff --git a/include/kangaskhan_storage2.h b/include/kangaskhan_storage2.h
index b18001a89..24238ba41 100644
--- a/include/kangaskhan_storage2.h
+++ b/include/kangaskhan_storage2.h
@@ -31,7 +31,7 @@ typedef struct unkStruct_203B20C
 } unkStruct_203B20C;
 
 bool8 sub_8017E1C(void);
-s32 sub_8017E54(void);
+u32 sub_8017E54(void);
 void sub_8017EF4(void);
 
 #endif // GUARD_KANGASKHAN_STORAGE2_H
diff --git a/include/kecleon_bros1.h b/include/kecleon_bros1.h
index ec35c5c88..43427d2db 100644
--- a/include/kecleon_bros1.h
+++ b/include/kecleon_bros1.h
@@ -71,6 +71,6 @@ typedef struct KecleonBrosWork1
 // mode corresponds to the enum: KecleonBrosMode
 bool8 CreateKecleonBros(u32 mode);
 void DeleteKecleonBros(void);
-s32 KecleonBrosCallback(void);
+u32 KecleonBrosCallback(void);
 
 #endif // GUARD_KECLEON_BROS1_H
diff --git a/include/personality_test1.h b/include/personality_test1.h
index 7c1dc7979..fedfaa38d 100644
--- a/include/personality_test1.h
+++ b/include/personality_test1.h
@@ -39,6 +39,6 @@ struct PersonalityTestTracker
 
 bool8 CreateTestTracker(void);
 void DeleteTestTracker(void);
-u8 HandleTestTrackerState(void);
+u32 HandleTestTrackerState(void);
 
 #endif // GUARD_PERSONALITY_TEST1_H
diff --git a/include/structs/str_3001B64.h b/include/structs/str_3001B64.h
index 486650c3d..3b66da5bb 100644
--- a/include/structs/str_3001B64.h
+++ b/include/structs/str_3001B64.h
@@ -38,7 +38,7 @@ struct unkStruct_3001B64_unk418
     u16 unk0;
     u8 (*unk4)(void);
     void (*unk8)(void);
-    s32 (*unkC)(void);
+    u32 (*unkC)(void);
 };
 
 struct unkStruct_3001B64
diff --git a/include/wigglytuff_shop3.h b/include/wigglytuff_shop3.h
index 25c662092..48a12c019 100644
--- a/include/wigglytuff_shop3.h
+++ b/include/wigglytuff_shop3.h
@@ -60,7 +60,7 @@ typedef struct WigglytuffShop3Work
 } WigglytuffShop3Work;
 
 bool8 CreateWigglytuffShop(u32 mode);
-s32 sub_8021C5C(void);
+u32 sub_8021C5C(void);
 void CleanWigglytuffShop(void);
 
 #endif // GUARD_WIGGLYTUFF_SHOP3_H
diff --git a/include/wonder_mail.h b/include/wonder_mail.h
index 0ae0ceb57..1cf88327f 100644
--- a/include/wonder_mail.h
+++ b/include/wonder_mail.h
@@ -35,6 +35,6 @@ typedef struct WonderMailStruct_203B2C0
 } WonderMailStruct_203B2C0;
 
 u8 sub_8027F88(void);
-s32 sub_8028078(void);
+u32 sub_8028078(void);
 
 #endif // GUARD_WONDER_MAIL_H
diff --git a/src/code_801D014.c b/src/code_801D014.c
index 62c55765b..0769db871 100644
--- a/src/code_801D014.c
+++ b/src/code_801D014.c
@@ -95,7 +95,7 @@ bool8 sub_801D014(PokemonStruct1 *a0)
     return TRUE;
 }
 
-s32 sub_801D0DC(void)
+u32 sub_801D0DC(void)
 {
     switch (sUnknown_203B250->state) {
         case 0:
diff --git a/src/code_809A560.c b/src/code_809A560.c
index d45e33462..939b94d54 100644
--- a/src/code_809A560.c
+++ b/src/code_809A560.c
@@ -696,12 +696,15 @@ extern void sub_8099A34(s32 a0);
 extern void sub_8099A48(s32 a0);
 extern void GroundScriptLock(s16 index, s32 r1);
 extern void GroundScriptLockJumpZero(s16 index);
+extern u8 sub_802B2D4(void);
+extern void sub_802B3B8(void);
+extern u32 sub_802B358(void);
 void sub_8096AF8(struct unkStruct_8096AF8 *, u8 slotIndex, u8 dungeon);
 u8 sub_802DB28(u8, u8);
 void sub_8096BD0();
 void ScenarioCalc(s16 varId, s32 main, s32 sub);
 void MakuhitaDojo_Delete();
-s32 HandleMakuhitaDojoState();
+u32 HandleMakuhitaDojoState();
 s16 sub_802FED0();
 u8 sub_801FB50();
 void sub_80151C0();
@@ -768,6 +771,22 @@ u32 sub_80282DC(u8 *r0);
 void sub_809927C(u8);
 void sub_80282FC(void);
 void sub_8001064(void);
+extern u8 CreateThankYouMailPelipper(void);
+extern u8 sub_802E864(void);
+extern u8 sub_802DFB0(void);
+extern void CleanThankYouMailPelipper(void);
+extern void CleanHelperPelipper(void);
+extern void sub_802E06C(void);
+extern void sub_802DC00(void);
+extern void sub_801B72C(void);
+extern u32 ThankYouMailPelipperCallback(void);
+extern u32 HelperPelipperCallback(void);
+extern u32 sub_802E890(void);
+extern u32 sub_802DFD8(void);
+extern u32 sub_802DBD4(void);
+extern u32 sub_803B120(void);
+extern u32 sub_809CD48(void);
+extern u32 sub_801B6AC(void);
 
 void sub_809AFC8(s32 a0_, s32 a1, s32 a2_, const char *text)
 {
@@ -789,6 +808,17 @@ bool8 sub_809AFFC(u8 *a0)
 }
 
 u8 *sub_809B428(u8 *a0, s32 a1, u8 *a2);
+bool8 sub_809B648(void);
+void sub_809B57C(void);
+bool8 sub_809B1D4(s32 a0, u32 kind, s32 a2, u8 *a3);
+void sub_809C39C(void);
+void sub_809C3D8(void);
+void sub_809C504(void);
+void sub_809C464(void);
+void sub_809C478(void);
+void sub_809C414(void);
+void sub_809C4B0(void);
+void sub_809C550(void);
 
 void sub_809B028(const MenuItem * menuItems, s32 a1_, s32 a2, s32 a3, s32 a4_, const char *text)
 {
@@ -828,8 +858,6 @@ bool8 sub_809B18C(s32 *sp)
     return (gUnknown_3001B64->unk420 == 3);
 }
 
-bool8 sub_809B1D4(s32 a0, u32 kind, s32 a2, u8 *a3);
-
 bool8 sub_809B1C0(s32 a0, u32 kind, u8 *a2)
 {
     return sub_809B1D4(a0, kind, 0, a2);
@@ -962,9 +990,6 @@ u8 *sub_809B428(u8 *a0, s32 a1, u8 *a2)
     }
 }
 
-bool8 sub_809B648(void);
-void sub_809B57C(void);
-
 void sub_809B474(void)
 {
     const struct unkStruct_3001B64_unk418 *unkStructPtr;
@@ -1079,10 +1104,6 @@ void nullsub_210(void)
 
 }
 
-void sub_809C39C(void);
-void sub_809C3D8(void);
-void sub_809C504(void);
-
 static const struct unkStruct_3001B64_unk418 gUnknown_81161A8 =
 {
     .unk0 = 1,
@@ -1155,21 +1176,126 @@ static const struct unkStruct_3001B64_unk418 gUnknown_8116228 =
     .unkC = sub_8028078,
 };
 
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162F8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116298;
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162A8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162B8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162C8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162D8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_81162E8;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116308;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116318;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116238;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116248;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116258;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116268;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116278;
-extern const struct unkStruct_3001B64_unk418 gUnknown_8116288;
+static const struct unkStruct_3001B64_unk418 gUnknown_8116238 =
+{
+    .unk0 = 1,
+    .unk4 = sub_802B2D4,
+    .unk8 = sub_802B3B8,
+    .unkC = sub_802B358,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116248 =
+{
+    .unk0 = 1,
+    .unk4 = CreateThankYouMailPelipper,
+    .unk8 = CleanThankYouMailPelipper,
+    .unkC = ThankYouMailPelipperCallback,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116258 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = CleanHelperPelipper,
+    .unkC = HelperPelipperCallback,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116268 =
+{
+    .unk0 = 1,
+    .unk4 = sub_802E864,
+    .unk8 = sub_809C550,
+    .unkC = sub_802E890,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116278 =
+{
+    .unk0 = 1,
+    .unk4 = sub_802DFB0,
+    .unk8 = sub_802E06C,
+    .unkC = sub_802DFD8,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116288 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = sub_802DC00,
+    .unkC = sub_802DBD4,
+};
+
+// These 3 are identical
+static const struct unkStruct_3001B64_unk418 gUnknown_8116298 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = MakuhitaDojo_Delete,
+    .unkC = HandleMakuhitaDojoState,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162A8 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = MakuhitaDojo_Delete,
+    .unkC = HandleMakuhitaDojoState,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162B8 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = MakuhitaDojo_Delete,
+    .unkC = HandleMakuhitaDojoState,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162C8 =
+{
+    .unk0 = 0,
+    .unk4 = CreateTestTracker,
+    .unk8 = sub_809C464,
+    .unkC = HandleTestTrackerState,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162D8 =
+{
+    .unk0 = 0,
+    .unk4 = sub_8035678,
+    .unk8 = sub_809C478,
+    .unkC = sub_80356A0,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162E8 =
+{
+    .unk0 = 0,
+    .unk4 = NULL,
+    .unk8 = sub_809C4B0,
+    .unkC = sub_803B120,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_81162F8 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = sub_809C414,
+    .unkC = sub_8025354,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116308 =
+{
+    .unk0 = 0,
+    .unk4 = NULL,
+    .unk8 = NULL,
+    .unkC = sub_809CD48,
+};
+
+static const struct unkStruct_3001B64_unk418 gUnknown_8116318 =
+{
+    .unk0 = 1,
+    .unk4 = NULL,
+    .unk8 = sub_801B72C,
+    .unkC = sub_801B6AC,
+};
 
 bool8 sub_809B648(void)
 {
diff --git a/src/felicity_bank.c b/src/felicity_bank.c
index d0a733622..1280b9034 100644
--- a/src/felicity_bank.c
+++ b/src/felicity_bank.c
@@ -78,7 +78,7 @@ bool8 CreateFelicityBank(s32 mode)
     return TRUE;
 }
 
-s32 FelicityBankCallback(void)
+u32 FelicityBankCallback(void)
 {
     switch (sFelicityBankWork->currState) {
         case 1:
diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c
index 2f72a12da..5909e414b 100644
--- a/src/gulpin_shop_801FB50.c
+++ b/src/gulpin_shop_801FB50.c
@@ -108,7 +108,7 @@ bool8 sub_801FB50(u32 mode)
     return TRUE;
 }
 
-s32 sub_801FC40(void)
+u32 sub_801FC40(void)
 {
     switch (gUnknown_203B27C->state) {
         case 0:
diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c
index c4082436e..410fbd3c3 100644
--- a/src/kangaskhan_storage1.c
+++ b/src/kangaskhan_storage1.c
@@ -74,7 +74,7 @@ bool8 CreateKangaskhanStorage(u32 mode)
     return TRUE;
 }
 
-s32 KangaskhanStorageCallback(void)
+u32 KangaskhanStorageCallback(void)
 {
     switch (gKangaskhanStorageWork->currState) {
         case KANGASKHAN_STORAGE_INIT:
diff --git a/src/kangaskhan_storage2.c b/src/kangaskhan_storage2.c
index 0a23f9015..830d2490c 100644
--- a/src/kangaskhan_storage2.c
+++ b/src/kangaskhan_storage2.c
@@ -51,7 +51,7 @@ bool8 sub_8017E1C(void)
     return TRUE;
 }
 
-s32 sub_8017E54(void)
+u32 sub_8017E54(void)
 {
     switch (sUnknown_203B20C->state) {
         case KANGASKHAN_STORAGE_2_INIT:
diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c
index 31c4338e3..f42766aca 100644
--- a/src/kecleon_bros1.c
+++ b/src/kecleon_bros1.c
@@ -114,7 +114,7 @@ bool8 CreateKecleonBros(u32 mode)
     return TRUE;
 }
 
-s32 KecleonBrosCallback(void)
+u32 KecleonBrosCallback(void)
 {
     switch (sKecleonBrosWork1->currState) {
         case KECLEON_STORE_INIT:
diff --git a/src/personality_test1.c b/src/personality_test1.c
index 0477e732c..5518629e1 100644
--- a/src/personality_test1.c
+++ b/src/personality_test1.c
@@ -93,7 +93,7 @@ static void InitializeTestStats(void)
     sPersonalityTestTracker->playerGender = 0;
 }
 
-u8 HandleTestTrackerState(void)
+u32 HandleTestTrackerState(void)
 {
     s32 counter;
     s32 iVar1;
diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c
index 66e0e0ee6..eabf966ef 100644
--- a/src/wigglytuff_shop3.c
+++ b/src/wigglytuff_shop3.c
@@ -81,7 +81,7 @@ bool8 CreateWigglytuffShop(u32 mode)
     return TRUE;
 }
 
-s32 sub_8021C5C(void)
+u32 sub_8021C5C(void)
 {
     switch (sWigglytuffShop3Work->state) {
         case WIGGLYTUFF_INIT:
diff --git a/src/wonder_mail.c b/src/wonder_mail.c
index c92ccdc28..87b2cf857 100644
--- a/src/wonder_mail.c
+++ b/src/wonder_mail.c
@@ -212,7 +212,7 @@ u8 sub_8027F88(void)
   return 1;
 }
 
-s32 sub_8028078(void)
+u32 sub_8028078(void)
 {
 
   switch(sUnknown_203B2C0->state) {
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index 839c18d29..4a9b3ea35 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -74,7 +74,7 @@ ALIGNED(4) const char gUnknown_80DFB14[] = _(
 	" Please give me a shout if\n"
 	"you would like to send {COLOR CYAN_G}A-OK Mail{RESET}.");
 
-s32 sub_802B2D4(void)
+u8 sub_802B2D4(void)
 {
   OpenedFile *faceFile;
 
@@ -102,7 +102,7 @@ s32 sub_802B2D4(void)
   }
 }
 
-u32 sub_802B358(void)
+s32 sub_802B358(void)
 {
   switch(sUnknown_203B2C8->currState) {
     case INIT_STATE: