From b672617b2d076fb4746316d40fc74b8caa808e1b Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:04:50 +0200
Subject: [PATCH 1/7] Remove code_800F958.h, it's a duplicate

---
 include/code_800F958.h | 42 ------------------------------------------
 src/code_800F958.c     |  3 +--
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 include/code_800F958.h

diff --git a/include/code_800F958.h b/include/code_800F958.h
deleted file mode 100644
index b77c1cc56..000000000
--- a/include/code_800F958.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef GUARD_CODE_800F958_H
-#define GUARD_CODE_800F958_H
-
-#include "structs/str_dungeon.h"
-
-// size: 0x8
-typedef struct DungeonPokemonStatusSprite
-{
-    /* 0x0 */ u32 status;
-    /* 0x4 */ u32 frame;
-} DungeonPokemonStatusSprite;
-
-// size: 0x40
-typedef struct DungeonPokemonSprite
-{
-    /* 0x0 */ u8 exists;
-    /* 0x4 */ u32 id;
-    /* 0x8 */ u16 species; // Or sprite ID?
-    /* 0xA */ u16 unkA;
-    /* 0xC */ u32 status;
-    /* 0x10 */ u8 visible;
-    /* 0x11 */ u8 unk11;
-    /* 0x14 */ Position pos;
-    /* 0x18 */ Position statusOffsets[2];
-    /* 0x20 */ u32 unk20;
-    /* 0x24 */ u32 unk24;
-    /* 0x28 */ DungeonPokemonStatusSprite statusSprites[2];
-    /* 0x38 */ u8 unk38;
-    /* 0x3C */ u16 unk3C;
-    /* 0x3E */ u16 unk3E;
-} DungeonPokemonSprite;
-
-// size: 0x584
-typedef struct DungeonPokemonSprites
-{
-    /* 0x0 */ u32 frame;
-    /* 0x4 */ DungeonPokemonSprite sprites[22];
-} DungeonPokemonSprites;
-
-void sub_800F958(s32 dungeonSpriteID, Position *pos, Position *statusOffsets, u32 a3);
-
-#endif
diff --git a/src/code_800F958.c b/src/code_800F958.c
index a76e80e9c..fbce67483 100644
--- 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);
 

From 5e5b27eee6e5de5f4e16aa5527990f9d68465e68 Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:13:04 +0200
Subject: [PATCH 2/7] Clean up code_8010EF0

---
 include/code_8004AA0.h | 14 ++++++++++++++
 include/code_8010EF0.h | 33 ---------------------------------
 src/code_8010EF0.c     |  6 +-----
 src/code_80118A4.c     | 14 --------------
 4 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 include/code_8010EF0.h

diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h
index 2eec0fac4..eeb012926 100644
--- 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_8010EF0.h b/include/code_8010EF0.h
deleted file mode 100644
index 213deb020..000000000
--- a/include/code_8010EF0.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef GUARD_CODE_8010EF0_H
-#define GUARD_CODE_8010EF0_H
-
-#include "file_system.h"
-#include "structs/rgb.h"
-
-// size: 0x18
-typedef struct unkStruct_202EE8C
-{
-    u32 unk0;
-    u16 unk4;
-    s16 unk6;
-    RGB *unk8;
-    RGB *unkC;
-    RGB *unk10;
-    RGB unk14;
-} unkStruct_202EE8C;
-
-// 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;
-};
-
-void sub_8010EF0(void);
-
-#endif
diff --git a/src/code_8010EF0.c b/src/code_8010EF0.c
index 700d5778e..56830b55d 100644
--- 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
index ea9549427..e0e0d7069 100644
--- 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};

From 59674db078a838165a9818f6e892f058370c6342 Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:22:08 +0200
Subject: [PATCH 3/7] Rename dungeon enum Action to not collide with script
 Action

---
 include/constants/dungeon_action.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/constants/dungeon_action.h b/include/constants/dungeon_action.h
