From d0a8e8e7441a5ac4eee6e40cfeb6c3e77d6aace4 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Tue, 9 Jan 2018 00:36:15 -0500
Subject: =?UTF-8?q?includes.asm=20=E2=86=92=20constants.asm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 audio.asm                        |  2 +-
 constants.asm                    | 53 ++++++++++++++++++++++++++++++++++++++++
 data/common_text/common_text.asm |  2 +-
 data/pokemon/dex_entries.asm     |  2 +-
 data/pokemon/egg_moves.asm       |  2 +-
 data/pokemon/evos_attacks.asm    |  2 +-
 engine/credits.asm               |  2 +-
 engine/events.asm                |  3 ++-
 gfx/pics.asm                     |  2 +-
 home.asm                         |  2 +-
 includes.asm                     | 53 ----------------------------------------
 main.asm                         |  2 +-
 maps.asm                         |  2 +-
 wram.asm                         |  2 +-
 14 files changed, 66 insertions(+), 65 deletions(-)
 create mode 100644 constants.asm
 delete mode 100644 includes.asm

diff --git a/audio.asm b/audio.asm
index 196b5a4c8..cecbdae5b 100644
--- a/audio.asm
+++ b/audio.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Audio", ROMX
diff --git a/constants.asm b/constants.asm
new file mode 100644
index 000000000..2f0a436ea
--- /dev/null
+++ b/constants.asm
@@ -0,0 +1,53 @@
+INCLUDE "version.asm"
+
+INCLUDE "charmap.asm"
+
+INCLUDE "macros.asm"
+
+INCLUDE "hram.asm"
+
+INCLUDE "constants/hardware_constants.asm"
+INCLUDE "constants/wram_constants.asm"
+INCLUDE "constants/pokemon_constants.asm"
+INCLUDE "constants/type_constants.asm"
+INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/move_effect_constants.asm"
+INCLUDE "constants/battle_constants.asm"
+INCLUDE "constants/battle_anim_constants.asm"
+INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/map_data_constants.asm"
+INCLUDE "constants/map_setup_constants.asm"
+INCLUDE "constants/landmark_constants.asm"
+INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/item_data_constants.asm"
+INCLUDE "constants/trainer_constants.asm"
+INCLUDE "constants/trainer_data_constants.asm"
+INCLUDE "constants/script_constants.asm"
+INCLUDE "constants/event_flags.asm"
+INCLUDE "constants/engine_flags.asm"
+INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/sfx_constants.asm"
+INCLUDE "constants/phone_constants.asm"
+INCLUDE "constants/credits_constants.asm"
+INCLUDE "constants/gfx_constants.asm"
+INCLUDE "constants/input_constants.asm"
+INCLUDE "constants/pokemon_data_constants.asm"
+INCLUDE "constants/icon_constants.asm"
+INCLUDE "constants/serial_constants.asm"
+INCLUDE "constants/mobile_constants.asm"
+INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/misc_constants.asm"
+INCLUDE "constants/std_constants.asm"
+INCLUDE "constants/deco_constants.asm"
+INCLUDE "constants/radio_constants.asm"
+INCLUDE "constants/npctrade_constants.asm"
+INCLUDE "constants/sprite_constants.asm"
+INCLUDE "constants/sprite_data_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
+INCLUDE "constants/tileset_constants.asm"
+INCLUDE "constants/collision_constants.asm"
+INCLUDE "constants/cgb_constants.asm"
+INCLUDE "constants/battle_tower_constants.asm"
+INCLUDE "constants/cry_constants.asm"
+INCLUDE "constants/audio_constants.asm"
+INCLUDE "constants/printer_constants.asm"
diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm
index 9c212eae2..2f88b4e9d 100644
--- a/data/common_text/common_text.asm
+++ b/data/common_text/common_text.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Text 1", ROMX
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index 92b9c6b06..7381a4262 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Pokedex Entries 001-064", ROMX
diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm
index 52d244c39..dc6dbb06a 100644
--- a/data/pokemon/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Egg Moves", ROMX
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index f21febf87..2649bb7a1 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Evolutions and Attacks", ROMX
diff --git a/engine/credits.asm b/engine/credits.asm
index 3dddb4126..564422db3 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Credits", ROMX
diff --git a/engine/events.asm b/engine/events.asm
index 7356a8910..cff7c76ed 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -1,4 +1,5 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
+
 
 SECTION "Events", ROMX
 
