file renaming

16 files changed, 16 insertions, 16 deletions

diff --git a/asm/rom_8080874.s b/asm/field_screen_effect.s
index 4fbfae1a2..4fbfae1a2 100644
--- a/asm/rom_8080874.s
+++ b/asm/field_screen_effect.s
diff --git a/asm/field_screeneffect.s b/asm/field_weather.s
index 01190c75e..01190c75e 100644
--- a/asm/field_screeneffect.s
+++ b/asm/field_weather.s
diff --git a/data/field_screeneffect.s b/data/field_weather.s
index 836bfbe99..836bfbe99 100644
--- a/data/field_screeneffect.s
+++ b/data/field_weather.s
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 1f32d50ec..0c111a991 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -166,7 +166,7 @@ u8 battle_get_per_side_status(u8);
 u8 battle_get_side_with_given_state(u8);
 bool8 IsDoubleBattle();
 
-// asm/field_screeneffect.o
+// asm/field_weather.o
 void SetWeather(u32);
 
 // src/field_fadetransition.o
diff --git a/include/field_screeneffect.h b/include/field_weather.h
index af07c970d..af07c970d 100644
--- a/include/field_screeneffect.h
+++ b/include/field_weather.h
diff --git a/ld_script.txt b/ld_script.txt
index 96f46a141..bc820c4d3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -75,7 +75,7 @@ SECTIONS {
         asm/daycare.o(.text);
         src/egg_hatch.o(.text);
         asm/egg_hatch.o(.text);
-		src/battle_interface.o(.text);
+        src/battle_interface.o(.text);
         src/smokescreen.o(.text);
         asm/pokeball.o(.text);
         src/load_save.o(.text);
@@ -123,11 +123,11 @@ SECTIONS {
         asm/reshow_battle_screen.o(.text);
         asm/battle_anim_807B69C.o(.text);
         src/title_screen.o(.text);
-        src/field_screeneffect.o(.text);
-        asm/field_screeneffect.o(.text);
+        src/field_weather.o(.text);
+        asm/field_weather.o(.text);
         src/field_fadetransition.o(.text);
         asm/field_fadetransition.o(.text);
-        asm/rom_8080874.o(.text);
+        asm/field_screen_effect.o(.text);
         src/battle_setup.o(.text);
         asm/cable_club.o(.text);
         src/mori_debug_menu.o(.text);
@@ -383,7 +383,7 @@ SECTIONS {
         data/task.o(.rodata);
         data/battle_anim_807B69C.o(.rodata);
         src/title_screen.o(.rodata);
-        data/field_screeneffect.o(.rodata);
+        data/field_weather.o(.rodata);
         data/rom_8080874.o(.rodata);
         src/battle_setup.o(.rodata);
         data/cable_club.o(.rodata);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index abc0b978d..0753fba70 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -7,7 +7,7 @@
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "main.h"
 #include "map_constants.h"
 #include "metatile_behavior.h"
diff --git a/src/field_effect.c b/src/field_effect.c
index 1b2346a00..bbc1144c1 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "field_effect.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "sprite.h"
 #include "text.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index f7d591c69..b5e6c1039 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "gba/syscall.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "global.fieldmap.h"
 #include "script.h"
 #include "task.h"
diff --git a/src/field_screeneffect.c b/src/field_weather.c
index 6cae0c18a..ff5d5b507 100644
--- a/src/field_screeneffect.c
+++ b/src/field_weather.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "asm.h"
 #include "palette.h"
 #include "sprite.h"
diff --git a/src/item_use.c b/src/item_use.c
index 762bb70f2..4047ade5c 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -6,7 +6,7 @@
 #include "event_data.h"
 #include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "fieldmap.h"
 #include "item.h"
 #include "items.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 02a2dc1a2..f0f0709b1 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "asm.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "item.h"
 #include "items.h"
 #include "main.h"
diff --git a/src/rom4.c b/src/rom4.c
index 5beb698ab..79ac6d769 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -13,7 +13,7 @@
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "field_special_scene.h"
 #include "heal_location.h"
 #include "link.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 7569462e6..136181bd3 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -13,7 +13,7 @@
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "item.h"
 #include "main.h"
 #include "map_obj_lock.h"
diff --git a/src/shop.c b/src/shop.c
index c78771be7..780dff02a 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "asm.h"
 #include "decompress.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "main.h"
 #include "menu.h"
 #include "money.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index 48217219d..4a3bcbbd3 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -4,7 +4,7 @@
 #include "event_data.h"
 #include "field_map_obj_helpers.h"
 #include "field_player_avatar.h"
-#include "field_screeneffect.h"
+#include "field_weather.h"
 #include "load_save.h"
 #include "main.h"
 #include "map_obj_lock.h"