move misc/ files up one dir.

15 files changed, 22 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index f6c20a681..5ef851b1c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
 $(VERSIONS) $(VERSIONS:%=compare_%)
 
 
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle,/field,/debug,/misc,/scene,/pokemon,/engine,/libs}}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle,/field,/debug,/scene,/pokemon,/engine,/libs}}))
 
 C_SRCS := $(wildcard src/*/*.c) $(wildcard src/*.c)
 ASM_SRCS := $(wildcard asm/*.s)
diff --git a/common_syms/misc/rom3.txt b/common_syms/rom3.txt
index 06a965ff6..06a965ff6 100644
--- a/common_syms/misc/rom3.txt
+++ b/common_syms/rom3.txt
diff --git a/ld_script.txt b/ld_script.txt
index 118ced0ea..975be5f8e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -46,10 +46,10 @@ SECTIONS {
         src/engine/link.o(.text);
         src/engine/rtc.o(.text);
         src/engine/main_menu.o(.text);
-        src/misc/rom3.o(.text);
+        src/rom3.o(.text);
         src/engine/decompress.o(.text);
         asm/battle_1.o(.text);
-        src/misc/rom_800D42C.o(.text);
+        src/rom_800D42C.o(.text);
         asm/battle_1.o(.text_800DC24);
         src/battle/battle_2.o(.text);
         asm/battle_2.o(.text);
@@ -65,7 +65,7 @@ SECTIONS {
         src/pokemon/pokemon_2.o(.text);
         asm/pokemon_item_effect.o(.text);
         src/pokemon/pokemon_3.o(.text);
-        src/misc/de_rom_8040FE0.o(.text);
+        src/de_rom_8040FE0.o(.text);
         src/engine/trig.o(.text);
         src/engine/rng.o(.text);
         src/engine/util.o(.text);
@@ -113,7 +113,7 @@ SECTIONS {
         src/engine/palette.o(.text);
         src/engine/sound.o(.text);
         src/battle/battle_anim.o(.text);
-        src/misc/rom_8077ABC.o(.text);
+        src/rom_8077ABC.o(.text);
         src/engine/task.o(.text);
         src/battle/reshow_battle_screen.o(.text);
         src/battle/battle_anim_807B69C.o(.text);
@@ -128,7 +128,7 @@ SECTIONS {
         src/field/trainer_see.o(.text);
         src/field/wild_encounter.o(.text);
         src/field/field_effect.o(.text);
-        src/misc/unknown_task.o(.text);
+        src/unknown_task.o(.text);
         src/pokemon/pokemon_menu.o(.text);
         src/engine/option_menu.o(.text);
         src/pokemon/pokedex.o(.text);
@@ -163,7 +163,7 @@ SECTIONS {
         asm/secret_base.o(.text_80BC1D0);
         src/field/tv.o(.text);
         asm/contest_link_80C2020.o(.text);
-        src/misc/script_pokemon_util_80C4BF0.o(.text);
+        src/script_pokemon_util_80C4BF0.o(.text);
         src/field/field_poison.o(.text);
         src/pokemon/pokemon_size_record.o(.text);
         asm/fldeff_80C5CD4.o(.text);
@@ -184,7 +184,7 @@ SECTIONS {
         src/field/mauville_man.o(.text);
         src/pokemon/mail.o(.text);
         src/field/menu_helpers.o(.text);
-        src/misc/script_pokemon_util_80F99CC.o(.text);
+        src/script_pokemon_util_80F99CC.o(.text);
         src/field/dewford_trend.o(.text);
         src/field/heal_location.o(.text);
         src/field/region_map.o(.text);
@@ -200,7 +200,7 @@ SECTIONS {
         src/field/trader.o(.text);
         src/field/starter_choose.o(.text);
         src/field/wallclock.o(.text);
-        src/misc/rom6.o(.text);
+        src/rom6.o(.text);
         src/field/pokeblock.o(.text);
         src/field/fldeff_flash.o(.text);
         src/battle/post_battle_event_funcs.o(.text);
@@ -225,7 +225,7 @@ SECTIONS {
         asm/cable_car.o(.text);
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
-        src/misc/unused_8124F94.o(.text);
+        src/unused_8124F94.o(.text);
         src/engine/save.o(.text);
         src/engine/mystery_event_script.o(.text);
         src/field/field_effect_helpers.o(.text);
@@ -362,7 +362,7 @@ SECTIONS {
         src/engine/sound.o(.rodata);
         data/battle_anim.o(.rodata);
         src/battle/battle_anim.o(.rodata);
-        src/misc/rom_8077ABC.o(.rodata);
+        src/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
         data/data_8393054.o(.rodata);
         src/engine/task.o(.rodata);
diff --git a/src/misc/de_rom_8040FE0.c b/src/de_rom_8040FE0.c
index eebcc1437..eebcc1437 100644
--- a/src/misc/de_rom_8040FE0.c
+++ b/src/de_rom_8040FE0.c
diff --git a/src/misc/rom3.c b/src/rom3.c
index 3f4860ecc..3f4860ecc 100644
--- a/src/misc/rom3.c
+++ b/src/rom3.c
diff --git a/src/misc/rom6.c b/src/rom6.c
index 3a5071034..3a5071034 100644
--- a/src/misc/rom6.c
+++ b/src/rom6.c
diff --git a/src/misc/rom_800D42C.c b/src/rom_800D42C.c
index f51779e65..f51779e65 100644
--- a/src/misc/rom_800D42C.c
+++ b/src/rom_800D42C.c
diff --git a/src/misc/rom_8077ABC.c b/src/rom_8077ABC.c
index 172233e6d..172233e6d 100644
--- a/src/misc/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
diff --git a/src/misc/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index f98293a90..f98293a90 100644
--- a/src/misc/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
diff --git a/src/misc/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index f930df8e2..f930df8e2 100644
--- a/src/misc/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
diff --git a/src/misc/unknown_task.c b/src/unknown_task.c
index 5ec7fa6bc..5ec7fa6bc 100644
--- a/src/misc/unknown_task.c
+++ b/src/unknown_task.c
diff --git a/src/misc/unused_8124F94.c b/src/unused_8124F94.c
index 5f76fa92e..5f76fa92e 100644
--- a/src/misc/unused_8124F94.c
+++ b/src/unused_8124F94.c
diff --git a/sym_bss.txt b/sym_bss.txt
index c1348d8b2..4f6d9c95b 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -5,7 +5,7 @@
 	.include "src/engine/link.o"
 	.include "src/engine/rtc.o"
 	.include "src/field/daycare.o"
-    .include "src/engine/trade.o"
+	.include "src/engine/trade.o"
 	.include "src/scene/berry_blender.o"
 	.include "src/engine/play_time.o"
 	.include "src/field/overworld.o"
@@ -24,15 +24,15 @@
 	.include "src/field/shop.o"
 	.include "src/engine/record_mixing.o"
 	.include "src/field/tv.o"
-    .include "src/battle/battle_anim_80CA710.o"
-    .include "src/field/easy_chat.o"
-    .include "src/field/pokenav.o"
+	.include "src/battle/battle_anim_80CA710.o"
+	.include "src/field/easy_chat.o"
+	.include "src/field/pokenav.o"
 	.include "src/field/mauville_man.o"
 	.include "src/field/menu_helpers.o"
 	.include "src/scene/contest_painting.o"
 	.include "src/field/pokeblock.o"
 	.include "src/field/field_specials.o"
-    .include "src/pokemon/learn_move.o"
+	.include "src/pokemon/learn_move.o"
 	.include "src/field/player_pc.o"
 	.include "asm/m4a_1.o"
 	.include "src/libs/agb_flash.o"
diff --git a/sym_common.txt b/sym_common.txt
index 414d03e0f..207f47f51 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -3,7 +3,7 @@
 	.include "engine/string_util.o"
 	.include "engine/link.o"
 	.include "engine/rtc.o"
-	.include "misc/rom3.o"
+	.include "rom3.o"
 
 @ battle
 
@@ -160,7 +160,7 @@ gUnknown_03005560: @ 3005560
 gUnknown_030056A0: @ 30056A0
 	.space 0x640
 
-    .include "pokemon/pokemon_menu.o"
+	.include "pokemon/pokemon_menu.o"
 	.include "pokemon/pokedex.o"
 
 @ pokemon_summary_screen
@@ -237,7 +237,7 @@ gUnknown_03005E0C: @ 3005E0C
 	.space 0x4
 
 	.include "scene/contest_painting.o"
-    .include "scene/evolution_scene.o"
+	.include "scene/evolution_scene.o"
 
 @ pokedex_cry_screen
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index f7352cd1d..e5cda29a9 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -6,7 +6,7 @@
 	.space 0x2E8
 
 	.include "src/engine/link.o"
-	.include "src/misc/rom3.o"
+	.include "src/rom3.o"
 
 @ battle
 
@@ -344,7 +344,7 @@ gUnknown_0202E8FA: @ 202E8FA
 	.include "src/engine/palette.o"
 	.include "src/engine/sound.o"
 	.include "src/battle/battle_anim.o"
-	.include "src/misc/rom_8077ABC.o"
+	.include "src/rom_8077ABC.o"
 	.include "src/scene/title_screen.o"
 
 @ field_weather
@@ -549,7 +549,7 @@ gUnknown_020388B4: @ 20388B4
 	.include "src/field/region_map.o"
 	.include "src/field/decoration.o"
 	.include "src/battle/battle_ai.o"
-	.include "src/misc/rom6.o"
+	.include "src/rom6.o"
 	.include "src/field/pokeblock.o"
 	.include "src/field/field_specials.o"