Merge pull request #223 from mateon1/tidy-includes

Tidy includes
pret · Sep 26, 2024 · 30b94df · 30b94df
2 parents 037b8a9 + 0aa8459
commit 30b94df
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 132 deletions.
diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h
@@ -18,6 +18,20 @@ typedef struct unkStruct_202EE8C
 
 extern unkStruct_202EE8C gUnknown_202EE8C[32];
 
+// size: 0x4DD8
+struct UnkBgStruct
+{
+    OpenedFile *unk0[5];
+    u8 padding[0x4C4C - 0x14];
+    unkStruct_202EE8C unk4C4C[16];
+    u32 unk4DCC;
+    u32 unk4DD0;
+    /* 0x4DD4 */ s16 xoffset;
+    /* 0x4DD6 */ s16 yoffset;
+};
+
+extern struct UnkBgStruct *gUnknown_203B0E4;
+
 // size: Variable
 typedef struct unkDataFor8004AA4
 {

diff --git a/include/code_800F958.h b/include/code_800F958.h
diff --git a/include/code_8010EF0.h b/include/code_8010EF0.h
diff --git a/include/code_801AFA4.h b/include/code_801AFA4.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_CODE_801AFA4_H
 #define GUARD_CODE_801AFA4_H
 
-#include "global.h"
 #include "constants/move.h"
 #include "structs/menu.h"
 #include "pokemon.h"
@@ -26,4 +25,4 @@ bool8 sub_801AFA4(u32 index);
 u32 sub_801B00C(void);
 void sub_801B048(void);
 
-#endif // GUARD_CODE_801AFA4_H
+#endif // GUARD_CODE_801AFA4_H
diff --git a/include/code_8041AD0.h b/include/code_8041AD0.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_CODE_8041AD0_H
 #define GUARD_CODE_8041AD0_H
 
+#include "structs/dungeon_entity.h"
 #include "structs/str_damage.h"
 
 void sub_80420E8(Entity *pokemon, struct DamageStruct *dmgStruct);

diff --git a/include/code_8069D4C.h b/include/code_8069D4C.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CODE_8069D4C_H
 #define GUARD_CODE_8069D4C_H
 
+#include "structs/dungeon_entity.h"
+
 struct unkStruct_8069D4C
 {
     s16 id;

diff --git a/include/code_8077274_1.h b/include/code_8077274_1.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CODE_8077274_1_H
 #define GUARD_CODE_8077274_1_H
 
+#include "structs/dungeon_entity.h"
+
 void MuzzleTarget(Entity *pokemon, Entity *target);
 void TransformStatusTarget(Entity * pokemon, Entity * target);
 void MobileStatusTarget(Entity * pokemon, Entity * target);

diff --git a/include/code_808417C.h b/include/code_808417C.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_808417C_H
 #define GUARD_808417C_H
 
+#include "structs/dungeon_entity.h"
+
 s32 CalculateStatusTurns(Entity *target, s16 *turnRange, bool8 factorCurerSkills);
 
 #endif // GUARD_808417C_H
diff --git a/include/constants/dungeon_action.h b/include/constants/dungeon_action.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_CONSTANTS_DUNGEON_ACTION_H
 #define GUARD_CONSTANTS_DUNGEON_ACTION_H
 
-enum Action
+enum DungeonAction
 {
     ACTION_NOTHING = 0x0,
     ACTION_PASS_TURN = 0x1,

diff --git a/include/friend_list_menu.h b/include/friend_list_menu.h
@@ -1,6 +1,11 @@
 #ifndef INCLUDE_FRIEND_LIST_MENU_H
 #define INCLUDE_FRIEND_LIST_MENU_H
 
+#include "structs/menu.h"
+#include "structs/str_items.h"
+#include "structs/str_moves.h"
+#include "structs/str_pokemon.h"
+
 // there might be more overlap with unkStruct_203B2BC
 // I was working on the moves and put the data that seemed to correspond to that
 // into a separate struct

diff --git a/include/gulpin_shop.h b/include/gulpin_shop.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_GULPIN_SHOP_H
 #define GUARD_GULPIN_SHOP_H
 
-#include "constants/move.h"
 #include "file_system.h"
 #include "structs/menu.h"
 #include "structs/str_text.h"
+#include "structs/str_moves.h"
 
 // size: 0x18C
 typedef struct GulpinShopWork
@@ -42,4 +42,4 @@ bool8 GulpinIsNextMoveLinked(void);
 
 u32 sub_801E8C0(void);
 
-#endif // GUARD_GULPIN_SHOP_H
+#endif // GUARD_GULPIN_SHOP_H
diff --git a/include/math.h b/include/math.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_MATH_H
 #define GUARD_MATH_H
 
-#include "global.h"
+#include "gba/types.h"
 
 /**
  * This type represents a signed 24.8 fixed-point number, where the 24 most
@@ -87,7 +87,7 @@ s24_8 s24_8_mul(s24_8 x, s24_8 y);
  *
  * @returns       The quotient `x/y` as a signed 24.8 fixed-point number.
  */
-s32 s24_8_div(s32 r0, s32 r1);
+s32 s24_8_div(s32 x, s32 y);
 
 /**
  * This function multiplies two unsigned 24.8 fixed-point numbers.

diff --git a/include/move_checks.h b/include/move_checks.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_MOVE_CHECKS_H
 #define GUARD_MOVE_CHECKS_H
 
+#include "structs/dungeon_entity.h"
+
 bool8 CanUseOnSelfWithStatusChecker(Entity *pokemon, Move *move);
 bool8 CanUseOnTargetWithStatusChecker(Entity *user, Entity *target, Move *move);
 bool8 HasDisabledMove(Move *moves);

diff --git a/include/pelipper_board.h b/include/pelipper_board.h
@@ -1,3 +1,8 @@
+#ifndef GUARD_PELIPPER_BOARD_H
+#define GUARD_PELIPPER_BOARD_H
+
+#include "structs/menu.h"
+#include "structs/str_802C39C.h"
 
 // Guessing based off of 203B304
 struct unkStruct_203B308
@@ -36,3 +41,4 @@ enum PelipperBoardActions
     PELIPPER_BOARD_ACCEPT,
     PELIPPER_BOARD_INFO,
 };
+#endif // GUARD_PELIPPER_BOARD_H
diff --git a/include/save_menu.h b/include/save_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_SAVE_MENU_H
 #define GUARD_SAVE_MENU_H
 
+#include "structs/menu.h"
+
 // size: 0x1B4
 typedef struct SaveMenuWork
 {
@@ -16,4 +18,4 @@ void CleanSaveMenu(void);
 void CreateSaveMenu(s32 currMenu);
 s32 UpdateSaveMenu(void);
 
-#endif // GUARD_SAVE_MENU_H
+#endif // GUARD_SAVE_MENU_H
diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_STR_DUNGEON_H
 #define GUARD_STR_DUNGEON_H
 
-#include "global.h"
 #include "constants/monster.h"
 #include "structs/dungeon_entity.h"
 #include "file_system.h"

diff --git a/include/type_chart.h b/include/type_chart.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_TYPE_CHART_H
 #define GUARD_TYPE_CHART_H
 
-#include "global.h"
 #include "constants/type.h"
 
 #define NUM_EFFECTIVENESS 4
@@ -14,4 +13,4 @@
 // [Attacking type][Defending type]
 extern const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES];
 
-#endif
+#endif
diff --git a/src/code_800F958.c b/src/code_800F958.c
@@ -1,8 +1,7 @@
 #include "global.h"
-#include "code_800F958.h"
+#include "dungeon_pokemon_sprites.h"
 #include "memory.h"
 
-extern DungeonPokemonSprites *gDungeonPokemonSprites;
 extern DungeonPokemonSprite *NewDungeonPokemonSprite(void);
 extern DungeonPokemonSprite* GetDungeonPokemonSprite(s32 id);
 

diff --git a/src/code_8010EF0.c b/src/code_8010EF0.c
@@ -1,9 +1,5 @@
 #include "global.h"
-#include "code_8010EF0.h"
-
-extern struct UnkBgStruct *gUnknown_203B0E4;
-
-extern void CloseFile(OpenedFile *);
+#include "code_8004AA0.h"
 
 void sub_8010EF0(void)
 {

diff --git a/src/code_80118A4.c b/src/code_80118A4.c
@@ -17,20 +17,6 @@
 #include "event_flag.h"
 #include "file_system.h"
 
-// size: 0x4DD8
-struct UnkBgStruct
-{
-    OpenedFile *unk0[5];
-    u8 padding[0x4C4C - 0x14];
-    unkStruct_202EE8C unk4C4C[16];
-    u32 unk4DCC;
-    u32 unk4DD0;
-    /* 0x4DD4 */ s16 xoffset;
-    /* 0x4DD6 */ s16 yoffset;
-};
-extern struct UnkBgStruct *gUnknown_203B0E4;
-
-
 extern const u16 gUnknown_80D4144[8];
 
 EWRAM_DATA u32 gUnknown_202DE1C = {0};

diff --git a/src/data/type_chart.h b/src/data/type_chart.h
@@ -0,0 +1,25 @@
+#define IMMUNE EFFECTIVENESS_IMMUNE
+#define RESIST EFFECTIVENESS_RESIST
+#define NEUTRAL EFFECTIVENESS_NEUTRAL
+#define SUPER EFFECTIVENESS_SUPER
+
+const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES] = {
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
+    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  SUPER,   NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, RESIST,  NEUTRAL, SUPER},
+    {NEUTRAL, NEUTRAL, SUPER,   RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  NEUTRAL, NEUTRAL},
+    {NEUTRAL, NEUTRAL, RESIST,  SUPER,   RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  SUPER,   RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, RESIST,  NEUTRAL, RESIST},
+    {NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL},
+    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  SUPER,   NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, SUPER,   SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST},
+    {NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  NEUTRAL, RESIST,  RESIST,  RESIST,  SUPER,   NEUTRAL, NEUTRAL, SUPER,   SUPER},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, NEUTRAL, IMMUNE},
+    {NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, IMMUNE,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   SUPER,   NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE,  RESIST},
+    {NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, SUPER,   RESIST},
+    {NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
+    {NEUTRAL, IMMUNE,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  RESIST},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST},
+    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  RESIST},
+    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, RESIST}
+};
diff --git a/src/type_chart.c b/src/type_chart.c
@@ -1,27 +1,4 @@
+#include "global.h"
 #include "type_chart.h"
 