index 57f68dca6..bd209b2d0 100644
--- 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,

From f8acddc770c4176fb6a6e23e1eda327b238abc0a Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:47:00 +0200
Subject: [PATCH 4/7] Add missing includes

---
 include/code_8041AD0.h     | 1 +
 include/code_8069D4C.h     | 2 ++
 include/code_8077274_1.h   | 2 ++
 include/code_808417C.h     | 2 ++
 include/friend_list_menu.h | 5 +++++
 include/gulpin_shop.h      | 4 ++--
 include/move_checks.h      | 2 ++
 include/pelipper_board.h   | 6 ++++++
 include/save_menu.h        | 4 +++-
 9 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/include/code_8041AD0.h b/include/code_8041AD0.h
index 8f0859519..626fe14ba 100644
--- 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
index bb653ea57..81e871d49 100644
--- 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
index 6c2d689f1..f1466b173 100644
--- 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
index 669aaf198..4830ac082 100644
--- 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/friend_list_menu.h b/include/friend_list_menu.h
index f19724a41..eaf2858fb 100644
--- 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
index 1642cd2a8..6a2aed0af 100644
--- 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
\ No newline at end of file
+#endif // GUARD_GULPIN_SHOP_H
diff --git a/include/move_checks.h b/include/move_checks.h
index 78bbec95b..bf63f4524 100644
--- 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
index 1cf8b70ca..1495d4b77 100644
--- 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
index 349e1edb4..56612edb2 100644
--- 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
\ No newline at end of file
+#endif // GUARD_SAVE_MENU_H

From e9211e6bea560fd074b76fbca8f25d94912268f2 Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:54:04 +0200
Subject: [PATCH 5/7] Do not include global.h

---
 include/code_801AFA4.h        | 3 +--
 include/math.h                | 2 +-
 include/structs/str_dungeon.h | 1 -
 include/type_chart.h          | 3 +--
 src/type_chart.c              | 1 +
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/code_801AFA4.h b/include/code_801AFA4.h
index 355f1d016..65d959e30 100644
--- 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
\ No newline at end of file
+#endif // GUARD_CODE_801AFA4_H
diff --git a/include/math.h b/include/math.h
index 2c28b1222..e0e42d2f9 100644
--- 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
diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h
index 7dd29b8cb..a22886bcb 100644
--- 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
index 4be0b3351..caff9f1d0 100644
--- 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
\ No newline at end of file
+#endif
diff --git a/src/type_chart.c b/src/type_chart.c
index ac2071c06..ad99d2f66 100644
--- a/src/type_chart.c
+++ b/src/type_chart.c
@@ -1,3 +1,4 @@
+#include "global.h"
 #include "type_chart.h"
 
 #define IMMUNE EFFECTIVENESS_IMMUNE

From 299e7e34655928e1dd5013f407bd80fe6e0de9ce Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Wed, 25 Sep 2024 12:58:04 +0200
Subject: [PATCH 6/7] type_chart.c -> data

---
 src/data/type_chart.h | 25 +++++++++++++++++++++++++
 src/type_chart.c      | 26 +-------------------------
 2 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 src/data/type_chart.h

diff --git a/src/data/type_chart.h b/src/data/type_chart.h
new file mode 100644
index 000000000..94c071f4a
--- /dev/null
+++ 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
index ad99d2f66..783d2762c 100644
--- a/src/type_chart.c
+++ b/src/type_chart.c
@@ -1,28 +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"

From 0aa84599baf0c0c9e59d25bbf21da2fe5c7c6adf Mon Sep 17 00:00:00 2001
From: Mateon1 <matin1111@wp.pl>
Date: Thu, 26 Sep 2024 15:00:46 +0200
Subject: [PATCH 7/7] Fix documentation mismatch

---
 include/math.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/math.h b/include/math.h
index e0e42d2f9..dc3b96a63 100644
--- a/include/math.h
+++ b/include/math.h
@@ -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.