flag, vars, items constants

42 files changed, 64 insertions, 61 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 69f168aff..5b283483c 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -26,7 +26,7 @@
 #include "trig.h"
 #include "unknown_task.h"
 #include "util.h"
-#include "items.h"
+#include "constants/items.h"
 #include "hold_effects.h"
 #include "battle_move_effects.h"
 #include "ewram.h"
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 05fd89d24..0d9e8c41d 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -1,9 +1,10 @@
 #include "global.h"
 #include "constants/abilities.h"
 #include "battle.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
+#include "event_data.h"
 #include "hold_effects.h"
 #include "constants/species.h"
 #include "pokemon.h"
@@ -12,7 +13,7 @@
 #include "text.h"
 #include "battle_move_effects.h"
 #include "string_util.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "ewram.h"
 
 extern u8* gBattlescriptCurrInstr;
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index ce9f55039..59a187cda 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_move_effects.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "constants/abilities.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "data2.h"
 #include "hold_effects.h"
 #include "random.h"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index eab90376e..276563202 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -5,7 +5,7 @@
 #include "battle_move_effects.h"
 #include "data2.h"
 #include "item.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "pokemon.h"
 #include "random.h"
 #include "rom_8077ABC.h"
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 956809814..653f0938c 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -4,12 +4,12 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
 #include "menu_cursor.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "palette.h"
 #include "pokemon.h"
 #include "rom3.h"
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index eac92a78d..fb045c8a7 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -3,7 +3,8 @@
 #include "battle_message.h"
 #include "battle_tower.h"
 #include "item.h"
-#include "items.h"
+#include "event_data.h"
+#include "constants/items.h"
 #include "pokemon.h"
 #include "data2.h"
 #include "text.h"
@@ -11,7 +12,7 @@
 #include "link.h"
 #include "battle_setup.h"
 #include "battle_tower.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "ewram.h"
 
 #define BATTLESTRING_TO_SUB 12
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 5f935f2be..153e96078 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -6,10 +6,10 @@
 #include "event_data.h"
 #include "hold_effects.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "pokemon.h"
 #include "constants/species.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "battle_move_effects.h"
 #include "ewram.h"
 
diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h
index 5289ce4e0..f78d0bf14 100755
--- a/src/data/battle_strings_de.h
+++ b/src/data/battle_strings_de.h
@@ -1,4 +1,4 @@
-#include "moves.h"
+#include "constants/moves.h"
 
 enum
 {
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 7f0481b50..26523d2e0 100755
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -1,4 +1,4 @@
-#include "moves.h"
+#include "constants/moves.h"
 
 enum
 {
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 56e999651..2624837c7 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -7,7 +7,7 @@
 #include "event_data.h"
 #include "fldeff_recordmixing.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "load_save.h"
 #include "link.h"
 #include "mauville_man.h"
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 1079e4749..dab1d3885 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -4,8 +4,8 @@
 #include "text.h"
 #include "main.h"
 #include "constants/species.h"
-#include "items.h"
-#include "moves.h"
+#include "constants/items.h"
+#include "constants/moves.h"
 #include "constants/easy_chat.h"
 #include "link.h"
 #include "strings2.h"
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 12a2f3f11..37ef10c24 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -8,10 +8,10 @@
 #include "constants/easy_chat.h"
 #include "event_data.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "main.h"
 #include "map_object_constants.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "new_game.h"
 #include "overworld.h"
 #include "pokedex.h"
@@ -24,7 +24,7 @@
 #include "text.h"
 #include "trainer.h"
 #include "tv.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "ewram.h"
 
 #if ENGLISH
diff --git a/src/field/berry.c b/src/field/berry.c
index 973bc56ff..874a60aa7 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -6,7 +6,7 @@
 #include "item.h"
 #include "item_menu.h"
 #include "item_use.h"
-#include "items.h"
+#include "constants/items.h"
 #include "main.h"
 #include "random.h"
 #include "text.h"
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 9fe720b36..694599680 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -4,7 +4,7 @@
 #include "decompress.h"
 #include "field_map_obj.h"
 #include "item_menu.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item_use.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/field/bike.c b/src/field/bike.c
index 75c99aaa1..8db01b4b4 100644
--- a/src/field/bike.c
+++ b/src/field/bike.c
@@ -3,7 +3,7 @@
 #include "field_map_obj.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c
index c5e12c839..f5bb28a73 100644
--- a/src/field/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
@@ -4,7 +4,7 @@
 #include "field_camera.h"
 #include "field_effect.h"
 #include "fieldmap.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "main.h"
 #include "map_constants.h"
 #include "map_obj_lock.h"
diff --git a/src/field/daycare.c b/src/field/daycare.c
index d3c86e812..9ac63b3c7 100644
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -2,11 +2,11 @@
 #include "daycare.h"
 #include "event_data.h"
 #include "field_effect.h"
-#include "items.h"
+#include "constants/items.h"
 #include "mail_data.h"
 #include "main.h"
 #include "menu.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "name_string_util.h"
 #include "overworld.h"
 #include "party_menu.h"
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index b7e7ec472..c4e53b13f 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -10,7 +10,7 @@
 #include "field_poison.h"
 #include "field_specials.h"
 #include "fieldmap.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "item_menu.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
@@ -21,7 +21,7 @@
 #include "sound.h"
 #include "start_menu.h"
 #include "trainer_see.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "wild_encounter.h"
 
 struct Coords32
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 279a7e3f6..f98c81041 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -20,7 +20,7 @@
 #include "pokeblock.h"
 #include "constants/species.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "text.h"
 #include "wallclock.h"
 #include "tv.h"
diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c
index 2da0f7303..108ba64ba 100644
--- a/src/field/field_tasks.c
+++ b/src/field/field_tasks.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "task.h"
 #include "main.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "bike.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "event_data.h"
 #include "overworld.h"
 #include "clock.h"
diff --git a/src/field/item.c b/src/field/item.c
index fd49f5c39..cf7d8bd42 100644
--- a/src/field/item.c
+++ b/src/field/item.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "hold_effects.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item_use.h"
 #include "berry.h"
 #include "string_util.h"
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 7d4b90bad..8f7cb3d90 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -8,7 +8,7 @@
 #include "field_player_avatar.h"
 #include "graphics.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item_menu.h"
 #include "item_use.h"
 #include "link.h"
diff --git a/src/field/item_use.c b/src/field/item_use.c
index 764e78800..48b159c1c 100644
--- a/src/field/item_use.c
+++ b/src/field/item_use.c
@@ -14,7 +14,7 @@
 #include "fieldmap.h"
 #include "item.h"
 #include "item_menu.h"
-#include "items.h"
+#include "constants/items.h"
 #include "mail.h"
 #include "main.h"
 #include "map_obj_lock.h"
@@ -34,7 +34,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
-#include "vars.h"
+#include "constants/vars.h"
 
 extern void (*gFieldItemUseCallback)(u8);
 extern void (*gFieldCallback)(void);
diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c
index b3bdeb494..2cfdb7f88 100644
--- a/src/field/lottery_corner.c
+++ b/src/field/lottery_corner.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lottery_corner.h"
 #include "event_data.h"
-#include "items.h"
+#include "constants/items.h"
 #include "random.h"
 #include "constants/species.h"
 #include "string_util.h"
diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index e49c023c6..4d5c6478c 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/menu_helpers.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "item_menu.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "mail_data.h"
 #include "main.h"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index a023a42ad..11dd1dd90 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -11,12 +11,12 @@
 #include "item.h"
 #include "item_use.h"
 #include "item_menu.h"
-#include "items.h"
+#include "constants/items.h"
 #include "mail_data.h"
 #include "main.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "palette.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
diff --git a/src/field/player_pc.c b/src/field/player_pc.c
index 2313d8c97..d92d13ce4 100644
--- a/src/field/player_pc.c
+++ b/src/field/player_pc.c
@@ -5,7 +5,7 @@
 #include "field_weather.h"
 #include "item.h"
 #include "item_menu.h"
-#include "items.h"
+#include "constants/items.h"
 #include "main.h"
 #include "menu.h"
 #include "menu_helpers.h"
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 56b197ca3..3b70e7d76 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -21,7 +21,7 @@
 #include "item_menu.h"
 #include "item_use.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "sound.h"
 #include "constants/songs.h"
 #include "safari_zone.h"
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 3ada632dd..257fe4ee7 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -2,8 +2,8 @@
 #include "secret_base.h"
 #include "decoration.h"
 #include "constants/species.h"
-#include "items.h"
-#include "moves.h"
+#include "constants/items.h"
+#include "constants/moves.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
@@ -32,7 +32,7 @@
 #include "strings.h"
 #include "task.h"
 #include "text.h"
-#include "vars.h"
+#include "constants/vars.h"
 
 
 static void sub_80BC7D8(u8 taskId);
diff --git a/src/field/shop.c b/src/field/shop.c
index cb97ea266..23d668fc7 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -21,7 +21,7 @@
 #include "fieldmap.h"
 #include "item.h"
 #include "decoration.h"
-#include "items.h"
+#include "constants/items.h"
 #include "constants/songs.h"
 #include "overworld.h"
 #include "decoration_inventory.h"
diff --git a/src/field/tv.c b/src/field/tv.c
index 5c42fc7ec..2d345eb6c 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -8,7 +8,7 @@
 #include "fieldmap.h"
 #include "field_message_box.h"
 #include "field_camera.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "random.h"
 #include "string_util.h"
 #include "text.h"
@@ -24,7 +24,7 @@
 #include "field_map_obj.h"
 #include "field_specials.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "map_constants.h"
 #include "naming_screen.h"
@@ -39,7 +39,7 @@
 #include "strings.h"
 #include "text.h"
 #include "ewram.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "region_map_sections.h"
 
 struct UnkTvStruct
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index 13129bf7f..b876c887d 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "mail.h"
 #include "easy_chat.h"
-#include "items.h"
+#include "constants/items.h"
 #include "mail_data.h"
 #include "menu.h"
 #include "menu_helpers.h"
diff --git a/src/pokemon/mail_data.c b/src/pokemon/mail_data.c
index fce796ab0..4249b9f48 100644
--- a/src/pokemon/mail_data.c
+++ b/src/pokemon/mail_data.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "mail_data.h"
-#include "items.h"
+#include "constants/items.h"
 #include "name_string_util.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index e0c28bdba..f4d227f7f 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "data2.h"
-#include "items.h"
+#include "constants/items.h"
 #include "main.h"
 #include "pokemon.h"
 #include "random.h"
diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c
index a0e73b952..b824aee90 100644
--- a/src/pokemon/pokemon_3.c
+++ b/src/pokemon/pokemon_3.c
@@ -5,7 +5,7 @@
 #include "event_data.h"
 #include "hold_effects.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index a00cea842..2688e090b 100644
--- a/src/pokemon/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
@@ -3,9 +3,9 @@
 #include "constants/species.h"
 #include "trainer.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "hold_effects.h"
-#include "items.h"
+#include "constants/items.h"
 #include "sprite.h"
 #include "data2.h"
 
diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c
index 9811a6f77..9803aa071 100644
--- a/src/pokemon/pokemon_menu.c
+++ b/src/pokemon/pokemon_menu.c
@@ -11,7 +11,7 @@
 #include "overworld.h"
 #include "menu_helpers.h"
 #include "pokemon_summary_screen.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "data2.h"
 #include "strings.h"
 #include "item_use.h"
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index bf1956187..bab6648de 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -5,7 +5,8 @@
 #include "battle.h"
 #include "data2.h"
 #include "de_rom_8040FE0.h"
-#include "flags.h"
+#include "event_data.h"
+#include "constants/flags.h"
 #include "landmark.h"
 #include "link.h"
 #include "menu.h"
diff --git a/src/rom3.c b/src/rom3.c
index b150893d3..dd520a839 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -6,7 +6,7 @@
 #include "battle_anim_81258BC.h"
 #include "battle_anim_8137220.h"
 #include "cable_club.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "pokemon.h"
 #include "rom3.h"
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 790549ca4..47ed314a8 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -14,7 +14,7 @@
 #include "task.h"
 #include "overworld.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "random.h"
 #include "save.h"
 #include "menu_cursor.h"
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index ef4f5ce78..c0111de7d 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -4,7 +4,7 @@
 #include "decompress.h"
 #include "event_data.h"
 #include "ewram.h"
-#include "items.h"
+#include "constants/items.h"
 #include "main.h"
 #include "menu.h"
 #include "naming_screen.h"
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 4a875d58c..9d1aaa125 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -10,7 +10,7 @@
 #include "debug.h"
 #include "decompress.h"
 #include "event_data.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "load_save.h"
 #include "main.h"