summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-28 15:41:15 -0700
committerYamaArashi <shadow962@live.com>2016-10-28 15:41:15 -0700
commitd9e59a388c7c4b2464769963b3d58980ce742f70 (patch)
treedc2c4dc78b6272854bfddd83c029323acd712391 /constants
parent38076cb64093e5d50323075516b832111dc59c92 (diff)
included .s to .inc
Diffstat (limited to 'constants')
-rw-r--r--constants/ability_constants.inc (renamed from constants/ability_constants.s)0
-rw-r--r--constants/battle.inc (renamed from constants/battle.s)0
-rw-r--r--constants/battle_move_constants.inc (renamed from constants/battle_move_constants.s)0
-rw-r--r--constants/battle_move_effects.inc (renamed from constants/battle_move_effects.s)0
-rw-r--r--constants/battle_text.inc (renamed from constants/battle_text.s)0
-rw-r--r--constants/battle_tower_constants.inc (renamed from constants/battle_tower_constants.s)0
-rw-r--r--constants/berry_constants.inc (renamed from constants/berry_constants.s)0
-rw-r--r--constants/constants.inc29
-rw-r--r--constants/constants.s29
-rw-r--r--constants/contest_constants.inc (renamed from constants/contest_constants.s)0
-rw-r--r--constants/contest_move_effects.inc (renamed from constants/contest_move_effects.s)0
-rw-r--r--constants/decorations.inc (renamed from constants/decorations.s)0
-rw-r--r--constants/easy_chat_constants.inc (renamed from constants/easy_chat_constants.s)0
-rw-r--r--constants/game_stat.inc (renamed from constants/game_stat.s)0
-rw-r--r--constants/gba_constants.inc (renamed from constants/gba_constants.s)0
-rw-r--r--constants/hold_effects.inc (renamed from constants/hold_effects.s)0
-rw-r--r--constants/item_constants.inc (renamed from constants/item_constants.s)0
-rw-r--r--constants/item_data_constants.inc (renamed from constants/item_data_constants.s)0
-rw-r--r--constants/m4a_constants.inc (renamed from constants/m4a_constants.s)0
-rw-r--r--constants/map_constants.inc (renamed from constants/map_constants.s)0
-rw-r--r--constants/map_object_constants.inc (renamed from constants/map_object_constants.s)0
-rw-r--r--constants/misc_constants.inc (renamed from constants/misc_constants.s)0
-rw-r--r--constants/move_constants.inc (renamed from constants/move_constants.s)0
-rw-r--r--constants/opponent_constants.inc (renamed from constants/opponent_constants.s)0
-rw-r--r--constants/pokemon_data_constants.inc (renamed from constants/pokemon_data_constants.s)0
-rw-r--r--constants/region_map_sections.inc (renamed from constants/region_map_sections.s)0
-rw-r--r--constants/songs.inc (renamed from constants/songs.s)0
-rw-r--r--constants/species_constants.inc (renamed from constants/species_constants.s)0
-rw-r--r--constants/trainer_constants.inc (renamed from constants/trainer_constants.s)0
-rw-r--r--constants/type_constants.inc (renamed from constants/type_constants.s)0
-rw-r--r--constants/variables.inc (renamed from constants/variables.s)0
-rw-r--r--constants/version.inc (renamed from constants/version.s)0
32 files changed, 29 insertions, 29 deletions
diff --git a/constants/ability_constants.s b/constants/ability_constants.inc
index 8ccc872f7..8ccc872f7 100644
--- a/constants/ability_constants.s
+++ b/constants/ability_constants.inc
diff --git a/constants/battle.s b/constants/battle.inc
index c6094b15f..c6094b15f 100644
--- a/constants/battle.s
+++ b/constants/battle.inc
diff --git a/constants/battle_move_constants.s b/constants/battle_move_constants.inc
index a05da3db3..a05da3db3 100644
--- a/constants/battle_move_constants.s
+++ b/constants/battle_move_constants.inc
diff --git a/constants/battle_move_effects.s b/constants/battle_move_effects.inc
index bd801083b..bd801083b 100644
--- a/constants/battle_move_effects.s
+++ b/constants/battle_move_effects.inc
diff --git a/constants/battle_text.s b/constants/battle_text.inc
index f7025f68f..f7025f68f 100644
--- a/constants/battle_text.s
+++ b/constants/battle_text.inc
diff --git a/constants/battle_tower_constants.s b/constants/battle_tower_constants.inc
index 136b43bd7..136b43bd7 100644
--- a/constants/battle_tower_constants.s
+++ b/constants/battle_tower_constants.inc
diff --git a/constants/berry_constants.s b/constants/berry_constants.inc
index 2ecd7ac36..2ecd7ac36 100644
--- a/constants/berry_constants.s
+++ b/constants/berry_constants.inc
diff --git a/constants/constants.inc b/constants/constants.inc
new file mode 100644
index 000000000..de281bd93
--- /dev/null
+++ b/constants/constants.inc
@@ -0,0 +1,29 @@
+ .include "constants/gba_constants.inc"
+ .include "constants/misc_constants.inc"
+ .include "constants/species_constants.inc"
+ .include "constants/ability_constants.inc"
+ .include "constants/move_constants.inc"
+ .include "constants/item_constants.inc"
+ .include "constants/type_constants.inc"
+ .include "constants/contest_constants.inc"
+ .include "constants/pokemon_data_constants.inc"
+ .include "constants/item_data_constants.inc"
+ .include "constants/battle_move_constants.inc"
+ .include "constants/easy_chat_constants.inc"
+ .include "constants/trainer_constants.inc"
+ .include "constants/map_constants.inc"
+ .include "constants/berry_constants.inc"
+ .include "constants/map_object_constants.inc"
+ .include "constants/battle_tower_constants.inc"
+ .include "constants/opponent_constants.inc"
+ .include "constants/decorations.inc"
+ .include "constants/variables.inc"
+ .include "constants/songs.inc"
+ .include "constants/version.inc"
+ .include "constants/region_map_sections.inc"
+ .include "constants/hold_effects.inc"
+ .include "constants/battle.inc"
+ .include "constants/battle_text.inc"
+ .include "constants/battle_move_effects.inc"
+ .include "constants/contest_move_effects.inc"
+ .include "constants/game_stat.inc"
diff --git a/constants/constants.s b/constants/constants.s
deleted file mode 100644
index daca14090..000000000
--- a/constants/constants.s
+++ /dev/null
@@ -1,29 +0,0 @@
- .include "constants/gba_constants.s"
- .include "constants/misc_constants.s"
- .include "constants/species_constants.s"
- .include "constants/ability_constants.s"
- .include "constants/move_constants.s"
- .include "constants/item_constants.s"
- .include "constants/type_constants.s"
- .include "constants/contest_constants.s"
- .include "constants/pokemon_data_constants.s"
- .include "constants/item_data_constants.s"
- .include "constants/battle_move_constants.s"
- .include "constants/easy_chat_constants.s"
- .include "constants/trainer_constants.s"
- .include "constants/map_constants.s"
- .include "constants/berry_constants.s"
- .include "constants/map_object_constants.s"
- .include "constants/battle_tower_constants.s"
- .include "constants/opponent_constants.s"
- .include "constants/decorations.s"
- .include "constants/variables.s"
- .include "constants/songs.s"
- .include "constants/version.s"
- .include "constants/region_map_sections.s"
- .include "constants/hold_effects.s"
- .include "constants/battle.s"
- .include "constants/battle_text.s"
- .include "constants/battle_move_effects.s"
- .include "constants/contest_move_effects.s"
- .include "constants/game_stat.s"
diff --git a/constants/contest_constants.s b/constants/contest_constants.inc
index e971764d6..e971764d6 100644
--- a/constants/contest_constants.s
+++ b/constants/contest_constants.inc
diff --git a/constants/contest_move_effects.s b/constants/contest_move_effects.inc
index b19e05004..b19e05004 100644
--- a/constants/contest_move_effects.s
+++ b/constants/contest_move_effects.inc
diff --git a/constants/decorations.s b/constants/decorations.inc
index 482799f9e..482799f9e 100644
--- a/constants/decorations.s
+++ b/constants/decorations.inc
diff --git a/constants/easy_chat_constants.s b/constants/easy_chat_constants.inc
index 69639769d..69639769d 100644
--- a/constants/easy_chat_constants.s
+++ b/constants/easy_chat_constants.inc
diff --git a/constants/game_stat.s b/constants/game_stat.inc
index ff8b2df00..ff8b2df00 100644
--- a/constants/game_stat.s
+++ b/constants/game_stat.inc
diff --git a/constants/gba_constants.s b/constants/gba_constants.inc
index 9d59c8fcd..9d59c8fcd 100644
--- a/constants/gba_constants.s
+++ b/constants/gba_constants.inc
diff --git a/constants/hold_effects.s b/constants/hold_effects.inc
index 349a195bd..349a195bd 100644
--- a/constants/hold_effects.s
+++ b/constants/hold_effects.inc
diff --git a/constants/item_constants.s b/constants/item_constants.inc
index 934ebd798..934ebd798 100644
--- a/constants/item_constants.s
+++ b/constants/item_constants.inc
diff --git a/constants/item_data_constants.s b/constants/item_data_constants.inc
index 07ceb6e3b..07ceb6e3b 100644
--- a/constants/item_data_constants.s
+++ b/constants/item_data_constants.inc
diff --git a/constants/m4a_constants.s b/constants/m4a_constants.inc
index 62ca5bb55..62ca5bb55 100644
--- a/constants/m4a_constants.s
+++ b/constants/m4a_constants.inc
diff --git a/constants/map_constants.s b/constants/map_constants.inc
index d7a8a323e..d7a8a323e 100644
--- a/constants/map_constants.s
+++ b/constants/map_constants.inc
diff --git a/constants/map_object_constants.s b/constants/map_object_constants.inc
index e0843914f..e0843914f 100644
--- a/constants/map_object_constants.s
+++ b/constants/map_object_constants.inc
diff --git a/constants/misc_constants.s b/constants/misc_constants.inc
index 64f671e8f..64f671e8f 100644
--- a/constants/misc_constants.s
+++ b/constants/misc_constants.inc
diff --git a/constants/move_constants.s b/constants/move_constants.inc
index b6c8edf98..b6c8edf98 100644
--- a/constants/move_constants.s
+++ b/constants/move_constants.inc
diff --git a/constants/opponent_constants.s b/constants/opponent_constants.inc
index 6782d3151..6782d3151 100644
--- a/constants/opponent_constants.s
+++ b/constants/opponent_constants.inc
diff --git a/constants/pokemon_data_constants.s b/constants/pokemon_data_constants.inc
index cf5d4df41..cf5d4df41 100644
--- a/constants/pokemon_data_constants.s
+++ b/constants/pokemon_data_constants.inc
diff --git a/constants/region_map_sections.s b/constants/region_map_sections.inc
index 25f1b6ee1..25f1b6ee1 100644
--- a/constants/region_map_sections.s
+++ b/constants/region_map_sections.inc
diff --git a/constants/songs.s b/constants/songs.inc
index a89376983..a89376983 100644
--- a/constants/songs.s
+++ b/constants/songs.inc
diff --git a/constants/species_constants.s b/constants/species_constants.inc
index 8f164a1d9..8f164a1d9 100644
--- a/constants/species_constants.s
+++ b/constants/species_constants.inc
diff --git a/constants/trainer_constants.s b/constants/trainer_constants.inc
index 48ed3036e..48ed3036e 100644
--- a/constants/trainer_constants.s
+++ b/constants/trainer_constants.inc
diff --git a/constants/type_constants.s b/constants/type_constants.inc
index c6611bd8a..c6611bd8a 100644
--- a/constants/type_constants.s
+++ b/constants/type_constants.inc
diff --git a/constants/variables.s b/constants/variables.inc
index b92ca5975..b92ca5975 100644
--- a/constants/variables.s
+++ b/constants/variables.inc
diff --git a/constants/version.s b/constants/version.inc
index 33d2804fc..33d2804fc 100644
--- a/constants/version.s
+++ b/constants/version.inc