Move more graphics out of misc

65 files changed, 59 insertions, 63 deletions

diff --git a/decompress.sh b/decompress.sh
deleted file mode 100755
index 26b5a0db7..000000000
--- a/decompress.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-FILEPATH=$1
-
-tools/gbagfx/gbagfx graphics/$FILEPATH.bin.lz graphics/$FILEPATH.bin
diff --git a/graphics/unused/intro_birch_beauty.png b/graphics/birch_speech/unused_beauty.png
index f13221cf5..f13221cf5 100644
--- a/graphics/unused/intro_birch_beauty.png
+++ b/graphics/birch_speech/unused_beauty.png
diff --git a/graphics/misc/cave_transition_black.pal b/graphics/cave_transition/black.pal
index 4b0812f09..4b0812f09 100644
--- a/graphics/misc/cave_transition_black.pal
+++ b/graphics/cave_transition/black.pal
diff --git a/graphics/misc/cave_transition_enter.pal b/graphics/cave_transition/enter.pal
index fea15a176..fea15a176 100644
--- a/graphics/misc/cave_transition_enter.pal
+++ b/graphics/cave_transition/enter.pal
diff --git a/graphics/misc/cave_transition_exit.pal b/graphics/cave_transition/exit.pal
index 09eb37624..09eb37624 100644
--- a/graphics/misc/cave_transition_exit.pal
+++ b/graphics/cave_transition/exit.pal
diff --git a/graphics/misc/cave_transition_map.bin b/graphics/cave_transition/tilemap.bin
index 4293bfd1c..4293bfd1c 100644
--- a/graphics/misc/cave_transition_map.bin
+++ b/graphics/cave_transition/tilemap.bin
diff --git a/graphics/misc/cave_transition.png b/graphics/cave_transition/tiles.png
index dd265149f..dd265149f 100644
--- a/graphics/misc/cave_transition.png
+++ b/graphics/cave_transition/tiles.png
diff --git a/graphics/misc/cave_transition_white.pal b/graphics/cave_transition/white.pal
index 98a1fb3c8..98a1fb3c8 100644
--- a/graphics/misc/cave_transition_white.pal
+++ b/graphics/cave_transition/white.pal
diff --git a/graphics/misc/decoration_putting_away_cursor.png b/graphics/decorations/put_away_cursor.png
index 2dc8ed604..2dc8ed604 100644
--- a/graphics/misc/decoration_putting_away_cursor.png
+++ b/graphics/decorations/put_away_cursor.png
diff --git a/graphics/misc/diploma_hoenn.pal b/graphics/diploma/hoenn.pal
index 2890eb24a..2890eb24a 100644
--- a/graphics/misc/diploma_hoenn.pal
+++ b/graphics/diploma/hoenn.pal
diff --git a/graphics/misc/diploma_national.pal b/graphics/diploma/national.pal
index 03c37bf22..03c37bf22 100644
--- a/graphics/misc/diploma_national.pal
+++ b/graphics/diploma/national.pal
diff --git a/graphics/misc/diploma_map.bin b/graphics/diploma/tilemap.bin
index e9a47fa44..e9a47fa44 100644
--- a/graphics/misc/diploma_map.bin
+++ b/graphics/diploma/tilemap.bin
diff --git a/graphics/misc/diploma.png b/graphics/diploma/tiles.png
index d9607dce6..d9607dce6 100644
--- a/graphics/misc/diploma.png
+++ b/graphics/diploma/tiles.png
diff --git a/graphics/misc/deoxys1.pal b/graphics/field_effects/palettes/deoxys_rock_1.pal
index d90c4cb38..d90c4cb38 100644
--- a/graphics/misc/deoxys1.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_1.pal
diff --git a/graphics/misc/deoxys10.pal b/graphics/field_effects/palettes/deoxys_rock_10.pal
index 8bdd860fb..8bdd860fb 100644
--- a/graphics/misc/deoxys10.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_10.pal
diff --git a/graphics/misc/deoxys11.pal b/graphics/field_effects/palettes/deoxys_rock_11.pal
index 9a9ee2530..9a9ee2530 100644
--- a/graphics/misc/deoxys11.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_11.pal
diff --git a/graphics/misc/deoxys2.pal b/graphics/field_effects/palettes/deoxys_rock_2.pal
index 38806db0f..38806db0f 100644
--- a/graphics/misc/deoxys2.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_2.pal
diff --git a/graphics/misc/deoxys3.pal b/graphics/field_effects/palettes/deoxys_rock_3.pal
index 24db0e343..24db0e343 100644
--- a/graphics/misc/deoxys3.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_3.pal
diff --git a/graphics/misc/deoxys4.pal b/graphics/field_effects/palettes/deoxys_rock_4.pal
index 5db08f366..5db08f366 100644
--- a/graphics/misc/deoxys4.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_4.pal
diff --git a/graphics/misc/deoxys5.pal b/graphics/field_effects/palettes/deoxys_rock_5.pal
index 25a62aae6..25a62aae6 100644
--- a/graphics/misc/deoxys5.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_5.pal
diff --git a/graphics/misc/deoxys6.pal b/graphics/field_effects/palettes/deoxys_rock_6.pal
index 0f636873e..0f636873e 100644
--- a/graphics/misc/deoxys6.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_6.pal
diff --git a/graphics/misc/deoxys7.pal b/graphics/field_effects/palettes/deoxys_rock_7.pal
index 2dba57eef..2dba57eef 100644
--- a/graphics/misc/deoxys7.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_7.pal
diff --git a/graphics/misc/deoxys8.pal b/graphics/field_effects/palettes/deoxys_rock_8.pal
index d46c26996..d46c26996 100644
--- a/graphics/misc/deoxys8.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_8.pal
diff --git a/graphics/misc/deoxys9.pal b/graphics/field_effects/palettes/deoxys_rock_9.pal
index f65fee065..f65fee065 100644
--- a/graphics/misc/deoxys9.pal
+++ b/graphics/field_effects/palettes/deoxys_rock_9.pal
diff --git a/graphics/misc/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
index 3f5b8d5c3..3f5b8d5c3 100644
--- a/graphics/misc/deoxys_rock_fragment_bottom_left.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
diff --git a/graphics/misc/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
index 7684451e4..7684451e4 100644
--- a/graphics/misc/deoxys_rock_fragment_bottom_right.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
diff --git a/graphics/misc/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
index d601cb6e5..d601cb6e5 100644
--- a/graphics/misc/deoxys_rock_fragment_top_left.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
diff --git a/graphics/misc/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
index 01f10cd07..01f10cd07 100644
--- a/graphics/misc/deoxys_rock_fragment_top_right.png
+++ b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
diff --git a/graphics/misc/emotion_exclamation.png b/graphics/field_effects/pics/emotion_exclamation.png
index 595566d2f..595566d2f 100644
--- a/graphics/misc/emotion_exclamation.png
+++ b/graphics/field_effects/pics/emotion_exclamation.png
diff --git a/graphics/misc/emotion_heart.png b/graphics/field_effects/pics/emotion_heart.png
index 9995984b4..9995984b4 100644
--- a/graphics/misc/emotion_heart.png
+++ b/graphics/field_effects/pics/emotion_heart.png
diff --git a/graphics/misc/emotion_question.png b/graphics/field_effects/pics/emotion_question.png
index 7376fd058..7376fd058 100644
--- a/graphics/misc/emotion_question.png
+++ b/graphics/field_effects/pics/emotion_question.png
diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/field_effects/pics/field_move_streaks.bin
index 466f456be..466f456be 100644
--- a/graphics/misc/field_move_streaks_map.bin
+++ b/graphics/field_effects/pics/field_move_streaks.bin
diff --git a/graphics/misc/field_move_streaks.png b/graphics/field_effects/pics/field_move_streaks.png
index 8becc4413..8becc4413 100644
--- a/graphics/misc/field_move_streaks.png
+++ b/graphics/field_effects/pics/field_move_streaks.png
diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/field_effects/pics/field_move_streaks_indoors.bin
index f7c2f2142..f7c2f2142 100644
--- a/graphics/misc/darkness_field_move_streaks_map.bin
+++ b/graphics/field_effects/pics/field_move_streaks_indoors.bin
diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/field_effects/pics/field_move_streaks_indoors.png
index 825d695eb..825d695eb 100644
--- a/graphics/misc/darkness_field_move_streaks.png
+++ b/graphics/field_effects/pics/field_move_streaks_indoors.png
diff --git a/graphics/misc/hof_monitor_big.png b/graphics/field_effects/pics/hof_monitor_big.png
index 510e6a232..510e6a232 100644
--- a/graphics/misc/hof_monitor_big.png
+++ b/graphics/field_effects/pics/hof_monitor_big.png
diff --git a/graphics/misc/hof_monitor_small.png b/graphics/field_effects/pics/hof_monitor_small.png
index dcff33095..dcff33095 100644
--- a/graphics/misc/hof_monitor_small.png
+++ b/graphics/field_effects/pics/hof_monitor_small.png
diff --git a/graphics/misc/pokeball_glow.png b/graphics/field_effects/pics/pokeball_glow.png
index 1c1133b76..1c1133b76 100644
--- a/graphics/misc/pokeball_glow.png
+++ b/graphics/field_effects/pics/pokeball_glow.png
diff --git a/graphics/misc/pokecenter_monitor/0.png b/graphics/field_effects/pics/pokecenter_monitor/0.png
index 474883908..474883908 100644
--- a/graphics/misc/pokecenter_monitor/0.png
+++ b/graphics/field_effects/pics/pokecenter_monitor/0.png
diff --git a/graphics/misc/pokecenter_monitor/1.png b/graphics/field_effects/pics/pokecenter_monitor/1.png
index 1a2606011..1a2606011 100644
--- a/graphics/misc/pokecenter_monitor/1.png
+++ b/graphics/field_effects/pics/pokecenter_monitor/1.png
diff --git a/graphics/misc/spotlight.png b/graphics/field_effects/pics/spotlight.png
index 62e21e411..62e21e411 100644
--- a/graphics/misc/spotlight.png
+++ b/graphics/field_effects/pics/spotlight.png
diff --git a/graphics/misc/main_menu_bg.pal b/graphics/interface/main_menu_bg.pal
index 7aca54c52..7aca54c52 100644
--- a/graphics/misc/main_menu_bg.pal
+++ b/graphics/interface/main_menu_bg.pal
diff --git a/graphics/misc/main_menu_text.pal b/graphics/interface/main_menu_text.pal
index 25a3ac1d2..25a3ac1d2 100644
--- a/graphics/misc/main_menu_text.pal
+++ b/graphics/interface/main_menu_text.pal
diff --git a/graphics/misc/option_menu_equals_sign.png b/graphics/interface/option_menu_equals_sign.png
index 7e56e3cc3..7e56e3cc3 100644
--- a/graphics/misc/option_menu_equals_sign.png
+++ b/graphics/interface/option_menu_equals_sign.png
diff --git a/graphics/misc/option_menu_text.pal b/graphics/interface/option_menu_text.pal
index e7d6c330a..e7d6c330a 100644
--- a/graphics/misc/option_menu_text.pal
+++ b/graphics/interface/option_menu_text.pal
diff --git a/graphics/misc/rotating_gate_1.png b/graphics/rotating_gates/l1.png
index 93680dbfb..93680dbfb 100644
--- a/graphics/misc/rotating_gate_1.png
+++ b/graphics/rotating_gates/l1.png
diff --git a/graphics/misc/rotating_gate_2.png b/graphics/rotating_gates/l2.png
index 1d320ed77..1d320ed77 100644
--- a/graphics/misc/rotating_gate_2.png
+++ b/graphics/rotating_gates/l2.png
diff --git a/graphics/misc/rotating_gate_3.png b/graphics/rotating_gates/l3.png
index 6e43079d0..6e43079d0 100644
--- a/graphics/misc/rotating_gate_3.png
+++ b/graphics/rotating_gates/l3.png
diff --git a/graphics/misc/rotating_gate_4.png b/graphics/rotating_gates/l4.png
index 77c269dc5..77c269dc5 100644
--- a/graphics/misc/rotating_gate_4.png
+++ b/graphics/rotating_gates/l4.png
diff --git a/graphics/misc/rotating_gate_5.png b/graphics/rotating_gates/t1.png
index d8a0889b1..d8a0889b1 100644
--- a/graphics/misc/rotating_gate_5.png
+++ b/graphics/rotating_gates/t1.png
diff --git a/graphics/misc/rotating_gate_6.png b/graphics/rotating_gates/t2.png
index 668feebfb..668feebfb 100644
--- a/graphics/misc/rotating_gate_6.png
+++ b/graphics/rotating_gates/t2.png
diff --git a/graphics/misc/rotating_gate_7.png b/graphics/rotating_gates/t3.png
index d92ae872c..d92ae872c 100644
--- a/graphics/misc/rotating_gate_7.png
+++ b/graphics/rotating_gates/t3.png
diff --git a/graphics/misc/rotating_gate_8.png b/graphics/rotating_gates/t4.png
index 5e3a947c5..5e3a947c5 100644
--- a/graphics/misc/rotating_gate_8.png
+++ b/graphics/rotating_gates/t4.png
diff --git a/graphics/misc/trainer_hill_ereader.pal b/graphics/trainer_hill/ereader.pal
index 4b0812f09..4b0812f09 100644
--- a/graphics/misc/trainer_hill_ereader.pal
+++ b/graphics/trainer_hill/ereader.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index cb12b9c18..9e5c19193 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -502,7 +502,7 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
                                          $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
 	@cat $^ >$@
 
