summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c4
-rw-r--r--src/battle/battle_3.c4
-rw-r--r--src/battle/battle_4.c4
-rw-r--r--src/battle/battle_ai.c2
-rw-r--r--src/battle/battle_records.c2
-rw-r--r--src/battle/battle_setup.c2
-rw-r--r--src/battle/calculate_base_damage.c4
-rw-r--r--src/field/battle_tower.c2
-rw-r--r--src/field/decoration.c3
-rw-r--r--src/field/decoration_inventory.c5
-rw-r--r--src/field/field_map_obj.c2
-rw-r--r--src/field/field_player_avatar.c2
-rw-r--r--src/field/item.c2
-rw-r--r--src/field/secret_base.c1
-rw-r--r--src/field/trader.c1
-rw-r--r--src/pokemon/pokemon_3.c2
-rw-r--r--src/pokemon/pokemon_data.c2
17 files changed, 22 insertions, 22 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 5b283483c..ff3df7235 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -27,8 +27,8 @@
#include "unknown_task.h"
#include "util.h"
#include "constants/items.h"
-#include "hold_effects.h"
-#include "battle_move_effects.h"
+#include "constants/hold_effects.h"
+#include "constants/battle_move_effects.h"
#include "ewram.h"
struct UnknownStruct7
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 0d9e8c41d..342395c34 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -5,13 +5,13 @@
#include "item.h"
#include "constants/items.h"
#include "event_data.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "constants/species.h"
#include "pokemon.h"
#include "data2.h"
#include "random.h"
#include "text.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "string_util.h"
#include "constants/flags.h"
#include "ewram.h"
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 59a187cda..6821adca3 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -1,12 +1,12 @@
#include "global.h"
#include "battle.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "constants/moves.h"
#include "constants/abilities.h"
#include "item.h"
#include "constants/items.h"
#include "data2.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "random.h"
#include "rom3.h"
#include "constants/species.h"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 276563202..1fa7a2ed2 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -2,7 +2,7 @@
#include "battle_ai.h"
#include "constants/abilities.h"
#include "battle.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "data2.h"
#include "item.h"
#include "constants/moves.h"
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c
index 54697593b..97740e3da 100644
--- a/src/battle/battle_records.c
+++ b/src/battle/battle_records.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "battle_records.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
#include "link.h"
#include "menu.h"
#include "overworld.h"
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 21a1fdb09..eb5b98421 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -15,7 +15,7 @@
#include "main.h"
#include "constants/maps.h"
#include "metatile_behavior.h"
-#include "opponent_constants.h"
+#include "constants/opponents.h"
#include "palette.h"
#include "random.h"
#include "overworld.h"
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 153e96078..f9ac03075 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -4,13 +4,13 @@
#include "berry.h"
#include "data2.h"
#include "event_data.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "item.h"
#include "constants/items.h"
#include "pokemon.h"
#include "constants/species.h"
#include "constants/moves.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "ewram.h"
extern u16 gBattleTypeFlags;
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 37ef10c24..db822f71b 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -10,7 +10,7 @@
#include "item.h"
#include "constants/items.h"
#include "main.h"
-#include "map_object_constants.h"
+#include "constants/map_objects.h"
#include "constants/moves.h"
#include "new_game.h"
#include "overworld.h"
diff --git a/src/field/decoration.c b/src/field/decoration.c
index 89d8cbefd..c7647f98d 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -1,6 +1,7 @@
#include "global.h"
+#include "constants/decorations.h"
#include "main.h"
-#include "map_object_constants.h"
+#include "constants/map_objects.h"
#include "overworld.h"
#include "sound.h"
#include "constants/songs.h"
diff --git a/src/field/decoration_inventory.c b/src/field/decoration_inventory.c
index 687589373..dd0e972aa 100644
--- a/src/field/decoration_inventory.c
+++ b/src/field/decoration_inventory.c
@@ -1,8 +1,5 @@
-//
-
-//
-
#include "global.h"
+#include "constants/decorations.h"
#include "sprite.h"
#include "task.h"
#include "decoration.h"
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index 816de8917..0768092b1 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -15,7 +15,7 @@
#include "sprite.h"
#include "metatile_behavior.h"
#include "constants/maps.h"
-#include "map_object_constants.h"
+#include "constants/map_objects.h"
#include "trainer_see.h"
// rodata
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 166846ba0..437d16208 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -9,7 +9,7 @@
#include "field_map_obj_helpers.h"
#include "fieldmap.h"
#include "main.h"
-#include "map_object_constants.h"
+#include "constants/map_objects.h"
#include "menu.h"
#include "metatile_behavior.h"
#include "party_menu.h"
diff --git a/src/field/item.c b/src/field/item.c
index cf7d8bd42..66d7d65df 100644
--- a/src/field/item.c
+++ b/src/field/item.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "item.h"
#include "constants/items.h"
#include "item_use.h"
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index c1ca10c1f..b3591564d 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "constants/decorations.h"
#include "secret_base.h"
#include "decoration.h"
#include "constants/species.h"
diff --git a/src/field/trader.c b/src/field/trader.c
index 69eef1152..c4fe73ba1 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "constants/decorations.h"
#include "decoration.h"
#include "decoration_inventory.h"
#include "event_data.h"
diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c
index b824aee90..d659ed680 100644
--- a/src/pokemon/pokemon_3.c
+++ b/src/pokemon/pokemon_3.c
@@ -3,7 +3,7 @@
#include "battle_message.h"
#include "data2.h"
#include "event_data.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "item.h"
#include "constants/items.h"
#include "link.h"
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index 2688e090b..82e452158 100644
--- a/src/pokemon/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
@@ -4,7 +4,7 @@
#include "trainer.h"
#include "constants/abilities.h"
#include "constants/moves.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "constants/items.h"
#include "sprite.h"
#include "data2.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 04:15:31 +0000