Sese's vacation work

24 files changed, 115 insertions, 74 deletions

diff --git a/include/adventure_log.h b/include/adventure_log.h
index 219ea59..bdf3196 100644
--- a/include/adventure_log.h
+++ b/include/adventure_log.h
@@ -1,5 +1,5 @@
-#ifndef ADVENTURE_LOG_H
-#define ADVENTURE_LOG_H
+#ifndef GUARD_ADVENTURE_LOG_H
+#define GUARD_ADVENTURE_LOG_H
 
 void CreateAdventureLogMenu(void);
 void CleanAdventureLogMenu(void);
diff --git a/include/bg.h b/include/bg.h
index 376fb6f..05a8aa4 100644
--- a/include/bg.h
+++ b/include/bg.h
@@ -1,3 +1,6 @@
+#ifndef GUARD_BG_H
+#define GUARD_BG_H
+
 struct BGControlStruct
 {
     u16 padding;
@@ -16,3 +19,4 @@ void SetBGRegYOffset(s32 reg, s32 offset);
 void UpdateBGControlRegisters(void);
 void SetBGOBJEnableFlags(u32 mask);
 
+#endif
diff --git a/include/code_800558C.h b/include/code_800558C.h
index ac037c8..a01943c 100644
--- a/include/code_800558C.h
+++ b/include/code_800558C.h
@@ -1,7 +1,7 @@
-#ifndef GUARD_code_800558C_H
-#define GUARD_code_800558C_H
+#ifndef GUARD_CODE_800558C_H
+#define GUARD_CODE_800558C_H
 
 extern void *gUnknown_203B078;
 void sub_80060EC(void);
 
-#endif //GUARD_code_800558C_H
+#endif //GUARD_CODE_800558C_H
diff --git a/include/code_800B540.h b/include/code_800B540.h
index 050998e..3e6be1f 100644
--- a/include/code_800B540.h
+++ b/include/code_800B540.h
@@ -1,6 +1,6 @@
-#ifndef GUARD_code_800B540_H
-#define GUARD_code_800B540_H
+#ifndef GUARD_CODE_800B540_H
+#define GUARD_CODE_800B540_H
 
 void sub_800CDA8(int a0);
 
-#endif //GUARD_code_800B540_H
+#endif //GUARD_CODE_800B540_H
diff --git a/include/code_8041D5C.h b/include/code_8041D5C.h
index 6c75c23..79a2772 100644
--- a/include/code_8041D5C.h
+++ b/include/code_8041D5C.h
@@ -1,5 +1,5 @@
-#ifndef CODE_8041D5C_H
-#define CODE_8041D5C_H
+#ifndef GUARD_CODE_8041D5C_H
+#define GUARD_CODE_8041D5C_H
 
 struct subStruct_8048524
 {
diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h
index 53b18fb..86fb4e9 100644
--- a/include/constants/bg_music.h
+++ b/include/constants/bg_music.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BG_MUSIC_H
-#define GUARD_BG_MUSIC_H 
+#ifndef GUARD_CONSTANTS_BG_MUSIC_H
+#define GUARD_CONSTANTS_BG_MUSIC_H 
 
 #define MUS_TEAM_BASE 1
 #define MUS_FRIEND_AREA_SWAMP 2
@@ -84,4 +84,4 @@
 
 #define NUM_BG_SONGS 128
 
-#endif //GUARD_BG_MUSIC_H
+#endif //GUARD_CONSTANTS_BG_MUSIC_H
diff --git a/include/debug.h b/include/debug.h
index 1fa5884..f0e0ed0 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -10,9 +10,6 @@ struct DebugLocation
     char *func;
 };
 
-void FatalErrorHang();
-void FatalErrorPrintFuncFileLine(const char *r0, struct DebugLocation *debug);
-void FatalErrorFormatMessage(const char *text, ...);
 void Log(u8 *buffer, const char *text, ...);
 void NDS_DebugInit(void);
 void nullsub_25(void);
diff --git a/include/event_flag.h b/include/event_flag.h
index c9bab15..7010a59 100644
--- a/include/event_flag.h
+++ b/include/event_flag.h
@@ -1,3 +1,6 @@
+#ifndef GUARD_EVENT_FLAG_H
+#define GUARD_EVENT_FLAG_H
+
 struct UnkEventStruct
 {
     /* 0x0 */ s16 *unk0;
@@ -11,3 +14,5 @@ bool8 sub_8002700(void *r0);
 bool8 sub_8002718(u8 *r0);
 void sub_8002758(u32 *r0);
 u8 sub_800276C(void);
+
+#endif // GUARD_EVENT_FLAG_H
diff --git a/include/exclusive_pokemon.h b/include/exclusive_pokemon.h
index 69a4f03..ee3e607 100644
--- a/include/exclusive_pokemon.h
+++ b/include/exclusive_pokemon.h
@@ -1,5 +1,5 @@
-#ifndef EXCLUSIVE_POKEMON_H
-#define EXCLUSIVE_POKEMON_H
+#ifndef GUARD_EXCLUSIVE_POKEMON_H
+#define GUARD_EXCLUSIVE_POKEMON_H
 
 #define NUM_EXCLUSIVE_POKEMON 12
 
@@ -12,7 +12,8 @@ struct ExclusivePokemon
 
 struct ExclusivePokemonData
 {
-    u8 fill0[0x58];
+    u8 fill0[0x48];
+    u32 unk48[4];
     bool8 Exclusives[NUM_EXCLUSIVE_POKEMON];
 };
 
@@ -35,4 +36,4 @@ void LoadExclusivePokemon(void);
 struct ExclusivePokemonData *GetExclusivePokemon(void);
 void InitializeExclusivePokemon(void);
 
-#endif // EXCLUSIVE_POKEMON_H
+#endif // GUARD_EXCLUSIVE_POKEMON_H
diff --git a/include/felicity_bank.h b/include/felicity_bank.h
index 5b68d65..9c2ff13 100644
--- a/include/felicity_bank.h
+++ b/include/felicity_bank.h
@@ -1,5 +1,5 @@
-#ifndef FELICITY_BANK_H
-#define FELICITY_BANK_H
+#ifndef GUARD_FELICITY_BANK_H
+#define GUARD_FELICITY_BANK_H
 
 #include "file_system.h"
 #include "text.h"
diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h
index 43e5036..7c23336 100644
--- a/include/friend_area_action_menu.h
+++ b/include/friend_area_action_menu.h
@@ -1,5 +1,5 @@
-#ifndef FRIEND_AREA_ACTION_MENU_H
-#define FRIEND_AREA_ACTION_MENU_H
+#ifndef GUARD_FRIEND_AREA_ACTION_MENU_H
+#define GUARD_FRIEND_AREA_ACTION_MENU_H
 
 struct unkSubStruct_203B2BC
 {
@@ -16,10 +16,7 @@ struct unkStruct_203B2BC
     s16 unk8;
     u16 unkA;
     u32 unkC;
-    u8 unk10;
-    u8 unk11;
-    u8 unk12;
-    u8 unk13;
+    struct ItemStruct_203B460_ALT unk10;
     u8 unk14;
     u8 fill15[3];
     struct unkSubStruct_203B2BC *unk18;
diff --git a/include/friend_rescue.h b/include/friend_rescue.h
index 9fddbc4..01fee94 100644
--- a/include/friend_rescue.h
+++ b/include/friend_rescue.h
@@ -1,3 +1,6 @@
+#ifndef GUARD_FRIEND_RESCUE_H
+#define GUARD_FRIEND_RESCUE_H
+
 struct WonderMailStruct_203B33C
 {
     // size: 0x568
@@ -17,10 +20,12 @@ struct WonderMailStruct_203B33C
     u8 padding8[0x4C];
     u32 unk35C;
     u8 padding5[0x5C];
-    u32 unk3BC;
-    u8 padding4[0x60];
+    struct UnkTextStruct2 unk3BC[4];
+    struct ItemStruct_203B460 unk41C;
     u32 unk420; // Is this supposed to be a File like 203B2C4?
-    u8 fill424[0x52C - 0x424];
+    u8 fill424[0x524 - 0x424];
+    s32 unk524;
+    u32 unk528;
     u8 unk52C;
     u8 unk52D;
     u8 fill52E;
@@ -33,3 +38,5 @@ struct WonderMailStruct_203B33C
     u8 filler546[0x564 - 0x546];
     s32 unk564;
 };
+
+#endif
diff --git a/include/gUnknown_203B418.h b/include/gUnknown_203B418.h
index a3e287a..3b35a90 100644
--- a/include/gUnknown_203B418.h
+++ b/include/gUnknown_203B418.h
@@ -1,3 +1,6 @@
+#ifndef GUARD_GUNKNOWN_203B418_H
+#define GUARD_GUNKNOWN_203B418_H
+
 #include "code_8041D5C.h"
 
 struct unkStruct_203B418
@@ -34,3 +37,5 @@ struct unkStruct_203B418
     u8 padding2[3];
     u8 unk18217;
 };
+
+#endif
diff --git a/include/gUnknown_203B460.h b/include/gUnknown_203B460.h
index 7418bc1..880fef8 100644
--- a/include/gUnknown_203B460.h
+++ b/include/gUnknown_203B460.h
@@ -1,12 +1,5 @@
-#ifndef GUNKNOWN_203B460_H
-#define GUNKNOWN_203B460_H
-
-struct ItemStruct_203B460
-{
-    u8 unk0;
-    u8 numItems;
-    u8 itemIndex;
-};
+#ifndef GUARD_GUNKNOWN_203B460_H
+#define GUARD_GUNKNOWN_203B460_H
 
 struct subStruct_203B460
 {
diff --git a/include/item.h b/include/item.h
index f088484..ad60657 100644
--- a/include/item.h
+++ b/include/item.h
@@ -1,5 +1,5 @@
-#ifndef ITEMS_H
-#define ITEMS_H
+#ifndef GUARD_ITEMS_H
+#define GUARD_ITEMS_H
 
 struct Item
 {
@@ -21,6 +21,20 @@ struct Item
     /* 0x1F */ u8 fill3;
 };
 
+struct ItemStruct_203B460
+{
+    u8 unk0;
+    u8 numItems;
+    u8 itemIndex;
+};
+
+struct ItemStruct_203B460_ALT
+{
+    u8 itemIndex;
+    u8 numItems;
+    u8 unk2;
+};
+
 enum ItemType
 {
     ITEM_TYPE_THROWABLE,
@@ -69,5 +83,8 @@ u8 *GetItemDescription(u8 itemIndex);
 u32 GetItemUnkFood(u8 itemIndex, u32 r1);
 s32 sub_8090A34(void);
 bool8 sub_8090A60(u8 itemIndex);
+void sub_8090A8C(struct ItemStruct_203B460 *param_1,u8 itemIndex,u8 param_3);
+void sub_8090B08(struct ItemStruct_203B460_ALT *param_1,u8 itemIndex);
+void sub_8090B64(struct ItemStruct_203B460 *param_1, struct ItemStruct_203B460_ALT *param_2);
 
 #endif
diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h
index 6b42151..15e42bd 100644
--- a/include/kangaskhan_storage.h
+++ b/include/kangaskhan_storage.h
@@ -1,9 +1,9 @@
-#ifndef KANGASKHAN_STORAGE_H
-#define KANGASKHAN_STORAGE_H
+#ifndef GUARD_KANGASKHAN_STORAGE_H
+#define GUARD_KANGASKHAN_STORAGE_H
 
 #include "text.h"
 #include "menu.h"
-#include "gUnknown_203B460.h"
+#include "item.h"
 
 struct unkStruct_203B208
 {
@@ -13,7 +13,7 @@ struct unkStruct_203B208
     u32 unk8;
     struct ItemStruct_203B460 unkC;
     u32 unk10;
-    u8 unk14; // another itemIndex?
+    u8 itemIndex; // another itemIndex?
     u8 fill15[0x3];
     u32 unk18;
     u32 unk1C;
@@ -25,7 +25,8 @@ struct unkStruct_203B208
     u32 unkA8;
     u8 unkAC[0xBC - 0xAC];
     u32 unkBC;
-    u8 unkC0[0xD8 - 0xC0];
+    u8 unkC0[0xD4 - 0xC0];
+    u32 unkD4;
     struct OpenedFile *faceFile;
     u8 *faceData;
     u16 unkE0;
diff --git a/include/kecleon_items.h b/include/kecleon_items.h
index 5716ea3..122fe3f 100644
--- a/include/kecleon_items.h
+++ b/include/kecleon_items.h
@@ -1,5 +1,5 @@
-#ifndef KECLEON_ITEMS_H
-#define KECLEON_ITEMS_H
+#ifndef GUARD_KECLEON_ITEMS_H
+#define GUARD_KECLEON_ITEMS_H
 
 #include "gUnknown_203B460.h"
 #include "text.h"
@@ -42,4 +42,4 @@ struct unkStruct_203B210
     struct UnkTextStruct2 unkE8[4];
 };
 
-#endif
+#endif // GUARD_KECLEON_ITEMS_H
diff --git a/include/menu.h b/include/menu.h
index dbaeea6..c400b0a 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,5 +1,5 @@
-#ifndef MENU_H
-#define MENU_H
+#ifndef GUARD_MENU_H
+#define GUARD_MENU_H
 
 struct MenuItem
 {
@@ -7,4 +7,4 @@ struct MenuItem
     u32 menuAction; // action??
 };
 
-#endif
+#endif // GUARD_MENU_H
diff --git a/include/play_time.h b/include/play_time.h
index faae1d0..7a8ea9e 100644
--- a/include/play_time.h
+++ b/include/play_time.h
@@ -1,5 +1,5 @@
-#ifndef PLAY_TIME_H
-#define PLAY_TIME_H
+#ifndef GUARD_PLAY_TIME_H
+#define GUARD_PLAY_TIME_H
 
 struct PlayTimeStruct
 {
@@ -16,5 +16,5 @@ void DeconstructPlayTime(struct PlayTimeStruct *r0, u32 *outHours, u32 *outMinut
 void InitializePlayTime(void);
 
 
-#endif // PLAY_TIME_H  
+#endif // GUARD_PLAY_TIME_H  
 
diff --git a/include/pokemon.h b/include/pokemon.h
index a7b2acb..fad47e0 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -1,5 +1,5 @@
-#ifndef POKEMON_H
-#define POKEMON_H
+#ifndef GUARD_POKEMON_H
+#define GUARD_POKEMON_H
 
 #include "file_system.h"
 
@@ -158,4 +158,4 @@ struct OpenedFile *OpenPokemonDialogueSpriteFile(s16 index);
 struct OpenedFile *GetDialogueSpriteDataPtr(s16 index);
 s32 GetUnownIndex(s16 index);
 
-#endif // POKEMON_H  
+#endif // GUARD_POKEMON_H  
diff --git a/include/rescue_team_info.h b/include/rescue_team_info.h
index e289b4c..ad1b858 100644
--- a/include/rescue_team_info.h
+++ b/include/rescue_team_info.h
@@ -1,5 +1,5 @@
-#ifndef RESCUE_TEAM_INFO_H
-#define RESCUE_TEAM_INFO_H
+#ifndef GUARD_RESCUE_TEAM_INFO_H
+#define GUARD_RESCUE_TEAM_INFO_H
 
 #define TEAM_NAME_LENGTH 10
 
@@ -38,4 +38,4 @@ u8 sub_80921B8(void);
 u32 SaveRescueTeamInfo(u8 *param_1,u32 param_2);
 u32 ReadRescueTeamInfo(u8 *param_1, u32 param_2);
 
-#endif // RESCUE_TEAM_INFO_H
+#endif // GUARD_RESCUE_TEAM_INFO_H
diff --git a/include/save.h b/include/save.h
index 672d426..ba2577c 100644
--- a/include/save.h
+++ b/include/save.h
@@ -1,5 +1,5 @@
-#ifndef SAVE_H
-#define SAVE_H
+#ifndef GUARD_SAVE_H
+#define GUARD_SAVE_H
 
 #include "play_time.h"
 #include "exclusive_pokemon.h"
@@ -107,4 +107,4 @@ u32 WriteSaveSector(s32 *a, u8 *src, s32 size);
 void CalculateChecksum(u8 *out, u32 size);
 bool8 ValidateChecksum(u8 *in, u32 size);
 
-#endif
+#endif // GUARD_SAVE_H
diff --git a/include/sub_8095228.h b/include/sub_8095228.h
new file mode 100644
index 0000000..bb947c6
--- /dev/null
+++ b/include/sub_8095228.h
@@ -0,0 +1,21 @@
+
+struct unkStruct_8095228
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 padding[0x10 - 0x5];
+    u32 unk10;
+    u8 padding2[0x20 - 0x14];
+    struct ItemStruct_203B460 unk20;
+    u8 padding3[0x28 - 0x24];
+    u32 unk28;
+    s8 unk2C;
+    u8 padding4[0x30 - 0x2D];
+};
+
+extern struct unkStruct_8095228 *sub_8095228(u8);
+
+
diff --git a/include/wonder_mail.h b/include/wonder_mail.h
index 1f9af3e..8973561 100644
--- a/include/wonder_mail.h
+++ b/include/wonder_mail.h
@@ -3,6 +3,7 @@
 
 #include "file_system.h"
 #include "text.h"
+#include "item.h"
 
 #define PASSWORD_BUFFER_SIZE 54
 
@@ -60,14 +61,6 @@ struct WonderMailStruct_203B2C0
 
 };
 
-struct unkStruct_41C
-{
-    u8 unk41C;
-    u8 unk41D;
-    u8 unk41E;
-    u8 unk41F;
-};
-
 struct WonderMailStruct_203B2C4
 {
     // size: 0x564
@@ -85,7 +78,7 @@ struct WonderMailStruct_203B2C4
     u8 filler310[0x35C - 0x310];
     struct UnkTextStruct2 unk35C[4];
     struct UnkTextStruct2 unk3BC[4];
-    struct unkStruct_41C unk41C;
+    struct ItemStruct_203B460 unk41C;
     /* 0x420 */ struct OpenedFile *faceFile;
     /* 0x424 */ u8 *faceData;
     u16 unk428;