-$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
+graphics/birch_speech/unused_beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 822
 
 
diff --git a/src/decoration.c b/src/decoration.c
index 118b4918e..c5a05f7cc 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -440,7 +440,7 @@ static const struct YesNoFuncTable sStopPuttingAwayDecorationsYesNoFunctions =
     .noFunc = ContinuePuttingAwayDecorations,
 };
 
-static const u8 sDecorationPuttingAwayCursor[] = INCBIN_U8("graphics/misc/decoration_putting_away_cursor.4bpp");
+static const u8 sDecorationPuttingAwayCursor[] = INCBIN_U8("graphics/decorations/put_away_cursor.4bpp");
 
 static const struct SpritePalette sSpritePal_PuttingAwayCursorBrendan =
 {
diff --git a/src/diploma.c b/src/diploma.c
index 76b4ae65c..ce31578dc 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -40,12 +40,12 @@ static void VBlankCB(void)
 
 static const u16 sDiplomaPalettes[][16] =
 {
-    INCBIN_U16("graphics/misc/diploma_national.gbapal"),
-    INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"),
+    INCBIN_U16("graphics/diploma/national.gbapal"),
+    INCBIN_U16("graphics/diploma/hoenn.gbapal"),
 };
 
-static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/misc/diploma_map.bin.lz");
-static const u32 sDiplomaTiles[] = INCBIN_U32("graphics/misc/diploma.4bpp.lz");
+static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/tilemap.bin.lz");
+static const u32 sDiplomaTiles[] = INCBIN_U32("graphics/diploma/tiles.4bpp.lz");
 
 void CB2_ShowDiploma(void)
 {
diff --git a/src/field_effect.c b/src/field_effect.c
index 3f0ba2455..446d3cc27 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -243,32 +243,33 @@ extern u8 *gFieldEffectScriptPointers[];
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
 static const u32 sNewGameBirch_Gfx[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
-static const u32 sUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
+static const u32 sUnusedBirchBeauty[] = INCBIN_U32("graphics/birch_speech/unused_beauty.4bpp");
 static const u16 sNewGameBirch_Pal[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
-static const u32 sPokeballGlow_Gfx[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
+
+static const u32 sPokeballGlow_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokeball_glow.4bpp");
 static const u16 sPokeballGlow_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/pokeball_glow.gbapal");
-static const u32 sPokecenterMonitor0_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
-static const u32 sPokecenterMonitor1_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
-static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/misc/hof_monitor_big.4bpp");
-static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/misc/hof_monitor_small.4bpp");
+static const u32 sPokecenterMonitor0_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokecenter_monitor/0.4bpp");
+static const u32 sPokecenterMonitor1_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokecenter_monitor/1.4bpp");
+static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/field_effects/pics/hof_monitor_big.4bpp");
+static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/field_effects/pics/hof_monitor_small.4bpp");
 static const u16 sHofMonitor_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/hof_monitor.gbapal");
 
 // Graphics for the lights streaking past your Pokemon when it uses a field move.
-static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
-static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
-static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
+static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/field_effects/pics/field_move_streaks.4bpp");
+static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.gbapal");
+static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.bin");
 
 // The following light streaks effect is used when the map is indoors
-static const u32 sFieldMoveStreaksIndoors_Gfx[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
-static const u16 sFieldMoveStreaksIndoors_Pal[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
-static const u16 sFieldMoveStreaksIndoors_Tilemap[320] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
-
-static const u16 sSpotlight_Pal[16] = INCBIN_U16("graphics/misc/spotlight.gbapal");
-static const u8 sSpotlight_Gfx[] = INCBIN_U8("graphics/misc/spotlight.4bpp");
-static const u8 sRockFragment_TopLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_left.4bpp");
-static const u8 sRockFragment_TopRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_right.4bpp");
-static const u8 sRockFragment_BottomLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_left.4bpp");
-static const u8 sRockFragment_BottomRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_right.4bpp");
+static const u32 sFieldMoveStreaksIndoors_Gfx[] = INCBIN_U32("graphics/field_effects/pics/field_move_streaks_indoors.4bpp");
+static const u16 sFieldMoveStreaksIndoors_Pal[16] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks_indoors.gbapal");
+static const u16 sFieldMoveStreaksIndoors_Tilemap[320] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks_indoors.bin");
+
+static const u16 sSpotlight_Pal[16] = INCBIN_U16("graphics/field_effects/pics/spotlight.gbapal");
+static const u8 sSpotlight_Gfx[] = INCBIN_U8("graphics/field_effects/pics/spotlight.4bpp");
+static const u8 sRockFragment_TopLeft[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_top_left.4bpp");
+static const u8 sRockFragment_TopRight[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_top_right.4bpp");
+static const u8 sRockFragment_BottomLeft[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.4bpp");
+static const u8 sRockFragment_BottomRight[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.4bpp");
 
 bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
 {
diff --git a/src/field_specials.c b/src/field_specials.c
index 0a7236913..45585bcd3 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3194,17 +3194,17 @@ void DoDeoxysRockInteraction(void)
 }
 
 static const u16 sDeoxysRockPalettes[][16] = {
-    INCBIN_U16("graphics/misc/deoxys1.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys2.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys3.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys4.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys5.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys6.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys7.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys8.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys9.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys10.gbapal"),
-    INCBIN_U16("graphics/misc/deoxys11.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_1.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_2.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_3.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_4.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_5.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_6.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_7.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_8.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_9.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_10.gbapal"),
+    INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_11.gbapal"),
 };
 
 static const u8 sDeoxysRockCoords[][2] = {
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 9c166d008..a303b8423 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -61,13 +61,13 @@ static const struct FlashStruct sTransitionTypes[] =
     {},
 };
 
-static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/misc/cave_transition_white.gbapal");
-static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/misc/cave_transition_black.gbapal");
+static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_transition/white.gbapal");
+static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal");
 
-static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/misc/cave_transition_enter.gbapal");
-static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/misc/cave_transition_exit.gbapal");
-static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/misc/cave_transition_map.bin.lz");
-static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/misc/cave_transition.4bpp.lz");
+static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal");
+static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal");
+static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz");
+static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.lz");
 
 bool8 SetUpFieldMove_Flash(void)
 {
diff --git a/src/main_menu.c b/src/main_menu.c
index e7802b1e7..54a4f6891 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -403,8 +403,8 @@ static const struct WindowTemplate gNewGameBirchSpeechTextWindows[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const u16 sMainMenuBgPal[] = INCBIN_U16("graphics/misc/main_menu_bg.gbapal");
-static const u16 sMainMenuTextPal[] = INCBIN_U16("graphics/misc/main_menu_text.gbapal");
+static const u16 sMainMenuBgPal[] = INCBIN_U16("graphics/interface/main_menu_bg.gbapal");
+static const u16 sMainMenuTextPal[] = INCBIN_U16("graphics/interface/main_menu_text.gbapal");
 
 static const u8 sTextColor_Headers[] = {TEXT_DYNAMIC_COLOR_1, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3};
 static const u8 sTextColor_MenuInfo[] = {TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_3};
diff --git a/src/option_menu.c b/src/option_menu.c
index e66bddd7f..2991913d7 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -79,9 +79,9 @@ static void DrawBgWindowFrames(void);
 
 EWRAM_DATA static bool8 sArrowPressed = FALSE;
 
-static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
+static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/interface/option_menu_text.gbapal");
 // note: this is only used in the Japanese release
-static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
+static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/interface/option_menu_equals_sign.4bpp");
 
 static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
 {
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 23fbb3e1d..78ffcabc9 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -219,14 +219,14 @@ static const struct RotatingGatePuzzle sRotatingGate_TrickHousePuzzleConfig[] =
     {10, 19, GATE_SHAPE_L3, GATE_ORIENTATION_180},
 };
 
-static const u8 sRotatingGateTiles_1[] = INCBIN_U8("graphics/misc/rotating_gate_1.4bpp");
-static const u8 sRotatingGateTiles_2[] = INCBIN_U8("graphics/misc/rotating_gate_2.4bpp");
-static const u8 sRotatingGateTiles_3[] = INCBIN_U8("graphics/misc/rotating_gate_3.4bpp");
-static const u8 sRotatingGateTiles_4[] = INCBIN_U8("graphics/misc/rotating_gate_4.4bpp");
-static const u8 sRotatingGateTiles_5[] = INCBIN_U8("graphics/misc/rotating_gate_5.4bpp");
-static const u8 sRotatingGateTiles_6[] = INCBIN_U8("graphics/misc/rotating_gate_6.4bpp");
-static const u8 sRotatingGateTiles_7[] = INCBIN_U8("graphics/misc/rotating_gate_7.4bpp");
-static const u8 sRotatingGateTiles_8[] = INCBIN_U8("graphics/misc/rotating_gate_8.4bpp");
+static const u8 sRotatingGateTiles_1[] = INCBIN_U8("graphics/rotating_gates/l1.4bpp");
+static const u8 sRotatingGateTiles_2[] = INCBIN_U8("graphics/rotating_gates/l2.4bpp");
+static const u8 sRotatingGateTiles_3[] = INCBIN_U8("graphics/rotating_gates/l3.4bpp");
+static const u8 sRotatingGateTiles_4[] = INCBIN_U8("graphics/rotating_gates/l4.4bpp");
+static const u8 sRotatingGateTiles_5[] = INCBIN_U8("graphics/rotating_gates/t1.4bpp");
+static const u8 sRotatingGateTiles_6[] = INCBIN_U8("graphics/rotating_gates/t2.4bpp");
+static const u8 sRotatingGateTiles_7[] = INCBIN_U8("graphics/rotating_gates/t3.4bpp");
+static const u8 sRotatingGateTiles_8[] = INCBIN_U8("graphics/rotating_gates/t4.4bpp");
 
 static const struct OamData sOamData_RotatingGateLarge =
 {
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 3ada262e5..8d5be0116 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -199,7 +199,7 @@ static const u16 *const *const sPrizeListSets[] =
     sPrizeLists2
 };
 
-static const u16 sEReader_Pal[] = INCBIN_U16("graphics/misc/trainer_hill_ereader.gbapal");
+static const u16 sEReader_Pal[] = INCBIN_U16("graphics/trainer_hill/ereader.gbapal");
 static const u8 sRecordWinColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
 
 static const struct TrHillTag *const sDataPerTag[] =
diff --git a/src/trainer_see.c b/src/trainer_see.c
index ce06c5e9c..07021a316 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -59,9 +59,9 @@ bool8 gTrainerApproachedPlayer;
 EWRAM_DATA u8 gApproachingTrainerId = 0;
 
 // const rom data
-static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
-static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
-static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
+static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_exclamation.4bpp");
+static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_question.4bpp");
+static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_heart.4bpp");
 
 static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) =
 {