Merge pull request #206 from SethBarberee/july_august_2024

July august 2024

include/code_8004AA0.h

@@ -2,15 +2,7 @@
 #define GUARD_CODE_8004AA0_H
 
 #include "file_system.h"
-
-// size: 0x4
-typedef struct RGB
-{
-    // IDK which is R G B
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-} RGB;
+#include "structs/rgb.h"
 
 // size: 0x18
 typedef struct unkStruct_202EE8C
@@ -24,6 +16,8 @@ typedef struct unkStruct_202EE8C
     RGB unk14;
 } unkStruct_202EE8C;
 
+extern unkStruct_202EE8C gUnknown_202EE8C[32];
+
 // size: Variable
 typedef struct unkDataFor8004AA4
 {
@@ -38,4 +32,4 @@ bool8 sub_8004AF0(bool8, unkStruct_202EE8C *, s32, s32, s32, u8 *);
 bool8 sub_8004D14(unkStruct_202EE8C *, s32);
 bool8 sub_8004D40(unkStruct_202EE8C *, s32);
 
-#endif // GUARD_CODE_8004AA0_H
+#endif // GUARD_CODE_8004AA0_H

include/code_800E9A8.h

@@ -31,5 +31,7 @@ struct unkStruct_203B0CC
 };
 
 bool8 sub_800E9A8(s32 a0);
+bool8 sub_800E9E4(void);
+bool8 sub_800E9FC(u8 a0);
 
 #endif

include/code_8010EF0.h

@@ -2,15 +2,7 @@
 #define GUARD_CODE_8010EF0_H
 
 #include "file_system.h"
-
-// size: 0x4
-typedef struct RGB
-{
-    // IDK which is R G B
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-} RGB;
+#include "structs/rgb.h"
 
 // size: 0x18
 typedef struct unkStruct_202EE8C

include/code_80118A4.h

@@ -7,10 +7,15 @@ void PlaySound(u16);
 void sub_801180C(void);
 void sub_8011830(void);
 void sub_8011860(void);
-void xxx_call_fade_in_new_bgm(u16, u16);
-void xxx_call_fade_out_bgm(u16);
+void xxx_call_fade_in_new_bgm(u16 songIndex, u16 speed);
+void xxx_call_fade_out_bgm(u16 speed);
 void xxx_call_start_bg_music(void);
 void xxx_call_stop_bgm(void);
-void xxx_call_stop_fanfare_se(u16);
+void xxx_call_stop_fanfare_se(u16 songIndex);
+void StopAllMusic_1(void);
+void xxx_call_start_new_bgm(u16 songIndex);
+void xxx_call_queue_bgm(u16 songIndex);
+void xxx_call_play_fanfare_se(u16 songIndex, u16 volume);
+void xxx_call_fade_out_fanfare_se(u16 songIndex, u16 speed);
 
-#endif // GUARD_CODE_80118A4_H
+#endif // GUARD_CODE_80118A4_H

include/code_803D0D8.h

@@ -1,10 +1,17 @@
 #ifndef GUARD_CODE_803D0D8_H
 #define GUARD_CODE_803D0D8_H
 
+#include "structs/str_wonder_mail.h"
+
 u8 sub_803D0D8(void);
 u8 sub_803D0F0(u8);
 u8 sub_803D100(u8);
 u8 sub_803D110(u8 *param_1, u8 *param_2, s32 size);
 void sub_803D1A8(u8 *param_1, u8 *param_2, s32 size);
 
+bool8 sub_803D204(u8 *buffer,unkStruct_203B480 *param_2);
+void sub_803D2C0(u8 *buffer, unkStruct_203B480 *mail);
+bool8 DecodeWonderMailPassword(u8* buffer, WonderMail *mail);
+void sub_803D414(u8 *param_1,WonderMail *mail);
+
 #endif // GUARD_CODE_803D0D8_H

include/code_803D110.h

@@ -1,9 +0,0 @@
-#ifndef GUARD_CODE_803D110_H
-#define GUARD_CODE_803D110_H
-
-#include "structs/str_wonder_mail.h"
-
-// code_803D110.s
-extern void sub_803D414(u8 *, WonderMail *);
-
-#endif // GUARD_CODE_803D110_H

include/code_806CD90.h

@@ -7,8 +7,8 @@ void sub_806CC10(void);
 void sub_806CC70(void);
 void sub_806CCB4(Entity *entity, u8);
 void sub_806CD90(void);
-void sub_806CDD4(Entity *entity, u8, u32);
-void sub_806CDFC(Entity *entity, u8, u32);
+void sub_806CDD4(Entity *entity, u8, u32 direction);
+void sub_806CDFC(Entity *entity, u8, u32 direction);
 void sub_806CE34(Entity *entity, u32 newDir);
 void sub_806CE68(Entity *entity, u32 newDir);
 void sub_806CE94(Entity *entity, u32 newDir);
@@ -19,4 +19,4 @@ u8 sub_806CF54(Entity *entity);
 void sub_806CF60(void);
 u32 sub_806CF98(Entity *entity);
 
-#endif // GUARD_CODE_806CD90_H
+#endif // GUARD_CODE_806CD90_H

include/code_80861A8.h

@@ -4,5 +4,7 @@
 #include "structs/dungeon_entity.h"
 
 void sub_80861A8(Entity *a0);
+void sub_80861B8(Entity *a0, u8 r1, s32 direction);
+void sub_80861D4(Entity *a0, u8 r1, s32 direction);
 
 #endif

include/code_80958E8.h

@@ -3,6 +3,7 @@
 
 #include "constants/mailbox.h"
 #include "structs/str_wonder_mail.h"
