Merge pull request #750 from camthesaxman/filenames_1

emerald file names, part 1

35 files changed, 20 insertions, 34 deletions

diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c
index e2dd4a2af..e0cc441aa 100644
--- a/src/battle/anim/roots.c
+++ b/src/battle/anim/roots.c
@@ -6,7 +6,11 @@
 extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimAttacker;
 extern u8 gBattleAnimTarget;
-extern s16 gUnknown_03000728[];
+
+IWRAM_DATA u32 filler_03000724;
+IWRAM_DATA u16 gUnknown_03000728[4];
+IWRAM_DATA u16 gUnknown_03000730[6];
+IWRAM_DATA u32 filler_0300073c;
 
 void sub_80CB59C(struct Sprite* sprite);
 void sub_80CB620(struct Sprite *sprite);
diff --git a/src/battle/battle_anim_80CA710.c b/src/battle/battle_anim_80CA710.c
deleted file mode 100644
index 65ccd7c21..000000000
--- a/src/battle/battle_anim_80CA710.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-// Includes
-#include "global.h"
-
-// Static type declarations
-
-// Static RAM declarations
-
-IWRAM_DATA u32 filler_03000724;
-IWRAM_DATA u16 gUnknown_03000728[4];
-IWRAM_DATA u16 gUnknown_03000730[6];
-IWRAM_DATA u32 filler_0300073c;
-
-// Static ROM declarations
-
-// .rodata
-
-// .text
diff --git a/src/battle/battle_ai.c b/src/battle_ai_script_commands.c
index e192251d0..57fb479e9 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle_ai_script_commands.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "constants/abilities.h"
 #include "battle.h"
 #include "constants/battle_move_effects.h"
diff --git a/src/battle/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 2cf11b50e..2cf11b50e 100644
--- a/src/battle/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
diff --git a/src/battle/battle_anim.c b/src/battle_anim.c
index 287d80ab1..287d80ab1 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle_anim.c
diff --git a/src/battle/battle_anim_812C144.c b/src/battle_anim_effects_3.c
index 90e7d8e2c..90e7d8e2c 100644
--- a/src/battle/battle_anim_812C144.c
+++ b/src/battle_anim_effects_3.c
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle_anim_mon_movement.c
index 5e713a3a7..5e713a3a7 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle_anim_mon_movement.c
diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle_anim_special.c
index 9ea0585d1..7d158f671 100755
--- a/src/battle/battle_anim_813F0F4.c
+++ b/src/battle_anim_special.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "blend_palette.h"
 #include "decompress.h"
diff --git a/src/battle/battle_anim_807B69C.c b/src/battle_anim_status_effects.c
index 90e6ce38c..90e6ce38c 100644
--- a/src/battle/battle_anim_807B69C.c
+++ b/src/battle_anim_status_effects.c
diff --git a/src/battle/battle_bg.c b/src/battle_bg.c
index c3877ec1c..c3877ec1c 100644
--- a/src/battle/battle_bg.c
+++ b/src/battle_bg.c
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle_controller_link_opponent.c
index 117aeb932..d514935cf 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "data2.h"
 #include "link.h"
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle_controller_link_partner.c
index 0db2f54b4..5dbde3e83 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle_controller_link_partner.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "data2.h"
 #include "battle_811DA74.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
diff --git a/src/battle/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 15e077e92..302f6a2f3 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "data2.h"
 #include "battle_811DA74.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_tower.h"
 #include "link.h"
 #include "m4a.h"
diff --git a/src/battle/battle_controller_player.c b/src/battle_controller_player.c
index 5d7a8955c..9e9848a18 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2,7 +2,7 @@
 #include "data2.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "item.h"