-#define IMMUNE EFFECTIVENESS_IMMUNE
-#define RESIST EFFECTIVENESS_RESIST
-#define NEUTRAL EFFECTIVENESS_NEUTRAL
-#define SUPER EFFECTIVENESS_SUPER
-
-const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES] = {
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
-    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  SUPER,   NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, RESIST,  NEUTRAL, SUPER},
-    {NEUTRAL, NEUTRAL, SUPER,   RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  NEUTRAL, NEUTRAL},
-    {NEUTRAL, NEUTRAL, RESIST,  SUPER,   RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  SUPER,   RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, RESIST,  NEUTRAL, RESIST},
-    {NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL},
-    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  SUPER,   NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, SUPER,   SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST},
-    {NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  NEUTRAL, RESIST,  RESIST,  RESIST,  SUPER,   NEUTRAL, NEUTRAL, SUPER,   SUPER},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, NEUTRAL, IMMUNE},
-    {NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, IMMUNE,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   SUPER,   NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE,  RESIST},
-    {NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, SUPER,   RESIST},
-    {NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST},
-    {NEUTRAL, IMMUNE,  NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  RESIST},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST},
-    {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, RESIST,  NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, RESIST,  RESIST},
-    {NEUTRAL, NEUTRAL, RESIST,  RESIST,  NEUTRAL, RESIST,  SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER,   NEUTRAL, NEUTRAL, NEUTRAL, RESIST}
-};
+#include "data/type_chart.h"