+#include "code_8092334.h"
 
 // size: 0xC
 typedef struct subStruct_203B490
@@ -67,5 +68,7 @@ u8 *sub_8096DD8(void);
 u8 *sub_8096DE8(void);
 u8 sub_8096E2C(void);
 void sub_8096EEC(WonderMail *mail);
+void SaveWonderMail(unkStruct_8094924 *a, WonderMail *b);
+void RestoreWonderMail(unkStruct_8094924 *a, WonderMail *b);
 
 #endif // GUARD_CODE_80958E8_H

include/constants/global.h

@@ -4,6 +4,7 @@
 #define POKEMON_NAME_LENGTH 10
 #define TEAM_NAME_LENGTH 10
 #define MAX_TEAM_MEMBERS 4
+#define MAX_TEAM_BODY_SIZE 6
 
 #define MAX_MON_MOVES 4
 

include/ground_link.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_GROUND_LINK_H
+#define GUARD_GROUND_LINK_H
+
+void GroundLink_Select(s16 r0);
+
+#endif // GUARD_GROUND_LINK_H

include/ground_main.h

@@ -27,6 +27,7 @@ bool8 GroundMainRescueRequest(s16 r0, u32 r1);
 
 bool32 GroundMainGameEndRequest(u32 r0);
 bool32 GroundMainGameCancelRequest(u32 r0);
+bool8 sub_8098D80(u32 speed);
 
 extern GroundConversionStruct gGroundConversion_811BAF4[10];
 

include/ground_script.h

@@ -104,12 +104,12 @@ typedef struct CallbackData
 typedef struct Action
 {
     // size: 0xE4
-    /* 0x00 */ struct CallbackData *callbacks;
+    /* 0x00 */ const struct CallbackData *callbacks;
     /* 0x04 */ void *parentObject; // struct GroundObject *
     /* 0x08 */ s16 unk8[2]; // id?
     /* 0x0C */ ScriptUnion1632 unkC;
-    /* 0x10 */ u16 group;
-    /* 0x12 */ u8  sector;
+    /* 0x10 */ s16 group;
+    /* 0x12 */ s8  sector;
     // padding
     /* 0x14 */ ScriptCommand *predefinedScripts[4];
     /* 0x24 */ ScriptData scriptData;
@@ -129,7 +129,8 @@ typedef struct GroundMapAction
 
 typedef struct FunctionScript
 {
-    u32 unk0;
+    u16 unk0;
+    s16 unk2;
     u8 *funcName;
     ScriptCommand *script;
 } FunctionScript;
@@ -138,6 +139,15 @@ extern FunctionScript gFunctionScriptTable[];
 
 #include "debug.h"
 
+void InitScriptData(ScriptData *a0);
+u8 sub_809D8EC(Action *param_1, s16 param_2);
+void sub_809D648(Action *action);
+void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index);
+bool8 sub_809DA08(Action *param_1, s16 index, u32 param_3);
+bool8 InitActionScriptData(Action *param_1, const DebugLocation *unused);
 bool8 GroundScript_ExecutePP(Action *, s32 *, ScriptInfoSmall *, const DebugLocation *unused);
+ScriptCommand *sub_80A242C(Action *action, s32 r1);
+ScriptCommand *sub_80A2460(Action *action, s32 r1);
+void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s16 group, s8 sector);
 
 #endif // GUARD_GROUND_SCRIPT_H

include/structs/dungeon_entity.h

@@ -290,7 +290,8 @@ typedef struct EntityInfo
     u8 unk15D;
     u8 unk15E;
     u8 unk15F;
-    u8 fill160[0x164 - 0x160];
+    u8 unk160;
+    u8 fill161[3];
     /* 0x164 */ u8 unk164;
     /* 0x165 */ u8 unk165;
     /* 0x166 */ u8 unk166;

include/structs/rgb.h

@@ -0,0 +1,12 @@
+#ifndef GUARD_RGB_H
+#define GUARD_RGB_H
+
+typedef struct RGB
+{
+    // IDK which is R G B
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+} RGB;
+
+#endif // GUARD_RGB_H

include/structs/str_dungeon.h

@@ -12,6 +12,7 @@
 #define DUNGEON_MAX_SIZE_X 56
 #define DUNGEON_MAX_SIZE_Y 32
 #define DUNGEON_MAX_WILD_POKEMON 16
+#define DUNGEON_MAX_WILD_POKEMON_BODY_SIZE 16
 #define DUNGEON_MAX_POKEMON MAX_TEAM_MEMBERS + DUNGEON_MAX_WILD_POKEMON
 #define DUNGEON_MAX_TRAPS 64
 #define DUNGEON_MAX_ITEMS 64
@@ -269,7 +270,12 @@ typedef struct Dungeon
     /* 0x17B44 */ OpenedFile *sprites[MONSTER_MAX];
     /* 0x181E4 */ OpenedFile *paletFile;
     /* 0x181E8 */ unkDungeonGlobal_unk181E8_sub unk181e8;
-    u8 fill18220[0x1C578 - 0x18220];
+    u8 fill18220[0x1C06C - 0x18220];
+    u32 unk1C06C; 
+    u8 fill1C070[0x1C570 - 0x1C070];
+    u8 unk1C570;
+    u8 unk1C571;
+    u8 fill1C572[0x1C578 - 0x1C572];
     u8 unk1C578;
     u8 fill1C579[0x1C57E - 0x1C579];
     u8 unk1C57E;

include/weather.h

@@ -4,5 +4,6 @@
 #include "structs/dungeon_entity.h"
 
 u8 GetApparentWeather(Entity *pokemon);
+void sub_807E5E4(u8 weather);
 
 #endif