diff --git a/src/battle/battle_controller_safari.c b/src/battle_controller_safari.c
index e547c4a3c..e547c4a3c 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
diff --git a/src/battle/battle_controller_wally.c b/src/battle_controller_wally.c
index fa8b2a63b..807ec1572 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "data2.h"
diff --git a/src/battle/battle_7.c b/src/battle_gfx_sfx_util.c
index 6e1ddceaf..80cbed64e 100644
--- a/src/battle/battle_7.c
+++ b/src/battle_gfx_sfx_util.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "battle_interface.h"
 #include "blend_palette.h"
 #include "contest.h"
diff --git a/src/battle/battle_interface.c b/src/battle_interface.c
index b91db9838..b91db9838 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle_interface.c
diff --git a/src/battle/battle_2.c b/src/battle_main.c
index fa941ffeb..a0eb7274f 100644
--- a/src/battle/battle_2.c
+++ b/src/battle_main.c
@@ -8,7 +8,7 @@
 #include "constants/species.h"
 #include "gba/flash_internal.h"
 #include "battle.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "battle_setup.h"
diff --git a/src/battle/battle_message.c b/src/battle_message.c
index 30d127be3..6f3fa63c6 100644
--- a/src/battle/battle_message.c
+++ b/src/battle_message.c
@@ -20,9 +20,9 @@
 #define BATTLESTRINGS_MAX   BATTLESTRINGS_NO + BATTLESTRING_TO_SUB
 
 #ifdef GERMAN
-#include "../data/battle_strings_de.h" // TODO: German
+#include "data/battle_strings_de.h" // TODO: German
 #else
-#include "../data/battle_strings_en.h"
+#include "data/battle_strings_en.h"
 #endif
 
 // This is four lists of moves which use a different attack string in Japanese
diff --git a/src/battle/battle_party_menu.c b/src/battle_party_menu.c
index e758b7957..e758b7957 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle_party_menu.c
diff --git a/src/battle/battle_records.c b/src/battle_records.c
index d94d88032..d94d88032 100644
--- a/src/battle/battle_records.c
+++ b/src/battle_records.c
diff --git a/src/battle/battle_4.c b/src/battle_script_commands.c
index dab6ce1f0..dab6ce1f0 100644
--- a/src/battle/battle_4.c
+++ b/src/battle_script_commands.c
diff --git a/src/battle/battle_setup.c b/src/battle_setup.c
index c457cc8ec..c457cc8ec 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle_setup.c
diff --git a/src/battle/battle_transition.c b/src/battle_transition.c
index a0c94f713..a0c94f713 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle_transition.c
diff --git a/src/battle/battle_util.c b/src/battle_util.c
index 3d1770239..3d1770239 100644
--- a/src/battle/battle_util.c
+++ b/src/battle_util.c
diff --git a/src/battle/calculate_base_damage.c b/src/calculate_base_damage.c
index e4ae70c0b..e4ae70c0b 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
diff --git a/src/battle/contest_link_80C2020.c b/src/contest_link_80C2020.c
index 8269f424b..8269f424b 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/contest_link_80C2020.c
diff --git a/src/battle/contest_link_80C857C.c b/src/contest_link_80C857C.c
index a694380df..a694380df 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/contest_link_80C857C.c
diff --git a/src/battle/pokeball.c b/src/pokeball.c
index abfdf2c3d..7162ee6ac 100644
--- a/src/battle/pokeball.c
+++ b/src/pokeball.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "battle.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "m4a.h"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 217e8ccdf..134b2b753 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_anim_813F0F4.h"
+#include "battle_anim_special.h"
 #include "contest.h"
 #include "data2.h"
 #include "daycare.h"
diff --git a/src/battle/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index d0fbbec85..d0fbbec85 100644
--- a/src/battle/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
diff --git a/src/battle/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 712ec3ea8..712ec3ea8 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
diff --git a/src/rom3.c b/src/rom3.c
index a9433695d..d332b7027 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_811DA74.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_anim_81258BC.h"
 #include "battle_anim_8137220.h"
diff --git a/src/battle/smokescreen.c b/src/smokescreen.c
index dc2887007..dc2887007 100644
--- a/src/battle/smokescreen.c
+++ b/src/smokescreen.c