diff --git a/gfx/pics.asm b/gfx/pics.asm
index fc2d46a77..198569a76 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 ; PokemonPicPointers and UnownPicPointers are assumed to start at the same
diff --git a/home.asm b/home.asm
index 8e4b3b171..5aec10683 100644
--- a/home.asm
+++ b/home.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "NULL", ROM0
diff --git a/includes.asm b/includes.asm
deleted file mode 100644
index 2f0a436ea..000000000
--- a/includes.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-INCLUDE "version.asm"
-
-INCLUDE "charmap.asm"
-
-INCLUDE "macros.asm"
-
-INCLUDE "hram.asm"
-
-INCLUDE "constants/hardware_constants.asm"
-INCLUDE "constants/wram_constants.asm"
-INCLUDE "constants/pokemon_constants.asm"
-INCLUDE "constants/type_constants.asm"
-INCLUDE "constants/move_constants.asm"
-INCLUDE "constants/move_effect_constants.asm"
-INCLUDE "constants/battle_constants.asm"
-INCLUDE "constants/battle_anim_constants.asm"
-INCLUDE "constants/map_constants.asm"
-INCLUDE "constants/map_data_constants.asm"
-INCLUDE "constants/map_setup_constants.asm"
-INCLUDE "constants/landmark_constants.asm"
-INCLUDE "constants/item_constants.asm"
-INCLUDE "constants/item_data_constants.asm"
-INCLUDE "constants/trainer_constants.asm"
-INCLUDE "constants/trainer_data_constants.asm"
-INCLUDE "constants/script_constants.asm"
-INCLUDE "constants/event_flags.asm"
-INCLUDE "constants/engine_flags.asm"
-INCLUDE "constants/music_constants.asm"
-INCLUDE "constants/sfx_constants.asm"
-INCLUDE "constants/phone_constants.asm"
-INCLUDE "constants/credits_constants.asm"
-INCLUDE "constants/gfx_constants.asm"
-INCLUDE "constants/input_constants.asm"
-INCLUDE "constants/pokemon_data_constants.asm"
-INCLUDE "constants/icon_constants.asm"
-INCLUDE "constants/serial_constants.asm"
-INCLUDE "constants/mobile_constants.asm"
-INCLUDE "constants/text_constants.asm"
-INCLUDE "constants/misc_constants.asm"
-INCLUDE "constants/std_constants.asm"
-INCLUDE "constants/deco_constants.asm"
-INCLUDE "constants/radio_constants.asm"
-INCLUDE "constants/npctrade_constants.asm"
-INCLUDE "constants/sprite_constants.asm"
-INCLUDE "constants/sprite_data_constants.asm"
-INCLUDE "constants/sprite_anim_constants.asm"
-INCLUDE "constants/tileset_constants.asm"
-INCLUDE "constants/collision_constants.asm"
-INCLUDE "constants/cgb_constants.asm"
-INCLUDE "constants/battle_tower_constants.asm"
-INCLUDE "constants/cry_constants.asm"
-INCLUDE "constants/audio_constants.asm"
-INCLUDE "constants/printer_constants.asm"
diff --git a/main.asm b/main.asm
index af8a87a2f..26e29ba7e 100644
--- a/main.asm
+++ b/main.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "bank1", ROMX
diff --git a/maps.asm b/maps.asm
index b43210ed5..9396aad69 100644
--- a/maps.asm
+++ b/maps.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 
 
 SECTION "Map Headers", ROMX
diff --git a/wram.asm b/wram.asm
index 3f4c1ecb8..66f926037 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,4 +1,4 @@
-INCLUDE "includes.asm"
+INCLUDE "constants.asm"
 INCLUDE "macros/wram.asm"
 
 
-- 
cgit v1.2.3