move pokemon graphics to mon-specific directories

1 files changed, 2408 insertions, 2408 deletions

diff --git a/data/graphics.s b/data/graphics.s
index ff9ed3d7e..804d42745 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -19,11 +19,11 @@ gUnknown_8D0098C:: @ 8D0098C
 
 	.align 2
 gFile_graphics_pokemon_palettes_circled_question_mark_palette:: @ 8D00BD0
-	.incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/circled/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_circled_question_mark_shiny_palette:: @ 8D00BE8
-	.incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/circled/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00
@@ -2590,9625 +2590,9625 @@ gUnknown_8D2FBB4:: @ 8D2FBB4
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bulbasaur_still_front_pic:: @ 8D2FBD4
-	.incbin "graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bulbasaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bulbasaur_palette:: @ 8D2FE78
-	.incbin "graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bulbasaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bulbasaur_back_pic:: @ 8D2FEA0
-	.incbin "graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bulbasaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bulbasaur_shiny_palette:: @ 8D30164
-	.incbin "graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bulbasaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bulbasaur_icon:: @ 8D3018C
-	.incbin "graphics/pokemon/icons/bulbasaur_icon.4bpp"
+	.incbin "graphics/pokemon/bulbasaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bulbasaur_footprint:: @ 8D3058C
-	.incbin "graphics/pokemon/footprints/bulbasaur_footprint.1bpp"
+	.incbin "graphics/pokemon/bulbasaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ivysaur_still_front_pic:: @ 8D305AC
-	.incbin "graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ivysaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ivysaur_palette:: @ 8D308E8
-	.incbin "graphics/pokemon/palettes/ivysaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ivysaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ivysaur_back_pic:: @ 8D30910
-	.incbin "graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ivysaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ivysaur_shiny_palette:: @ 8D30C64
-	.incbin "graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ivysaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ivysaur_icon:: @ 8D30C8C
-	.incbin "graphics/pokemon/icons/ivysaur_icon.4bpp"
+	.incbin "graphics/pokemon/ivysaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ivysaur_footprint:: @ 8D3108C
-	.incbin "graphics/pokemon/footprints/ivysaur_footprint.1bpp"
+	.incbin "graphics/pokemon/ivysaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venusaur_still_front_pic:: @ 8D310AC
-	.incbin "graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venusaur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venusaur_palette:: @ 8D315EC
-	.incbin "graphics/pokemon/palettes/venusaur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venusaur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venusaur_back_pic:: @ 8D31614
-	.incbin "graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venusaur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venusaur_shiny_palette:: @ 8D31ADC
-	.incbin "graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venusaur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venusaur_icon:: @ 8D31B04
-	.incbin "graphics/pokemon/icons/venusaur_icon.4bpp"
+	.incbin "graphics/pokemon/venusaur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venusaur_footprint:: @ 8D31F04
-	.incbin "graphics/pokemon/footprints/venusaur_footprint.1bpp"
+	.incbin "graphics/pokemon/venusaur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charmander_still_front_pic:: @ 8D31F24
-	.incbin "graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmander/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmander_palette:: @ 8D321C4
-	.incbin "graphics/pokemon/palettes/charmander_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmander/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charmander_back_pic:: @ 8D321EC
-	.incbin "graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmander/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmander_shiny_palette:: @ 8D32470
-	.incbin "graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmander/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charmander_icon:: @ 8D32498
-	.incbin "graphics/pokemon/icons/charmander_icon.4bpp"
+	.incbin "graphics/pokemon/charmander/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charmander_footprint:: @ 8D32898
-	.incbin "graphics/pokemon/footprints/charmander_footprint.1bpp"
+	.incbin "graphics/pokemon/charmander/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charmeleon_still_front_pic:: @ 8D328B8
-	.incbin "graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmeleon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmeleon_palette:: @ 8D32C64
-	.incbin "graphics/pokemon/palettes/charmeleon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmeleon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charmeleon_back_pic:: @ 8D32C8C
-	.incbin "graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charmeleon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charmeleon_shiny_palette:: @ 8D32F80
-	.incbin "graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charmeleon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charmeleon_icon:: @ 8D32FA8
-	.incbin "graphics/pokemon/icons/charmeleon_icon.4bpp"
+	.incbin "graphics/pokemon/charmeleon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charmeleon_footprint:: @ 8D333A8
-	.incbin "graphics/pokemon/footprints/charmeleon_footprint.1bpp"
+	.incbin "graphics/pokemon/charmeleon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_charizard_still_front_pic:: @ 8D333C8
-	.incbin "graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charizard/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charizard_palette:: @ 8D338C4
-	.incbin "graphics/pokemon/palettes/charizard_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charizard/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_charizard_back_pic:: @ 8D338EC
-	.incbin "graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/charizard/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_charizard_shiny_palette:: @ 8D33CF8
-	.incbin "graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/charizard/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_charizard_icon:: @ 8D33D20
-	.incbin "graphics/pokemon/icons/charizard_icon.4bpp"
+	.incbin "graphics/pokemon/charizard/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_charizard_footprint:: @ 8D34120
-	.incbin "graphics/pokemon/footprints/charizard_footprint.1bpp"
+	.incbin "graphics/pokemon/charizard/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_squirtle_still_front_pic:: @ 8D34140
-	.incbin "graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/squirtle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_squirtle_palette:: @ 8D343DC
-	.incbin "graphics/pokemon/palettes/squirtle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/squirtle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_squirtle_back_pic:: @ 8D34404
-	.incbin "graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/squirtle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_squirtle_shiny_palette:: @ 8D3468C
-	.incbin "graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/squirtle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_squirtle_icon:: @ 8D346B4
-	.incbin "graphics/pokemon/icons/squirtle_icon.4bpp"
+	.incbin "graphics/pokemon/squirtle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_squirtle_footprint:: @ 8D34AB4
-	.incbin "graphics/pokemon/footprints/squirtle_footprint.1bpp"
+	.incbin "graphics/pokemon/squirtle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wartortle_still_front_pic:: @ 8D34AD4
-	.incbin "graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wartortle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wartortle_palette:: @ 8D34E80
-	.incbin "graphics/pokemon/palettes/wartortle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wartortle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wartortle_back_pic:: @ 8D34EA8
-	.incbin "graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wartortle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wartortle_shiny_palette:: @ 8D351F0
-	.incbin "graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wartortle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wartortle_icon:: @ 8D35218
-	.incbin "graphics/pokemon/icons/wartortle_icon.4bpp"
+	.incbin "graphics/pokemon/wartortle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wartortle_footprint:: @ 8D35618
-	.incbin "graphics/pokemon/footprints/wartortle_footprint.1bpp"
+	.incbin "graphics/pokemon/wartortle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blastoise_still_front_pic:: @ 8D35638
-	.incbin "graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blastoise/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blastoise_palette:: @ 8D35B3C
-	.incbin "graphics/pokemon/palettes/blastoise_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blastoise/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blastoise_back_pic:: @ 8D35B64
-	.incbin "graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blastoise/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blastoise_shiny_palette:: @ 8D35F78
-	.incbin "graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blastoise/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blastoise_icon:: @ 8D35FA0
-	.incbin "graphics/pokemon/icons/blastoise_icon.4bpp"
+	.incbin "graphics/pokemon/blastoise/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blastoise_footprint:: @ 8D363A0
-	.incbin "graphics/pokemon/footprints/blastoise_footprint.1bpp"
+	.incbin "graphics/pokemon/blastoise/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_caterpie_still_front_pic:: @ 8D363C0
-	.incbin "graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/caterpie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_caterpie_palette:: @ 8D36618
-	.incbin "graphics/pokemon/palettes/caterpie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/caterpie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_caterpie_back_pic:: @ 8D36640
-	.incbin "graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/caterpie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_caterpie_shiny_palette:: @ 8D368C8
-	.incbin "graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/caterpie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_caterpie_icon:: @ 8D368F0
-	.incbin "graphics/pokemon/icons/caterpie_icon.4bpp"
+	.incbin "graphics/pokemon/caterpie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_caterpie_footprint:: @ 8D36CF0
-	.incbin "graphics/pokemon/footprints/caterpie_footprint.1bpp"
+	.incbin "graphics/pokemon/caterpie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metapod_still_front_pic:: @ 8D36D10
-	.incbin "graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metapod/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metapod_palette:: @ 8D36F2C
-	.incbin "graphics/pokemon/palettes/metapod_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metapod/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metapod_back_pic:: @ 8D36F4C
-	.incbin "graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metapod/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metapod_shiny_palette:: @ 8D37168
-	.incbin "graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metapod/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metapod_icon:: @ 8D37188
-	.incbin "graphics/pokemon/icons/metapod_icon.4bpp"
+	.incbin "graphics/pokemon/metapod/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metapod_footprint:: @ 8D37588
-	.incbin "graphics/pokemon/footprints/metapod_footprint.1bpp"
+	.incbin "graphics/pokemon/metapod/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_butterfree_still_front_pic:: @ 8D375A8
-	.incbin "graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/butterfree/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_butterfree_palette:: @ 8D37920
-	.incbin "graphics/pokemon/palettes/butterfree_palette.gbapal.lz"
+	.incbin "graphics/pokemon/butterfree/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_butterfree_back_pic:: @ 8D37948
-	.incbin "graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/butterfree/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_butterfree_shiny_palette:: @ 8D37D4C
-	.incbin "graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/butterfree/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_butterfree_icon:: @ 8D37D74
-	.incbin "graphics/pokemon/icons/butterfree_icon.4bpp"
+	.incbin "graphics/pokemon/butterfree/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_butterfree_footprint:: @ 8D38174
-	.incbin "graphics/pokemon/footprints/butterfree_footprint.1bpp"
+	.incbin "graphics/pokemon/butterfree/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weedle_still_front_pic:: @ 8D38194
-	.incbin "graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weedle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weedle_palette:: @ 8D383D0
-	.incbin "graphics/pokemon/palettes/weedle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weedle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weedle_back_pic:: @ 8D383F8
-	.incbin "graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weedle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weedle_shiny_palette:: @ 8D38660
-	.incbin "graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weedle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weedle_icon:: @ 8D38688
-	.incbin "graphics/pokemon/icons/weedle_icon.4bpp"
+	.incbin "graphics/pokemon/weedle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weedle_footprint:: @ 8D38A88
-	.incbin "graphics/pokemon/footprints/weedle_footprint.1bpp"
+	.incbin "graphics/pokemon/weedle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kakuna_still_front_pic:: @ 8D38AA8
-	.incbin "graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kakuna/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kakuna_palette:: @ 8D38CE8
-	.incbin "graphics/pokemon/palettes/kakuna_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kakuna/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kakuna_back_pic:: @ 8D38D0C
-	.incbin "graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kakuna/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kakuna_shiny_palette:: @ 8D38F90
-	.incbin "graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kakuna/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kakuna_icon:: @ 8D38FB4
-	.incbin "graphics/pokemon/icons/kakuna_icon.4bpp"
+	.incbin "graphics/pokemon/kakuna/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kakuna_footprint:: @ 8D393B4
-	.incbin "graphics/pokemon/footprints/kakuna_footprint.1bpp"
+	.incbin "graphics/pokemon/kakuna/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beedrill_still_front_pic:: @ 8D393D4
-	.incbin "graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beedrill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beedrill_palette:: @ 8D397F4
-	.incbin "graphics/pokemon/palettes/beedrill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beedrill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beedrill_back_pic:: @ 8D3981C
-	.incbin "graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beedrill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beedrill_shiny_palette:: @ 8D39B90
-	.incbin "graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beedrill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beedrill_icon:: @ 8D39BB8
-	.incbin "graphics/pokemon/icons/beedrill_icon.4bpp"
+	.incbin "graphics/pokemon/beedrill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beedrill_footprint:: @ 8D39FB8
-	.incbin "graphics/pokemon/footprints/beedrill_footprint.1bpp"
+	.incbin "graphics/pokemon/beedrill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgey_still_front_pic:: @ 8D39FD8
-	.incbin "graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgey_palette:: @ 8D3A250
-	.incbin "graphics/pokemon/palettes/pidgey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgey_back_pic:: @ 8D3A278
-	.incbin "graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgey_shiny_palette:: @ 8D3A5CC
-	.incbin "graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgey_icon:: @ 8D3A5F4
-	.incbin "graphics/pokemon/icons/pidgey_icon.4bpp"
+	.incbin "graphics/pokemon/pidgey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgey_footprint:: @ 8D3A9F4
-	.incbin "graphics/pokemon/footprints/pidgey_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgeotto_still_front_pic:: @ 8D3AA14
-	.incbin "graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeotto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeotto_palette:: @ 8D3ADAC
-	.incbin "graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeotto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgeotto_back_pic:: @ 8D3ADD4
-	.incbin "graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeotto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeotto_shiny_palette:: @ 8D3B120
-	.incbin "graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeotto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgeotto_icon:: @ 8D3B148
-	.incbin "graphics/pokemon/icons/pidgeotto_icon.4bpp"
+	.incbin "graphics/pokemon/pidgeotto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgeotto_footprint:: @ 8D3B548
-	.incbin "graphics/pokemon/footprints/pidgeotto_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgeotto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pidgeot_still_front_pic:: @ 8D3B568
-	.incbin "graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeot_palette:: @ 8D3BA54
-	.incbin "graphics/pokemon/palettes/pidgeot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pidgeot_back_pic:: @ 8D3BA7C
-	.incbin "graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pidgeot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pidgeot_shiny_palette:: @ 8D3BE64
-	.incbin "graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pidgeot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pidgeot_icon:: @ 8D3BE8C
-	.incbin "graphics/pokemon/icons/pidgeot_icon.4bpp"
+	.incbin "graphics/pokemon/pidgeot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pidgeot_footprint:: @ 8D3C28C
-	.incbin "graphics/pokemon/footprints/pidgeot_footprint.1bpp"
+	.incbin "graphics/pokemon/pidgeot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rattata_still_front_pic:: @ 8D3C2AC
-	.incbin "graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rattata/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rattata_palette:: @ 8D3C504
-	.incbin "graphics/pokemon/palettes/rattata_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rattata/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rattata_back_pic:: @ 8D3C52C
-	.incbin "graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rattata/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rattata_shiny_palette:: @ 8D3C7E4
-	.incbin "graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rattata/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rattata_icon:: @ 8D3C80C
-	.incbin "graphics/pokemon/icons/rattata_icon.4bpp"
+	.incbin "graphics/pokemon/rattata/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rattata_footprint:: @ 8D3CC0C
-	.incbin "graphics/pokemon/footprints/rattata_footprint.1bpp"
+	.incbin "graphics/pokemon/rattata/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raticate_still_front_pic:: @ 8D3CC2C
-	.incbin "graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raticate/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raticate_palette:: @ 8D3CFBC
-	.incbin "graphics/pokemon/palettes/raticate_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raticate/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raticate_back_pic:: @ 8D3CFE4
-	.incbin "graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raticate/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raticate_shiny_palette:: @ 8D3D2F4
-	.incbin "graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raticate/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raticate_icon:: @ 8D3D31C
-	.incbin "graphics/pokemon/icons/raticate_icon.4bpp"
+	.incbin "graphics/pokemon/raticate/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raticate_footprint:: @ 8D3D71C
-	.incbin "graphics/pokemon/footprints/raticate_footprint.1bpp"
+	.incbin "graphics/pokemon/raticate/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spearow_still_front_pic:: @ 8D3D73C
-	.incbin "graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spearow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spearow_palette:: @ 8D3D9FC
-	.incbin "graphics/pokemon/palettes/spearow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spearow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spearow_back_pic:: @ 8D3DA24
-	.incbin "graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spearow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spearow_shiny_palette:: @ 8D3DD00
-	.incbin "graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spearow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spearow_icon:: @ 8D3DD28
-	.incbin "graphics/pokemon/icons/spearow_icon.4bpp"
+	.incbin "graphics/pokemon/spearow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spearow_footprint:: @ 8D3E128
-	.incbin "graphics/pokemon/footprints/spearow_footprint.1bpp"
+	.incbin "graphics/pokemon/spearow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_fearow_still_front_pic:: @ 8D3E148
-	.incbin "graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/fearow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_fearow_palette:: @ 8D3E604
-	.incbin "graphics/pokemon/palettes/fearow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/fearow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_fearow_back_pic:: @ 8D3E62C
-	.incbin "graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/fearow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_fearow_shiny_palette:: @ 8D3E924
-	.incbin "graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/fearow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_fearow_icon:: @ 8D3E94C
-	.incbin "graphics/pokemon/icons/fearow_icon.4bpp"
+	.incbin "graphics/pokemon/fearow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_fearow_footprint:: @ 8D3ED4C
-	.incbin "graphics/pokemon/footprints/fearow_footprint.1bpp"
+	.incbin "graphics/pokemon/fearow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ekans_still_front_pic:: @ 8D3ED6C
-	.incbin "graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ekans/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ekans_palette:: @ 8D3F034
-	.incbin "graphics/pokemon/palettes/ekans_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ekans/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ekans_back_pic:: @ 8D3F05C
-	.incbin "graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ekans/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ekans_shiny_palette:: @ 8D3F34C
-	.incbin "graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ekans/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ekans_icon:: @ 8D3F374
-	.incbin "graphics/pokemon/icons/ekans_icon.4bpp"
+	.incbin "graphics/pokemon/ekans/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ekans_footprint:: @ 8D3F774
-	.incbin "graphics/pokemon/footprints/ekans_footprint.1bpp"
+	.incbin "graphics/pokemon/ekans/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_arbok_still_front_pic:: @ 8D3F794
-	.incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arbok/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arbok_palette:: @ 8D3FC08
-	.incbin "graphics/pokemon/palettes/arbok_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arbok/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_arbok_back_pic:: @ 8D3FC30
-	.incbin "graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arbok/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arbok_shiny_palette:: @ 8D3FEB8
-	.incbin "graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arbok/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_arbok_icon:: @ 8D3FEE0
-	.incbin "graphics/pokemon/icons/arbok_icon.4bpp"
+	.incbin "graphics/pokemon/arbok/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_arbok_footprint:: @ 8D402E0
-	.incbin "graphics/pokemon/footprints/arbok_footprint.1bpp"
+	.incbin "graphics/pokemon/arbok/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pikachu_still_front_pic:: @ 8D40300
-	.incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pikachu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pikachu_palette:: @ 8D405D0
-	.incbin "graphics/pokemon/palettes/pikachu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pikachu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pikachu_back_pic:: @ 8D405F8
-	.incbin "graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pikachu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pikachu_shiny_palette:: @ 8D408D0
-	.incbin "graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pikachu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pikachu_icon:: @ 8D408F8
-	.incbin "graphics/pokemon/icons/pikachu_icon.4bpp"
+	.incbin "graphics/pokemon/pikachu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pikachu_footprint:: @ 8D40CF8
-	.incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp"
+	.incbin "graphics/pokemon/pikachu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raichu_still_front_pic:: @ 8D40D18
-	.incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raichu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raichu_palette:: @ 8D41110
-	.incbin "graphics/pokemon/palettes/raichu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raichu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raichu_back_pic:: @ 8D41138
-	.incbin "graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raichu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raichu_shiny_palette:: @ 8D41458
-	.incbin "graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raichu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raichu_icon:: @ 8D41480
-	.incbin "graphics/pokemon/icons/raichu_icon.4bpp"
+	.incbin "graphics/pokemon/raichu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raichu_footprint:: @ 8D41880
-	.incbin "graphics/pokemon/footprints/raichu_footprint.1bpp"
+	.incbin "graphics/pokemon/raichu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sandshrew_still_front_pic:: @ 8D418A0
-	.incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandshrew/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandshrew_palette:: @ 8D41B7C
-	.incbin "graphics/pokemon/palettes/sandshrew_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandshrew/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sandshrew_back_pic:: @ 8D41BA4
-	.incbin "graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandshrew/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandshrew_shiny_palette:: @ 8D41ECC
-	.incbin "graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandshrew/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sandshrew_icon:: @ 8D41EF4
-	.incbin "graphics/pokemon/icons/sandshrew_icon.4bpp"
+	.incbin "graphics/pokemon/sandshrew/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sandshrew_footprint:: @ 8D422F4
-	.incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp"
+	.incbin "graphics/pokemon/sandshrew/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sandslash_still_front_pic:: @ 8D42314
-	.incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandslash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandslash_palette:: @ 8D4272C
-	.incbin "graphics/pokemon/palettes/sandslash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandslash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sandslash_back_pic:: @ 8D42754
-	.incbin "graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sandslash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sandslash_shiny_palette:: @ 8D42B70
-	.incbin "graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sandslash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sandslash_icon:: @ 8D42B98
-	.incbin "graphics/pokemon/icons/sandslash_icon.4bpp"
+	.incbin "graphics/pokemon/sandslash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sandslash_footprint:: @ 8D42F98
-	.incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp"
+	.incbin "graphics/pokemon/sandslash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoran_f_still_front_pic:: @ 8D42FB8
-	.incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_f/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_f_palette:: @ 8D4321C
-	.incbin "graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_f/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoran_f_back_pic:: @ 8D43244
-	.incbin "graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_f/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_f_shiny_palette:: @ 8D43524
-	.incbin "graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_f/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoran_f_icon:: @ 8D4354C
-	.incbin "graphics/pokemon/icons/nidoran_f_icon.4bpp"
+	.incbin "graphics/pokemon/nidoran_f/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoran_f_footprint:: @ 8D4394C
-	.incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoran_f/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidorina_still_front_pic:: @ 8D4396C
-	.incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorina/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorina_palette:: @ 8D43C8C
-	.incbin "graphics/pokemon/palettes/nidorina_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorina/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidorina_back_pic:: @ 8D43CB4
-	.incbin "graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorina/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorina_shiny_palette:: @ 8D44048
-	.incbin "graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorina/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidorina_icon:: @ 8D44070
-	.incbin "graphics/pokemon/icons/nidorina_icon.4bpp"
+	.incbin "graphics/pokemon/nidorina/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidorina_footprint:: @ 8D44470
-	.incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp"
+	.incbin "graphics/pokemon/nidorina/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoqueen_still_front_pic:: @ 8D44490
-	.incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoqueen/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoqueen_palette:: @ 8D448BC
-	.incbin "graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoqueen/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoqueen_back_pic:: @ 8D448E4
-	.incbin "graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoqueen/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoqueen_shiny_palette:: @ 8D44CA8
-	.incbin "graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoqueen/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoqueen_icon:: @ 8D44CD0
-	.incbin "graphics/pokemon/icons/nidoqueen_icon.4bpp"
+	.incbin "graphics/pokemon/nidoqueen/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoqueen_footprint:: @ 8D450D0
-	.incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoqueen/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoran_m_still_front_pic:: @ 8D450F0
-	.incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_m/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_m_palette:: @ 8D4537C
-	.incbin "graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_m/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoran_m_back_pic:: @ 8D453A4
-	.incbin "graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoran_m/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoran_m_shiny_palette:: @ 8D456D8
-	.incbin "graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoran_m/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoran_m_icon:: @ 8D45700
-	.incbin "graphics/pokemon/icons/nidoran_m_icon.4bpp"
+	.incbin "graphics/pokemon/nidoran_m/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoran_m_footprint:: @ 8D45B00
-	.incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoran_m/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidorino_still_front_pic:: @ 8D45B20
-	.incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorino/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorino_palette:: @ 8D45EA4
-	.incbin "graphics/pokemon/palettes/nidorino_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorino/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidorino_back_pic:: @ 8D45ECC
-	.incbin "graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidorino/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidorino_shiny_palette:: @ 8D46288
-	.incbin "graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidorino/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidorino_icon:: @ 8D462B0
-	.incbin "graphics/pokemon/icons/nidorino_icon.4bpp"
+	.incbin "graphics/pokemon/nidorino/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidorino_footprint:: @ 8D466B0
-	.incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp"
+	.incbin "graphics/pokemon/nidorino/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nidoking_still_front_pic:: @ 8D466D0
-	.incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoking_palette:: @ 8D46C0C
-	.incbin "graphics/pokemon/palettes/nidoking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nidoking_back_pic:: @ 8D46C34
-	.incbin "graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nidoking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nidoking_shiny_palette:: @ 8D47070
-	.incbin "graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nidoking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nidoking_icon:: @ 8D47098
-	.incbin "graphics/pokemon/icons/nidoking_icon.4bpp"
+	.incbin "graphics/pokemon/nidoking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nidoking_footprint:: @ 8D47498
-	.incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp"
+	.incbin "graphics/pokemon/nidoking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clefairy_still_front_pic:: @ 8D474B8
-	.incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefairy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefairy_palette:: @ 8D47754
-	.incbin "graphics/pokemon/palettes/clefairy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefairy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clefairy_back_pic:: @ 8D4777C
-	.incbin "graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefairy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefairy_shiny_palette:: @ 8D47A4C
-	.incbin "graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefairy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clefairy_icon:: @ 8D47A74
-	.incbin "graphics/pokemon/icons/clefairy_icon.4bpp"
+	.incbin "graphics/pokemon/clefairy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clefairy_footprint:: @ 8D47E74
-	.incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp"
+	.incbin "graphics/pokemon/clefairy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clefable_still_front_pic:: @ 8D47E94
-	.incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefable/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefable_palette:: @ 8D481D4
-	.incbin "graphics/pokemon/palettes/clefable_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefable/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clefable_back_pic:: @ 8D481FC
-	.incbin "graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clefable/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clefable_shiny_palette:: @ 8D48534
-	.incbin "graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clefable/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clefable_icon:: @ 8D4855C
-	.incbin "graphics/pokemon/icons/clefable_icon.4bpp"
+	.incbin "graphics/pokemon/clefable/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clefable_footprint:: @ 8D4895C
-	.incbin "graphics/pokemon/footprints/clefable_footprint.1bpp"
+	.incbin "graphics/pokemon/clefable/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vulpix_still_front_pic:: @ 8D4897C
-	.incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vulpix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vulpix_palette:: @ 8D48CA8
-	.incbin "graphics/pokemon/palettes/vulpix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vulpix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vulpix_back_pic:: @ 8D48CD0
-	.incbin "graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vulpix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vulpix_shiny_palette:: @ 8D48FD4
-	.incbin "graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vulpix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vulpix_icon:: @ 8D48FFC
-	.incbin "graphics/pokemon/icons/vulpix_icon.4bpp"
+	.incbin "graphics/pokemon/vulpix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vulpix_footprint:: @ 8D493FC
-	.incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp"
+	.incbin "graphics/pokemon/vulpix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ninetales_still_front_pic:: @ 8D4941C
-	.incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninetales/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninetales_palette:: @ 8D49870
-	.incbin "graphics/pokemon/palettes/ninetales_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninetales/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ninetales_back_pic:: @ 8D49894
-	.incbin "graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninetales/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninetales_shiny_palette:: @ 8D49C84
-	.incbin "graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninetales/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ninetales_icon:: @ 8D49CA8
-	.incbin "graphics/pokemon/icons/ninetales_icon.4bpp"
+	.incbin "graphics/pokemon/ninetales/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ninetales_footprint:: @ 8D4A0A8
-	.incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp"
+	.incbin "graphics/pokemon/ninetales/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jigglypuff_still_front_pic:: @ 8D4A0C8
-	.incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jigglypuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jigglypuff_palette:: @ 8D4A34C
-	.incbin "graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jigglypuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jigglypuff_back_pic:: @ 8D4A374
-	.incbin "graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jigglypuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jigglypuff_shiny_palette:: @ 8D4A5D0
-	.incbin "graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jigglypuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jigglypuff_icon:: @ 8D4A5F8
-	.incbin "graphics/pokemon/icons/jigglypuff_icon.4bpp"
+	.incbin "graphics/pokemon/jigglypuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jigglypuff_footprint:: @ 8D4A9F8
-	.incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp"
+	.incbin "graphics/pokemon/jigglypuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wigglytuff_still_front_pic:: @ 8D4AA18
-	.incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wigglytuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wigglytuff_palette:: @ 8D4AD8C
-	.incbin "graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wigglytuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wigglytuff_back_pic:: @ 8D4ADB4
-	.incbin "graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wigglytuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wigglytuff_shiny_palette:: @ 8D4B04C
-	.incbin "graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wigglytuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wigglytuff_icon:: @ 8D4B074
-	.incbin "graphics/pokemon/icons/wigglytuff_icon.4bpp"
+	.incbin "graphics/pokemon/wigglytuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wigglytuff_footprint:: @ 8D4B474
-	.incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp"
+	.incbin "graphics/pokemon/wigglytuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zubat_still_front_pic:: @ 8D4B494
-	.incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zubat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zubat_palette:: @ 8D4B750
-	.incbin "graphics/pokemon/palettes/zubat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zubat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zubat_back_pic:: @ 8D4B778
-	.incbin "graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zubat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zubat_shiny_palette:: @ 8D4BA34
-	.incbin "graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zubat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zubat_icon:: @ 8D4BA5C
-	.incbin "graphics/pokemon/icons/zubat_icon.4bpp"
+	.incbin "graphics/pokemon/zubat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zubat_footprint:: @ 8D4BE5C
-	.incbin "graphics/pokemon/footprints/zubat_footprint.1bpp"
+	.incbin "graphics/pokemon/zubat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golbat_still_front_pic:: @ 8D4BE7C
-	.incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golbat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golbat_palette:: @ 8D4C21C
-	.incbin "graphics/pokemon/palettes/golbat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golbat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golbat_back_pic:: @ 8D4C244
-	.incbin "graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golbat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golbat_shiny_palette:: @ 8D4C500
-	.incbin "graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golbat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golbat_icon:: @ 8D4C528
-	.incbin "graphics/pokemon/icons/golbat_icon.4bpp"
+	.incbin "graphics/pokemon/golbat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golbat_footprint:: @ 8D4C928
-	.incbin "graphics/pokemon/footprints/golbat_footprint.1bpp"
+	.incbin "graphics/pokemon/golbat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_oddish_still_front_pic:: @ 8D4C948
-	.incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/oddish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_oddish_palette:: @ 8D4CB88
-	.incbin "graphics/pokemon/palettes/oddish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/oddish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_oddish_back_pic:: @ 8D4CBB0
-	.incbin "graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/oddish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_oddish_shiny_palette:: @ 8D4CE74
-	.incbin "graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/oddish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_oddish_icon:: @ 8D4CE9C
-	.incbin "graphics/pokemon/icons/oddish_icon.4bpp"
+	.incbin "graphics/pokemon/oddish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_oddish_footprint:: @ 8D4D29C
-	.incbin "graphics/pokemon/footprints/oddish_footprint.1bpp"
+	.incbin "graphics/pokemon/oddish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gloom_still_front_pic:: @ 8D4D2BC
-	.incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gloom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gloom_palette:: @ 8D4D624
-	.incbin "graphics/pokemon/palettes/gloom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gloom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gloom_back_pic:: @ 8D4D64C
-	.incbin "graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gloom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gloom_shiny_palette:: @ 8D4D9CC
-	.incbin "graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gloom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gloom_icon:: @ 8D4D9F4
-	.incbin "graphics/pokemon/icons/gloom_icon.4bpp"
+	.incbin "graphics/pokemon/gloom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gloom_footprint:: @ 8D4DDF4
-	.incbin "graphics/pokemon/footprints/gloom_footprint.1bpp"
+	.incbin "graphics/pokemon/gloom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vileplume_still_front_pic:: @ 8D4DE14
-	.incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vileplume/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vileplume_palette:: @ 8D4E168
-	.incbin "graphics/pokemon/palettes/vileplume_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vileplume/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vileplume_back_pic:: @ 8D4E190
-	.incbin "graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vileplume/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vileplume_shiny_palette:: @ 8D4E5DC
-	.incbin "graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vileplume/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vileplume_icon:: @ 8D4E604
-	.incbin "graphics/pokemon/icons/vileplume_icon.4bpp"
+	.incbin "graphics/pokemon/vileplume/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vileplume_footprint:: @ 8D4EA04
-	.incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp"
+	.incbin "graphics/pokemon/vileplume/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_paras_still_front_pic:: @ 8D4EA24
-	.incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/paras/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_paras_palette:: @ 8D4EC90
-	.incbin "graphics/pokemon/palettes/paras_palette.gbapal.lz"
+	.incbin "graphics/pokemon/paras/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_paras_back_pic:: @ 8D4ECB8
-	.incbin "graphics/pokemon/back_pics/paras_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/paras/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_paras_shiny_palette:: @ 8D4EF58
-	.incbin "graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/paras/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_paras_icon:: @ 8D4EF80
-	.incbin "graphics/pokemon/icons/paras_icon.4bpp"
+	.incbin "graphics/pokemon/paras/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_paras_footprint:: @ 8D4F380
-	.incbin "graphics/pokemon/footprints/paras_footprint.1bpp"
+	.incbin "graphics/pokemon/paras/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_parasect_still_front_pic:: @ 8D4F3A0
-	.incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/parasect/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_parasect_palette:: @ 8D4F730
-	.incbin "graphics/pokemon/palettes/parasect_palette.gbapal.lz"
+	.incbin "graphics/pokemon/parasect/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_parasect_back_pic:: @ 8D4F758
-	.incbin "graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/parasect/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_parasect_shiny_palette:: @ 8D4FA54
-	.incbin "graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/parasect/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_parasect_icon:: @ 8D4FA7C
-	.incbin "graphics/pokemon/icons/parasect_icon.4bpp"
+	.incbin "graphics/pokemon/parasect/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_parasect_footprint:: @ 8D4FE7C
-	.incbin "graphics/pokemon/footprints/parasect_footprint.1bpp"
+	.incbin "graphics/pokemon/parasect/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venonat_still_front_pic:: @ 8D4FE9C
-	.incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venonat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venonat_palette:: @ 8D501BC
-	.incbin "graphics/pokemon/palettes/venonat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venonat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venonat_back_pic:: @ 8D501E4
-	.incbin "graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venonat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venonat_shiny_palette:: @ 8D50514
-	.incbin "graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venonat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venonat_icon:: @ 8D5053C
-	.incbin "graphics/pokemon/icons/venonat_icon.4bpp"
+	.incbin "graphics/pokemon/venonat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venonat_footprint:: @ 8D5093C
-	.incbin "graphics/pokemon/footprints/venonat_footprint.1bpp"
+	.incbin "graphics/pokemon/venonat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_venomoth_still_front_pic:: @ 8D5095C
-	.incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venomoth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venomoth_palette:: @ 8D50D60
-	.incbin "graphics/pokemon/palettes/venomoth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venomoth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_venomoth_back_pic:: @ 8D50D88
-	.incbin "graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/venomoth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_venomoth_shiny_palette:: @ 8D5112C
-	.incbin "graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/venomoth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_venomoth_icon:: @ 8D51154
-	.incbin "graphics/pokemon/icons/venomoth_icon.4bpp"
+	.incbin "graphics/pokemon/venomoth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_venomoth_footprint:: @ 8D51554
-	.incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp"
+	.incbin "graphics/pokemon/venomoth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_diglett_still_front_pic:: @ 8D51574
-	.incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/diglett/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_diglett_palette:: @ 8D51784
-	.incbin "graphics/pokemon/palettes/diglett_palette.gbapal.lz"
+	.incbin "graphics/pokemon/diglett/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_diglett_back_pic:: @ 8D517AC
-	.incbin "graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/diglett/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_diglett_shiny_palette:: @ 8D519B8
-	.incbin "graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/diglett/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_diglett_icon:: @ 8D519E0
-	.incbin "graphics/pokemon/icons/diglett_icon.4bpp"
+	.incbin "graphics/pokemon/diglett/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_diglett_footprint:: @ 8D51DE0
-	.incbin "graphics/pokemon/footprints/diglett_footprint.1bpp"
+	.incbin "graphics/pokemon/diglett/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dugtrio_still_front_pic:: @ 8D51E00
-	.incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dugtrio/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dugtrio_palette:: @ 8D5212C
-	.incbin "graphics/pokemon/palettes/dugtrio_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dugtrio/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dugtrio_back_pic:: @ 8D52154
-	.incbin "graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dugtrio/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dugtrio_shiny_palette:: @ 8D52400
-	.incbin "graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dugtrio/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dugtrio_icon:: @ 8D52428
-	.incbin "graphics/pokemon/icons/dugtrio_icon.4bpp"
+	.incbin "graphics/pokemon/dugtrio/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dugtrio_footprint:: @ 8D52828
-	.incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp"
+	.incbin "graphics/pokemon/dugtrio/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meowth_still_front_pic:: @ 8D52848
-	.incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meowth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meowth_palette:: @ 8D52B34
-	.incbin "graphics/pokemon/palettes/meowth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meowth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meowth_back_pic:: @ 8D52B5C
-	.incbin "graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meowth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meowth_shiny_palette:: @ 8D52E40
-	.incbin "graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meowth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meowth_icon:: @ 8D52E68
-	.incbin "graphics/pokemon/icons/meowth_icon.4bpp"
+	.incbin "graphics/pokemon/meowth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meowth_footprint:: @ 8D53268
-	.incbin "graphics/pokemon/footprints/meowth_footprint.1bpp"
+	.incbin "graphics/pokemon/meowth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_persian_still_front_pic:: @ 8D53288
-	.incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/persian/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_persian_palette:: @ 8D53600
-	.incbin "graphics/pokemon/palettes/persian_palette.gbapal.lz"
+	.incbin "graphics/pokemon/persian/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_persian_back_pic:: @ 8D53628
-	.incbin "graphics/pokemon/back_pics/persian_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/persian/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_persian_shiny_palette:: @ 8D53968
-	.incbin "graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/persian/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_persian_icon:: @ 8D53990
-	.incbin "graphics/pokemon/icons/persian_icon.4bpp"
+	.incbin "graphics/pokemon/persian/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_persian_footprint:: @ 8D53D90
-	.incbin "graphics/pokemon/footprints/persian_footprint.1bpp"
+	.incbin "graphics/pokemon/persian/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_psyduck_still_front_pic:: @ 8D53DB0
-	.incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/psyduck/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_psyduck_palette:: @ 8D54094
-	.incbin "graphics/pokemon/palettes/psyduck_palette.gbapal.lz"
+	.incbin "graphics/pokemon/psyduck/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_psyduck_back_pic:: @ 8D540BC
-	.incbin "graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/psyduck/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_psyduck_shiny_palette:: @ 8D54358
-	.incbin "graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/psyduck/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_psyduck_icon:: @ 8D54380
-	.incbin "graphics/pokemon/icons/psyduck_icon.4bpp"
+	.incbin "graphics/pokemon/psyduck/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_psyduck_footprint:: @ 8D54780
-	.incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp"
+	.incbin "graphics/pokemon/psyduck/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golduck_still_front_pic:: @ 8D547A0
-	.incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golduck/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golduck_palette:: @ 8D54B58
-	.incbin "graphics/pokemon/palettes/golduck_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golduck/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golduck_back_pic:: @ 8D54B80
-	.incbin "graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golduck/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golduck_shiny_palette:: @ 8D54EAC
-	.incbin "graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golduck/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golduck_icon:: @ 8D54ED4
-	.incbin "graphics/pokemon/icons/golduck_icon.4bpp"
+	.incbin "graphics/pokemon/golduck/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golduck_footprint:: @ 8D552D4
-	.incbin "graphics/pokemon/footprints/golduck_footprint.1bpp"
+	.incbin "graphics/pokemon/golduck/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mankey_still_front_pic:: @ 8D552F4
-	.incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mankey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mankey_palette:: @ 8D555EC
-	.incbin "graphics/pokemon/palettes/mankey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mankey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mankey_back_pic:: @ 8D55614
-	.incbin "graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mankey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mankey_shiny_palette:: @ 8D5597C
-	.incbin "graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mankey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mankey_icon:: @ 8D559A4
-	.incbin "graphics/pokemon/icons/mankey_icon.4bpp"
+	.incbin "graphics/pokemon/mankey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mankey_footprint:: @ 8D55DA4
-	.incbin "graphics/pokemon/footprints/mankey_footprint.1bpp"
+	.incbin "graphics/pokemon/mankey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_primeape_still_front_pic:: @ 8D55DC4
-	.incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/primeape/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_primeape_palette:: @ 8D56150
-	.incbin "graphics/pokemon/palettes/primeape_palette.gbapal.lz"
+	.incbin "graphics/pokemon/primeape/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_primeape_back_pic:: @ 8D56178
-	.incbin "graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/primeape/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_primeape_shiny_palette:: @ 8D564E8
-	.incbin "graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/primeape/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_primeape_icon:: @ 8D56510
-	.incbin "graphics/pokemon/icons/primeape_icon.4bpp"
+	.incbin "graphics/pokemon/primeape/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_primeape_footprint:: @ 8D56910
-	.incbin "graphics/pokemon/footprints/primeape_footprint.1bpp"
+	.incbin "graphics/pokemon/primeape/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_growlithe_still_front_pic:: @ 8D56930
-	.incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/growlithe/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_growlithe_palette:: @ 8D56C58
-	.incbin "graphics/pokemon/palettes/growlithe_palette.gbapal.lz"
+	.incbin "graphics/pokemon/growlithe/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_growlithe_back_pic:: @ 8D56C80
-	.incbin "graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/growlithe/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_growlithe_shiny_palette:: @ 8D56FBC
-	.incbin "graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/growlithe/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_growlithe_icon:: @ 8D56FE4
-	.incbin "graphics/pokemon/icons/growlithe_icon.4bpp"
+	.incbin "graphics/pokemon/growlithe/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_growlithe_footprint:: @ 8D573E4
-	.incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp"
+	.incbin "graphics/pokemon/growlithe/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_arcanine_still_front_pic:: @ 8D57404
-	.incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arcanine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arcanine_palette:: @ 8D57900
-	.incbin "graphics/pokemon/palettes/arcanine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arcanine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_arcanine_back_pic:: @ 8D57928
-	.incbin "graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/arcanine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_arcanine_shiny_palette:: @ 8D57D08
-	.incbin "graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/arcanine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_arcanine_icon:: @ 8D57D30
-	.incbin "graphics/pokemon/icons/arcanine_icon.4bpp"
+	.incbin "graphics/pokemon/arcanine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_arcanine_footprint:: @ 8D58130
-	.incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp"
+	.incbin "graphics/pokemon/arcanine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwag_still_front_pic:: @ 8D58150
-	.incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwag/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwag_palette:: @ 8D583EC
-	.incbin "graphics/pokemon/palettes/poliwag_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwag/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwag_back_pic:: @ 8D58414
-	.incbin "graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwag/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwag_shiny_palette:: @ 8D58678
-	.incbin "graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwag/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwag_icon:: @ 8D586A0
-	.incbin "graphics/pokemon/icons/poliwag_icon.4bpp"
+	.incbin "graphics/pokemon/poliwag/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwag_footprint:: @ 8D58AA0
-	.incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwag/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwhirl_still_front_pic:: @ 8D58AC0
-	.incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwhirl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwhirl_palette:: @ 8D58E40
-	.incbin "graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwhirl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwhirl_back_pic:: @ 8D58E68
-	.incbin "graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwhirl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwhirl_shiny_palette:: @ 8D590E4
-	.incbin "graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwhirl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwhirl_icon:: @ 8D5910C
-	.incbin "graphics/pokemon/icons/poliwhirl_icon.4bpp"
+	.incbin "graphics/pokemon/poliwhirl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwhirl_footprint:: @ 8D5950C
-	.incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwhirl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poliwrath_still_front_pic:: @ 8D5952C
-	.incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwrath/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwrath_palette:: @ 8D598F0
-	.incbin "graphics/pokemon/palettes/poliwrath_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwrath/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poliwrath_back_pic:: @ 8D59918
-	.incbin "graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poliwrath/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poliwrath_shiny_palette:: @ 8D59C0C
-	.incbin "graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poliwrath/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poliwrath_icon:: @ 8D59C34
-	.incbin "graphics/pokemon/icons/poliwrath_icon.4bpp"
+	.incbin "graphics/pokemon/poliwrath/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poliwrath_footprint:: @ 8D5A034
-	.incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp"
+	.incbin "graphics/pokemon/poliwrath/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_abra_still_front_pic:: @ 8D5A054
-	.incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/abra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_abra_palette:: @ 8D5A328
-	.incbin "graphics/pokemon/palettes/abra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/abra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_abra_back_pic:: @ 8D5A34C
-	.incbin "graphics/pokemon/back_pics/abra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/abra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_abra_shiny_palette:: @ 8D5A620
-	.incbin "graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/abra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_abra_icon:: @ 8D5A644
-	.incbin "graphics/pokemon/icons/abra_icon.4bpp"
+	.incbin "graphics/pokemon/abra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_abra_footprint:: @ 8D5AA44
-	.incbin "graphics/pokemon/footprints/abra_footprint.1bpp"
+	.incbin "graphics/pokemon/abra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kadabra_still_front_pic:: @ 8D5AA64
-	.incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kadabra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kadabra_palette:: @ 8D5AF2C
-	.incbin "graphics/pokemon/palettes/kadabra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kadabra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kadabra_back_pic:: @ 8D5AF54
-	.incbin "graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kadabra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kadabra_shiny_palette:: @ 8D5B300
-	.incbin "graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kadabra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kadabra_icon:: @ 8D5B328
-	.incbin "graphics/pokemon/icons/kadabra_icon.4bpp"
+	.incbin "graphics/pokemon/kadabra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kadabra_footprint:: @ 8D5B728
-	.incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp"
+	.incbin "graphics/pokemon/kadabra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_alakazam_still_front_pic:: @ 8D5B748
-	.incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/alakazam/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_alakazam_palette:: @ 8D5BBE0
-	.incbin "graphics/pokemon/palettes/alakazam_palette.gbapal.lz"
+	.incbin "graphics/pokemon/alakazam/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_alakazam_back_pic:: @ 8D5BC08
-	.incbin "graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/alakazam/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_alakazam_shiny_palette:: @ 8D5BF88
-	.incbin "graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/alakazam/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_alakazam_icon:: @ 8D5BFB0
-	.incbin "graphics/pokemon/icons/alakazam_icon.4bpp"
+	.incbin "graphics/pokemon/alakazam/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_alakazam_footprint:: @ 8D5C3B0
-	.incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp"
+	.incbin "graphics/pokemon/alakazam/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machop_still_front_pic:: @ 8D5C3D0
-	.incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machop/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machop_palette:: @ 8D5C65C
-	.incbin "graphics/pokemon/palettes/machop_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machop/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machop_back_pic:: @ 8D5C684
-	.incbin "graphics/pokemon/back_pics/machop_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machop/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machop_shiny_palette:: @ 8D5C964
-	.incbin "graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machop/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machop_icon:: @ 8D5C98C
-	.incbin "graphics/pokemon/icons/machop_icon.4bpp"
+	.incbin "graphics/pokemon/machop/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machop_footprint:: @ 8D5CD8C
-	.incbin "graphics/pokemon/footprints/machop_footprint.1bpp"
+	.incbin "graphics/pokemon/machop/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machoke_still_front_pic:: @ 8D5CDAC
-	.incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machoke/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machoke_palette:: @ 8D5D178
-	.incbin "graphics/pokemon/palettes/machoke_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machoke/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machoke_back_pic:: @ 8D5D1A0
-	.incbin "graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machoke/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machoke_shiny_palette:: @ 8D5D4F0
-	.incbin "graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machoke/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machoke_icon:: @ 8D5D518
-	.incbin "graphics/pokemon/icons/machoke_icon.4bpp"
+	.incbin "graphics/pokemon/machoke/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machoke_footprint:: @ 8D5D918
-	.incbin "graphics/pokemon/footprints/machoke_footprint.1bpp"
+	.incbin "graphics/pokemon/machoke/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_machamp_still_front_pic:: @ 8D5D938
-	.incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machamp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machamp_palette:: @ 8D5DE24
-	.incbin "graphics/pokemon/palettes/machamp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machamp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_machamp_back_pic:: @ 8D5DE4C
-	.incbin "graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/machamp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_machamp_shiny_palette:: @ 8D5E2A8
-	.incbin "graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/machamp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_machamp_icon:: @ 8D5E2D0
-	.incbin "graphics/pokemon/icons/machamp_icon.4bpp"
+	.incbin "graphics/pokemon/machamp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_machamp_footprint:: @ 8D5E6D0
-	.incbin "graphics/pokemon/footprints/machamp_footprint.1bpp"
+	.incbin "graphics/pokemon/machamp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bellsprout_still_front_pic:: @ 8D5E6F0
-	.incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellsprout/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellsprout_palette:: @ 8D5E97C
-	.incbin "graphics/pokemon/palettes/bellsprout_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellsprout/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bellsprout_back_pic:: @ 8D5E9A4
-	.incbin "graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellsprout/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellsprout_shiny_palette:: @ 8D5EC40
-	.incbin "graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellsprout/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bellsprout_icon:: @ 8D5EC68
-	.incbin "graphics/pokemon/icons/bellsprout_icon.4bpp"
+	.incbin "graphics/pokemon/bellsprout/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bellsprout_footprint:: @ 8D5F068
-	.incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp"
+	.incbin "graphics/pokemon/bellsprout/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weepinbell_still_front_pic:: @ 8D5F088
-	.incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weepinbell/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weepinbell_palette:: @ 8D5F3AC
-	.incbin "graphics/pokemon/palettes/weepinbell_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weepinbell/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weepinbell_back_pic:: @ 8D5F3D4
-	.incbin "graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weepinbell/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weepinbell_shiny_palette:: @ 8D5F6D0
-	.incbin "graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weepinbell/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weepinbell_icon:: @ 8D5F6F8
-	.incbin "graphics/pokemon/icons/weepinbell_icon.4bpp"
+	.incbin "graphics/pokemon/weepinbell/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weepinbell_footprint:: @ 8D5FAF8
-	.incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp"
+	.incbin "graphics/pokemon/weepinbell/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_victreebel_still_front_pic:: @ 8D5FB18
-	.incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/victreebel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_victreebel_palette:: @ 8D5FF44
-	.incbin "graphics/pokemon/palettes/victreebel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/victreebel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_victreebel_back_pic:: @ 8D5FF6C
-	.incbin "graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/victreebel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_victreebel_shiny_palette:: @ 8D60304
-	.incbin "graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/victreebel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_victreebel_icon:: @ 8D6032C
-	.incbin "graphics/pokemon/icons/victreebel_icon.4bpp"
+	.incbin "graphics/pokemon/victreebel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_victreebel_footprint:: @ 8D6072C
-	.incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp"
+	.incbin "graphics/pokemon/victreebel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tentacool_still_front_pic:: @ 8D6074C
-	.incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacool/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacool_palette:: @ 8D609F4
-	.incbin "graphics/pokemon/palettes/tentacool_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacool/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tentacool_back_pic:: @ 8D60A1C
-	.incbin "graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacool/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacool_shiny_palette:: @ 8D60CE8
-	.incbin "graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacool/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tentacool_icon:: @ 8D60D10
-	.incbin "graphics/pokemon/icons/tentacool_icon.4bpp"
+	.incbin "graphics/pokemon/tentacool/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tentacool_footprint:: @ 8D61110
-	.incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp"
+	.incbin "graphics/pokemon/tentacool/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tentacruel_still_front_pic:: @ 8D61130
-	.incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacruel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacruel_palette:: @ 8D61624
-	.incbin "graphics/pokemon/palettes/tentacruel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacruel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tentacruel_back_pic:: @ 8D6164C
-	.incbin "graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tentacruel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tentacruel_shiny_palette:: @ 8D619E8
-	.incbin "graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tentacruel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tentacruel_icon:: @ 8D61A10
-	.incbin "graphics/pokemon/icons/tentacruel_icon.4bpp"
+	.incbin "graphics/pokemon/tentacruel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tentacruel_footprint:: @ 8D61E10
-	.incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp"
+	.incbin "graphics/pokemon/tentacruel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_geodude_still_front_pic:: @ 8D61E30
-	.incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/geodude/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_geodude_palette:: @ 8D620C4
-	.incbin "graphics/pokemon/palettes/geodude_palette.gbapal.lz"
+	.incbin "graphics/pokemon/geodude/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_geodude_back_pic:: @ 8D620E0
-	.incbin "graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/geodude/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_geodude_shiny_palette:: @ 8D62374
-	.incbin "graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/geodude/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_geodude_icon:: @ 8D62390
-	.incbin "graphics/pokemon/icons/geodude_icon.4bpp"
+	.incbin "graphics/pokemon/geodude/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_geodude_footprint:: @ 8D62790
-	.incbin "graphics/pokemon/footprints/geodude_footprint.1bpp"
+	.incbin "graphics/pokemon/geodude/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_graveler_still_front_pic:: @ 8D627B0
-	.incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/graveler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_graveler_palette:: @ 8D62BAC
-	.incbin "graphics/pokemon/palettes/graveler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/graveler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_graveler_back_pic:: @ 8D62BD0
-	.incbin "graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/graveler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_graveler_shiny_palette:: @ 8D62E4C
-	.incbin "graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/graveler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_graveler_icon:: @ 8D62E70
-	.incbin "graphics/pokemon/icons/graveler_icon.4bpp"
+	.incbin "graphics/pokemon/graveler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_graveler_footprint:: @ 8D63270
-	.incbin "graphics/pokemon/footprints/graveler_footprint.1bpp"
+	.incbin "graphics/pokemon/graveler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_golem_still_front_pic:: @ 8D63290
-	.incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golem/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golem_palette:: @ 8D636C0
-	.incbin "graphics/pokemon/palettes/golem_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golem/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_golem_back_pic:: @ 8D636E8
-	.incbin "graphics/pokemon/back_pics/golem_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/golem/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_golem_shiny_palette:: @ 8D639A8
-	.incbin "graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/golem/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_golem_icon:: @ 8D639D0
-	.incbin "graphics/pokemon/icons/golem_icon.4bpp"
+	.incbin "graphics/pokemon/golem/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_golem_footprint:: @ 8D63DD0
-	.incbin "graphics/pokemon/footprints/golem_footprint.1bpp"
+	.incbin "graphics/pokemon/golem/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ponyta_still_front_pic:: @ 8D63DF0
-	.incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ponyta/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ponyta_palette:: @ 8D64180
-	.incbin "graphics/pokemon/palettes/ponyta_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ponyta/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ponyta_back_pic:: @ 8D641A8
-	.incbin "graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ponyta/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ponyta_shiny_palette:: @ 8D644E4
-	.incbin "graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ponyta/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ponyta_icon:: @ 8D6450C
-	.incbin "graphics/pokemon/icons/ponyta_icon.4bpp"
+	.incbin "graphics/pokemon/ponyta/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ponyta_footprint:: @ 8D6490C
-	.incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp"
+	.incbin "graphics/pokemon/ponyta/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rapidash_still_front_pic:: @ 8D6492C
-	.incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rapidash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rapidash_palette:: @ 8D64DB4
-	.incbin "graphics/pokemon/palettes/rapidash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rapidash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rapidash_back_pic:: @ 8D64DDC
-	.incbin "graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rapidash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rapidash_shiny_palette:: @ 8D651EC
-	.incbin "graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rapidash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rapidash_icon:: @ 8D65214
-	.incbin "graphics/pokemon/icons/rapidash_icon.4bpp"
+	.incbin "graphics/pokemon/rapidash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rapidash_footprint:: @ 8D65614
-	.incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp"
+	.incbin "graphics/pokemon/rapidash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowpoke_still_front_pic:: @ 8D65634
-	.incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowpoke/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowpoke_palette:: @ 8D65908
-	.incbin "graphics/pokemon/palettes/slowpoke_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowpoke/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowpoke_back_pic:: @ 8D65930
-	.incbin "graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowpoke/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowpoke_shiny_palette:: @ 8D65B94
-	.incbin "graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowpoke/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowpoke_icon:: @ 8D65BBC
-	.incbin "graphics/pokemon/icons/slowpoke_icon.4bpp"
+	.incbin "graphics/pokemon/slowpoke/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowpoke_footprint:: @ 8D65FBC
-	.incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp"
+	.incbin "graphics/pokemon/slowpoke/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowbro_still_front_pic:: @ 8D65FDC
-	.incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowbro/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowbro_palette:: @ 8D6647C
-	.incbin "graphics/pokemon/palettes/slowbro_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowbro/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowbro_back_pic:: @ 8D664A4
-	.incbin "graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowbro/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowbro_shiny_palette:: @ 8D66840
-	.incbin "graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowbro/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowbro_icon:: @ 8D66868
-	.incbin "graphics/pokemon/icons/slowbro_icon.4bpp"
+	.incbin "graphics/pokemon/slowbro/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowbro_footprint:: @ 8D66C68
-	.incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp"
+	.incbin "graphics/pokemon/slowbro/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magnemite_still_front_pic:: @ 8D66C88
-	.incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magnemite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magnemite_palette:: @ 8D66E60
-	.incbin "graphics/pokemon/palettes/magnemite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magnemite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magnemite_back_pic:: @ 8D66E88
-	.incbin "graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magnemite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magnemite_shiny_palette:: @ 8D67070
-	.incbin "graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magnemite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magnemite_icon:: @ 8D67094
-	.incbin "graphics/pokemon/icons/magnemite_icon.4bpp"
+	.incbin "graphics/pokemon/magnemite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magnemite_footprint:: @ 8D67494
-	.incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp"
+	.incbin "graphics/pokemon/magnemite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magneton_still_front_pic:: @ 8D674B4
-	.incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magneton/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magneton_palette:: @ 8D677F0
-	.incbin "graphics/pokemon/palettes/magneton_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magneton/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magneton_back_pic:: @ 8D67818
-	.incbin "graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magneton/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magneton_shiny_palette:: @ 8D67B98
-	.incbin "graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magneton/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magneton_icon:: @ 8D67BC0
-	.incbin "graphics/pokemon/icons/magneton_icon.4bpp"
+	.incbin "graphics/pokemon/magneton/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magneton_footprint:: @ 8D67FC0
-	.incbin "graphics/pokemon/footprints/magneton_footprint.1bpp"
+	.incbin "graphics/pokemon/magneton/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_farfetch_d_still_front_pic:: @ 8D67FE0
-	.incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/farfetch_d/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_farfetch_d_palette:: @ 8D68334
-	.incbin "graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz"
+	.incbin "graphics/pokemon/farfetch_d/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_farfetch_d_back_pic:: @ 8D6835C
-	.incbin "graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/farfetch_d/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_farfetch_d_shiny_palette:: @ 8D686C8
-	.incbin "graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/farfetch_d/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_farfetch_d_icon:: @ 8D686F0
-	.incbin "graphics/pokemon/icons/farfetch_d_icon.4bpp"
+	.incbin "graphics/pokemon/farfetch_d/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_farfetch_d_footprint:: @ 8D68AF0
-	.incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp"
+	.incbin "graphics/pokemon/farfetch_d/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_doduo_still_front_pic:: @ 8D68B10
-	.incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/doduo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_doduo_palette:: @ 8D68DFC
-	.incbin "graphics/pokemon/palettes/doduo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/doduo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_doduo_back_pic:: @ 8D68E20
-	.incbin "graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/doduo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_doduo_shiny_palette:: @ 8D69138
-	.incbin "graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/doduo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_doduo_icon:: @ 8D6915C
-	.incbin "graphics/pokemon/icons/doduo_icon.4bpp"
+	.incbin "graphics/pokemon/doduo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_doduo_footprint:: @ 8D6955C
-	.incbin "graphics/pokemon/footprints/doduo_footprint.1bpp"
+	.incbin "graphics/pokemon/doduo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dodrio_still_front_pic:: @ 8D6957C
-	.incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dodrio/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dodrio_palette:: @ 8D699BC
-	.incbin "graphics/pokemon/palettes/dodrio_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dodrio/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dodrio_back_pic:: @ 8D699E4
-	.incbin "graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dodrio/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dodrio_shiny_palette:: @ 8D69E48
-	.incbin "graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dodrio/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dodrio_icon:: @ 8D69E70
-	.incbin "graphics/pokemon/icons/dodrio_icon.4bpp"
+	.incbin "graphics/pokemon/dodrio/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dodrio_footprint:: @ 8D6A270
-	.incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp"
+	.incbin "graphics/pokemon/dodrio/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seel_still_front_pic:: @ 8D6A290
-	.incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seel_palette:: @ 8D6A5B4
-	.incbin "graphics/pokemon/palettes/seel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seel_back_pic:: @ 8D6A5DC
-	.incbin "graphics/pokemon/back_pics/seel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seel_shiny_palette:: @ 8D6A8C8
-	.incbin "graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seel_icon:: @ 8D6A8F0
-	.incbin "graphics/pokemon/icons/seel_icon.4bpp"
+	.incbin "graphics/pokemon/seel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seel_footprint:: @ 8D6ACF0
-	.incbin "graphics/pokemon/footprints/seel_footprint.1bpp"
+	.incbin "graphics/pokemon/seel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dewgong_still_front_pic:: @ 8D6AD10
-	.incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dewgong/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dewgong_palette:: @ 8D6B0E0
-	.incbin "graphics/pokemon/palettes/dewgong_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dewgong/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dewgong_back_pic:: @ 8D6B104
-	.incbin "graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dewgong/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dewgong_shiny_palette:: @ 8D6B398
-	.incbin "graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dewgong/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dewgong_icon:: @ 8D6B3BC
-	.incbin "graphics/pokemon/icons/dewgong_icon.4bpp"
+	.incbin "graphics/pokemon/dewgong/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dewgong_footprint:: @ 8D6B7BC
-	.incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp"
+	.incbin "graphics/pokemon/dewgong/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grimer_still_front_pic:: @ 8D6B7DC
-	.incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grimer/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grimer_palette:: @ 8D6BB04
-	.incbin "graphics/pokemon/palettes/grimer_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grimer/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grimer_back_pic:: @ 8D6BB28
-	.incbin "graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grimer/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grimer_shiny_palette:: @ 8D6BDEC
-	.incbin "graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grimer/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grimer_icon:: @ 8D6BE10
-	.incbin "graphics/pokemon/icons/grimer_icon.4bpp"
+	.incbin "graphics/pokemon/grimer/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grimer_footprint:: @ 8D6C210
-	.incbin "graphics/pokemon/footprints/grimer_footprint.1bpp"
+	.incbin "graphics/pokemon/grimer/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_muk_still_front_pic:: @ 8D6C230
-	.incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/muk/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_muk_palette:: @ 8D6C5C0
-	.incbin "graphics/pokemon/palettes/muk_palette.gbapal.lz"
+	.incbin "graphics/pokemon/muk/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_muk_back_pic:: @ 8D6C5E4
-	.incbin "graphics/pokemon/back_pics/muk_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/muk/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_muk_shiny_palette:: @ 8D6C8DC
-	.incbin "graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/muk/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_muk_icon:: @ 8D6C900
-	.incbin "graphics/pokemon/icons/muk_icon.4bpp"
+	.incbin "graphics/pokemon/muk/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_muk_footprint:: @ 8D6CD00
-	.incbin "graphics/pokemon/footprints/muk_footprint.1bpp"
+	.incbin "graphics/pokemon/muk/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shellder_still_front_pic:: @ 8D6CD20
-	.incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shellder/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shellder_palette:: @ 8D6CF94
-	.incbin "graphics/pokemon/palettes/shellder_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shellder/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shellder_back_pic:: @ 8D6CFB8
-	.incbin "graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shellder/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shellder_shiny_palette:: @ 8D6D2CC
-	.incbin "graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shellder/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shellder_icon:: @ 8D6D2F0
-	.incbin "graphics/pokemon/icons/shellder_icon.4bpp"
+	.incbin "graphics/pokemon/shellder/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shellder_footprint:: @ 8D6D6F0
-	.incbin "graphics/pokemon/footprints/shellder_footprint.1bpp"
+	.incbin "graphics/pokemon/shellder/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cloyster_still_front_pic:: @ 8D6D710
-	.incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cloyster/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cloyster_palette:: @ 8D6DB4C
-	.incbin "graphics/pokemon/palettes/cloyster_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cloyster/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cloyster_back_pic:: @ 8D6DB70
-	.incbin "graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cloyster/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cloyster_shiny_palette:: @ 8D6DF7C
-	.incbin "graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cloyster/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cloyster_icon:: @ 8D6DFA0
-	.incbin "graphics/pokemon/icons/cloyster_icon.4bpp"
+	.incbin "graphics/pokemon/cloyster/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cloyster_footprint:: @ 8D6E3A0
-	.incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp"
+	.incbin "graphics/pokemon/cloyster/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gastly_still_front_pic:: @ 8D6E3C0
-	.incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gastly/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gastly_palette:: @ 8D6E778
-	.incbin "graphics/pokemon/palettes/gastly_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gastly/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gastly_back_pic:: @ 8D6E7A0
-	.incbin "graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gastly/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gastly_shiny_palette:: @ 8D6EAC4
-	.incbin "graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gastly/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gastly_icon:: @ 8D6EAEC
-	.incbin "graphics/pokemon/icons/gastly_icon.4bpp"
+	.incbin "graphics/pokemon/gastly/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gastly_footprint:: @ 8D6EEEC
-	.incbin "graphics/pokemon/footprints/gastly_footprint.1bpp"
+	.incbin "graphics/pokemon/gastly/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_haunter_still_front_pic:: @ 8D6EF0C
-	.incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/haunter/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_haunter_palette:: @ 8D6F2F4
-	.incbin "graphics/pokemon/palettes/haunter_palette.gbapal.lz"
+	.incbin "graphics/pokemon/haunter/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_haunter_back_pic:: @ 8D6F318
-	.incbin "graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/haunter/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_haunter_shiny_palette:: @ 8D6F5FC
-	.incbin "graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/haunter/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_haunter_icon:: @ 8D6F620
-	.incbin "graphics/pokemon/icons/haunter_icon.4bpp"
+	.incbin "graphics/pokemon/haunter/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_haunter_footprint:: @ 8D6FA20
-	.incbin "graphics/pokemon/footprints/haunter_footprint.1bpp"
+	.incbin "graphics/pokemon/haunter/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gengar_still_front_pic:: @ 8D6FA40
-	.incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gengar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gengar_palette:: @ 8D6FD9C
-	.incbin "graphics/pokemon/palettes/gengar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gengar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gengar_back_pic:: @ 8D6FDC0
-	.incbin "graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gengar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gengar_shiny_palette:: @ 8D70104
-	.incbin "graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gengar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gengar_icon:: @ 8D70128
-	.incbin "graphics/pokemon/icons/gengar_icon.4bpp"
+	.incbin "graphics/pokemon/gengar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gengar_footprint:: @ 8D70528
-	.incbin "graphics/pokemon/footprints/gengar_footprint.1bpp"
+	.incbin "graphics/pokemon/gengar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_onix_still_front_pic:: @ 8D70548
-	.incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/onix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_onix_palette:: @ 8D70A18
-	.incbin "graphics/pokemon/palettes/onix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/onix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_onix_back_pic:: @ 8D70A34
-	.incbin "graphics/pokemon/back_pics/onix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/onix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_onix_shiny_palette:: @ 8D70DB0
-	.incbin "graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/onix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_onix_icon:: @ 8D70DCC
-	.incbin "graphics/pokemon/icons/onix_icon.4bpp"
+	.incbin "graphics/pokemon/onix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_onix_footprint:: @ 8D711CC
-	.incbin "graphics/pokemon/footprints/onix_footprint.1bpp"
+	.incbin "graphics/pokemon/onix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_drowzee_still_front_pic:: @ 8D711EC
-	.incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/drowzee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_drowzee_palette:: @ 8D7152C
-	.incbin "graphics/pokemon/palettes/drowzee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/drowzee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_drowzee_back_pic:: @ 8D71550
-	.incbin "graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/drowzee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_drowzee_shiny_palette:: @ 8D7178C
-	.incbin "graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/drowzee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_drowzee_icon:: @ 8D717B0
-	.incbin "graphics/pokemon/icons/drowzee_icon.4bpp"
+	.incbin "graphics/pokemon/drowzee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_drowzee_footprint:: @ 8D71BB0
-	.incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp"
+	.incbin "graphics/pokemon/drowzee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hypno_still_front_pic:: @ 8D71BD0
-	.incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hypno/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hypno_palette:: @ 8D72008
-	.incbin "graphics/pokemon/palettes/hypno_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hypno/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hypno_back_pic:: @ 8D7202C
-	.incbin "graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hypno/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hypno_shiny_palette:: @ 8D7235C
-	.incbin "graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hypno/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hypno_icon:: @ 8D72380
-	.incbin "graphics/pokemon/icons/hypno_icon.4bpp"
+	.incbin "graphics/pokemon/hypno/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hypno_footprint:: @ 8D72780
-	.incbin "graphics/pokemon/footprints/hypno_footprint.1bpp"
+	.incbin "graphics/pokemon/hypno/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_krabby_still_front_pic:: @ 8D727A0
-	.incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/krabby/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_krabby_palette:: @ 8D72AC4
-	.incbin "graphics/pokemon/palettes/krabby_palette.gbapal.lz"
+	.incbin "graphics/pokemon/krabby/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_krabby_back_pic:: @ 8D72AEC
-	.incbin "graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/krabby/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_krabby_shiny_palette:: @ 8D72E78
-	.incbin "graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/krabby/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_krabby_icon:: @ 8D72EA0
-	.incbin "graphics/pokemon/icons/krabby_icon.4bpp"
+	.incbin "graphics/pokemon/krabby/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_krabby_footprint:: @ 8D732A0
-	.incbin "graphics/pokemon/footprints/krabby_footprint.1bpp"
+	.incbin "graphics/pokemon/krabby/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kingler_still_front_pic:: @ 8D732C0
-	.incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingler_palette:: @ 8D73740
-	.incbin "graphics/pokemon/palettes/kingler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kingler_back_pic:: @ 8D73768
-	.incbin "graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingler_shiny_palette:: @ 8D73AEC
-	.incbin "graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kingler_icon:: @ 8D73B14
-	.incbin "graphics/pokemon/icons/kingler_icon.4bpp"
+	.incbin "graphics/pokemon/kingler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kingler_footprint:: @ 8D73F14
-	.incbin "graphics/pokemon/footprints/kingler_footprint.1bpp"
+	.incbin "graphics/pokemon/kingler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_voltorb_still_front_pic:: @ 8D73F34
-	.incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/voltorb/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_voltorb_palette:: @ 8D7413C
-	.incbin "graphics/pokemon/palettes/voltorb_palette.gbapal.lz"
+	.incbin "graphics/pokemon/voltorb/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_voltorb_back_pic:: @ 8D74160
-	.incbin "graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/voltorb/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_voltorb_shiny_palette:: @ 8D743D4
-	.incbin "graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/voltorb/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_voltorb_icon:: @ 8D743F8
-	.incbin "graphics/pokemon/icons/voltorb_icon.4bpp"
+	.incbin "graphics/pokemon/voltorb/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_voltorb_footprint:: @ 8D747F8
-	.incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp"
+	.incbin "graphics/pokemon/voltorb/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electrode_still_front_pic:: @ 8D74818
-	.incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrode/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrode_palette:: @ 8D74A84
-	.incbin "graphics/pokemon/palettes/electrode_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrode/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electrode_back_pic:: @ 8D74AA8
-	.incbin "graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrode/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrode_shiny_palette:: @ 8D74D18
-	.incbin "graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrode/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electrode_icon:: @ 8D74D3C
-	.incbin "graphics/pokemon/icons/electrode_icon.4bpp"
+	.incbin "graphics/pokemon/electrode/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electrode_footprint:: @ 8D7513C
-	.incbin "graphics/pokemon/footprints/electrode_footprint.1bpp"
+	.incbin "graphics/pokemon/electrode/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exeggcute_still_front_pic:: @ 8D7515C
-	.incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggcute/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggcute_palette:: @ 8D754EC
-	.incbin "graphics/pokemon/palettes/exeggcute_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggcute/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exeggcute_back_pic:: @ 8D75510
-	.incbin "graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggcute/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggcute_shiny_palette:: @ 8D75818
-	.incbin "graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggcute/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exeggcute_icon:: @ 8D7583C
-	.incbin "graphics/pokemon/icons/exeggcute_icon.4bpp"
+	.incbin "graphics/pokemon/exeggcute/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exeggcute_footprint:: @ 8D75C3C
-	.incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp"
+	.incbin "graphics/pokemon/exeggcute/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exeggutor_still_front_pic:: @ 8D75C5C
-	.incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggutor/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggutor_palette:: @ 8D760AC
-	.incbin "graphics/pokemon/palettes/exeggutor_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggutor/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exeggutor_back_pic:: @ 8D760D4
-	.incbin "graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exeggutor/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exeggutor_shiny_palette:: @ 8D764A0
-	.incbin "graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exeggutor/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exeggutor_icon:: @ 8D764C8
-	.incbin "graphics/pokemon/icons/exeggutor_icon.4bpp"
+	.incbin "graphics/pokemon/exeggutor/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exeggutor_footprint:: @ 8D768C8
-	.incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp"
+	.incbin "graphics/pokemon/exeggutor/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cubone_still_front_pic:: @ 8D768E8
-	.incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cubone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cubone_palette:: @ 8D76BA4
-	.incbin "graphics/pokemon/palettes/cubone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cubone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cubone_back_pic:: @ 8D76BCC
-	.incbin "graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cubone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cubone_shiny_palette:: @ 8D76F0C
-	.incbin "graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cubone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cubone_icon:: @ 8D76F34
-	.incbin "graphics/pokemon/icons/cubone_icon.4bpp"
+	.incbin "graphics/pokemon/cubone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cubone_footprint:: @ 8D77334
-	.incbin "graphics/pokemon/footprints/cubone_footprint.1bpp"
+	.incbin "graphics/pokemon/cubone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marowak_still_front_pic:: @ 8D77354
-	.incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marowak/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marowak_palette:: @ 8D776D4
-	.incbin "graphics/pokemon/palettes/marowak_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marowak/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marowak_back_pic:: @ 8D776FC
-	.incbin "graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marowak/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marowak_shiny_palette:: @ 8D77A10
-	.incbin "graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marowak/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marowak_icon:: @ 8D77A38
-	.incbin "graphics/pokemon/icons/marowak_icon.4bpp"
+	.incbin "graphics/pokemon/marowak/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marowak_footprint:: @ 8D77E38
-	.incbin "graphics/pokemon/footprints/marowak_footprint.1bpp"
+	.incbin "graphics/pokemon/marowak/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmonlee_still_front_pic:: @ 8D77E58
-	.incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonlee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonlee_palette:: @ 8D781CC
-	.incbin "graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonlee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmonlee_back_pic:: @ 8D781F4
-	.incbin "graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonlee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonlee_shiny_palette:: @ 8D78498
-	.incbin "graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonlee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmonlee_icon:: @ 8D784C0
-	.incbin "graphics/pokemon/icons/hitmonlee_icon.4bpp"
+	.incbin "graphics/pokemon/hitmonlee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmonlee_footprint:: @ 8D788C0
-	.incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmonlee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmonchan_still_front_pic:: @ 8D788E0
-	.incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonchan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonchan_palette:: @ 8D78C20
-	.incbin "graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonchan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmonchan_back_pic:: @ 8D78C48
-	.incbin "graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmonchan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmonchan_shiny_palette:: @ 8D78F8C
-	.incbin "graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmonchan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmonchan_icon:: @ 8D78FB4
-	.incbin "graphics/pokemon/icons/hitmonchan_icon.4bpp"
+	.incbin "graphics/pokemon/hitmonchan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmonchan_footprint:: @ 8D793B4
-	.incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmonchan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lickitung_still_front_pic:: @ 8D793D4
-	.incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lickitung/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lickitung_palette:: @ 8D797AC
-	.incbin "graphics/pokemon/palettes/lickitung_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lickitung/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lickitung_back_pic:: @ 8D797D4
-	.incbin "graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lickitung/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lickitung_shiny_palette:: @ 8D79A78
-	.incbin "graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lickitung/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lickitung_icon:: @ 8D79AA0
-	.incbin "graphics/pokemon/icons/lickitung_icon.4bpp"
+	.incbin "graphics/pokemon/lickitung/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lickitung_footprint:: @ 8D79EA0
-	.incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp"
+	.incbin "graphics/pokemon/lickitung/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_koffing_still_front_pic:: @ 8D79EC0
-	.incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/koffing/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_koffing_palette:: @ 8D7A1C0
-	.incbin "graphics/pokemon/palettes/koffing_palette.gbapal.lz"
+	.incbin "graphics/pokemon/koffing/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_koffing_back_pic:: @ 8D7A1E8
-	.incbin "graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/koffing/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_koffing_shiny_palette:: @ 8D7A4E8
-	.incbin "graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/koffing/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_koffing_icon:: @ 8D7A510
-	.incbin "graphics/pokemon/icons/koffing_icon.4bpp"
+	.incbin "graphics/pokemon/koffing/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_koffing_footprint:: @ 8D7A910
-	.incbin "graphics/pokemon/footprints/koffing_footprint.1bpp"
+	.incbin "graphics/pokemon/koffing/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_weezing_still_front_pic:: @ 8D7A930
-	.incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weezing/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weezing_palette:: @ 8D7ADEC
-	.incbin "graphics/pokemon/palettes/weezing_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weezing/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_weezing_back_pic:: @ 8D7AE14
-	.incbin "graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/weezing/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_weezing_shiny_palette:: @ 8D7B198
-	.incbin "graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/weezing/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_weezing_icon:: @ 8D7B1C0
-	.incbin "graphics/pokemon/icons/weezing_icon.4bpp"
+	.incbin "graphics/pokemon/weezing/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_weezing_footprint:: @ 8D7B5C0
-	.incbin "graphics/pokemon/footprints/weezing_footprint.1bpp"
+	.incbin "graphics/pokemon/weezing/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rhyhorn_still_front_pic:: @ 8D7B5E0
-	.incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhyhorn/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhyhorn_palette:: @ 8D7B9DC
-	.incbin "graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhyhorn/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rhyhorn_back_pic:: @ 8D7B9FC
-	.incbin "graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhyhorn/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhyhorn_shiny_palette:: @ 8D7BD44
-	.incbin "graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhyhorn/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rhyhorn_icon:: @ 8D7BD64
-	.incbin "graphics/pokemon/icons/rhyhorn_icon.4bpp"
+	.incbin "graphics/pokemon/rhyhorn/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rhyhorn_footprint:: @ 8D7C164
-	.incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp"
+	.incbin "graphics/pokemon/rhyhorn/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rhydon_still_front_pic:: @ 8D7C184
-	.incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhydon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhydon_palette:: @ 8D7C678
-	.incbin "graphics/pokemon/palettes/rhydon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhydon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rhydon_back_pic:: @ 8D7C6A0
-	.incbin "graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rhydon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rhydon_shiny_palette:: @ 8D7CAF0
-	.incbin "graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rhydon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rhydon_icon:: @ 8D7CB18
-	.incbin "graphics/pokemon/icons/rhydon_icon.4bpp"
+	.incbin "graphics/pokemon/rhydon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rhydon_footprint:: @ 8D7CF18
-	.incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp"
+	.incbin "graphics/pokemon/rhydon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chansey_still_front_pic:: @ 8D7CF38
-	.incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chansey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chansey_palette:: @ 8D7D274
-	.incbin "graphics/pokemon/palettes/chansey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chansey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chansey_back_pic:: @ 8D7D298
-	.incbin "graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chansey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chansey_shiny_palette:: @ 8D7D4E8
-	.incbin "graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chansey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chansey_icon:: @ 8D7D50C
-	.incbin "graphics/pokemon/icons/chansey_icon.4bpp"
+	.incbin "graphics/pokemon/chansey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chansey_footprint:: @ 8D7D90C
-	.incbin "graphics/pokemon/footprints/chansey_footprint.1bpp"
+	.incbin "graphics/pokemon/chansey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tangela_still_front_pic:: @ 8D7D92C
-	.incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tangela/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tangela_palette:: @ 8D7DD00
-	.incbin "graphics/pokemon/palettes/tangela_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tangela/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tangela_back_pic:: @ 8D7DD24
-	.incbin "graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tangela/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tangela_shiny_palette:: @ 8D7E0D0
-	.incbin "graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tangela/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tangela_icon:: @ 8D7E0F4
-	.incbin "graphics/pokemon/icons/tangela_icon.4bpp"
+	.incbin "graphics/pokemon/tangela/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tangela_footprint:: @ 8D7E4F4
-	.incbin "graphics/pokemon/footprints/tangela_footprint.1bpp"
+	.incbin "graphics/pokemon/tangela/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kangaskhan_still_front_pic:: @ 8D7E514
-	.incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kangaskhan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kangaskhan_palette:: @ 8D7E9BC
-	.incbin "graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kangaskhan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kangaskhan_back_pic:: @ 8D7E9E4
-	.incbin "graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kangaskhan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kangaskhan_shiny_palette:: @ 8D7EE14
-	.incbin "graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kangaskhan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kangaskhan_icon:: @ 8D7EE3C
-	.incbin "graphics/pokemon/icons/kangaskhan_icon.4bpp"
+	.incbin "graphics/pokemon/kangaskhan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kangaskhan_footprint:: @ 8D7F23C
-	.incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp"
+	.incbin "graphics/pokemon/kangaskhan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_horsea_still_front_pic:: @ 8D7F25C
-	.incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/horsea/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_horsea_palette:: @ 8D7F4C8
-	.incbin "graphics/pokemon/palettes/horsea_palette.gbapal.lz"
+	.incbin "graphics/pokemon/horsea/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_horsea_back_pic:: @ 8D7F4F0
-	.incbin "graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/horsea/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_horsea_shiny_palette:: @ 8D7F7D0
-	.incbin "graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/horsea/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_horsea_icon:: @ 8D7F7F8
-	.incbin "graphics/pokemon/icons/horsea_icon.4bpp"
+	.incbin "graphics/pokemon/horsea/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_horsea_footprint:: @ 8D7FBF8
-	.incbin "graphics/pokemon/footprints/horsea_footprint.1bpp"
+	.incbin "graphics/pokemon/horsea/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seadra_still_front_pic:: @ 8D7FC18
-	.incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seadra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seadra_palette:: @ 8D7FFA0
-	.incbin "graphics/pokemon/palettes/seadra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seadra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seadra_back_pic:: @ 8D7FFC8
-	.incbin "graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seadra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seadra_shiny_palette:: @ 8D80368
-	.incbin "graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seadra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seadra_icon:: @ 8D80390
-	.incbin "graphics/pokemon/icons/seadra_icon.4bpp"
+	.incbin "graphics/pokemon/seadra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seadra_footprint:: @ 8D80790
-	.incbin "graphics/pokemon/footprints/seadra_footprint.1bpp"
+	.incbin "graphics/pokemon/seadra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_goldeen_still_front_pic:: @ 8D807B0
-	.incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/goldeen/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_goldeen_palette:: @ 8D80B18
-	.incbin "graphics/pokemon/palettes/goldeen_palette.gbapal.lz"
+	.incbin "graphics/pokemon/goldeen/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_goldeen_back_pic:: @ 8D80B40
-	.incbin "graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/goldeen/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_goldeen_shiny_palette:: @ 8D80EB0
-	.incbin "graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/goldeen/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_goldeen_icon:: @ 8D80ED8
-	.incbin "graphics/pokemon/icons/goldeen_icon.4bpp"
+	.incbin "graphics/pokemon/goldeen/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_goldeen_footprint:: @ 8D812D8
-	.incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp"
+	.incbin "graphics/pokemon/goldeen/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seaking_still_front_pic:: @ 8D812F8
-	.incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seaking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seaking_palette:: @ 8D8176C
-	.incbin "graphics/pokemon/palettes/seaking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seaking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seaking_back_pic:: @ 8D81794
-	.incbin "graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seaking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seaking_shiny_palette:: @ 8D81AE4
-	.incbin "graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seaking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seaking_icon:: @ 8D81B0C
-	.incbin "graphics/pokemon/icons/seaking_icon.4bpp"
+	.incbin "graphics/pokemon/seaking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seaking_footprint:: @ 8D81F0C
-	.incbin "graphics/pokemon/footprints/seaking_footprint.1bpp"
+	.incbin "graphics/pokemon/seaking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_staryu_still_front_pic:: @ 8D81F2C
-	.incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/staryu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_staryu_palette:: @ 8D821DC
-	.incbin "graphics/pokemon/palettes/staryu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/staryu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_staryu_back_pic:: @ 8D82204
-	.incbin "graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/staryu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_staryu_shiny_palette:: @ 8D8246C
-	.incbin "graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/staryu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_staryu_icon:: @ 8D82494
-	.incbin "graphics/pokemon/icons/staryu_icon.4bpp"
+	.incbin "graphics/pokemon/staryu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_staryu_footprint:: @ 8D82894
-	.incbin "graphics/pokemon/footprints/staryu_footprint.1bpp"
+	.incbin "graphics/pokemon/staryu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_starmie_still_front_pic:: @ 8D828B4
-	.incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/starmie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_starmie_palette:: @ 8D82C54
-	.incbin "graphics/pokemon/palettes/starmie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/starmie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_starmie_back_pic:: @ 8D82C7C
-	.incbin "graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/starmie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_starmie_shiny_palette:: @ 8D82F20
-	.incbin "graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/starmie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_starmie_icon:: @ 8D82F48
-	.incbin "graphics/pokemon/icons/starmie_icon.4bpp"
+	.incbin "graphics/pokemon/starmie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_starmie_footprint:: @ 8D83348
-	.incbin "graphics/pokemon/footprints/starmie_footprint.1bpp"
+	.incbin "graphics/pokemon/starmie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mr_mime_still_front_pic:: @ 8D83368
-	.incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mr_mime/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mr_mime_palette:: @ 8D83724
-	.incbin "graphics/pokemon/palettes/mr_mime_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mr_mime/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mr_mime_back_pic:: @ 8D8374C
-	.incbin "graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mr_mime/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mr_mime_shiny_palette:: @ 8D83A80
-	.incbin "graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mr_mime/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mr_mime_icon:: @ 8D83AA8
-	.incbin "graphics/pokemon/icons/mr_mime_icon.4bpp"
+	.incbin "graphics/pokemon/mr_mime/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mr_mime_footprint:: @ 8D83EA8
-	.incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp"
+	.incbin "graphics/pokemon/mr_mime/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_scyther_still_front_pic:: @ 8D83EC8
-	.incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scyther/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scyther_palette:: @ 8D842F0
-	.incbin "graphics/pokemon/palettes/scyther_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scyther/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_scyther_back_pic:: @ 8D84318
-	.incbin "graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scyther/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scyther_shiny_palette:: @ 8D84730
-	.incbin "graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scyther/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_scyther_icon:: @ 8D84758
-	.incbin "graphics/pokemon/icons/scyther_icon.4bpp"
+	.incbin "graphics/pokemon/scyther/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_scyther_footprint:: @ 8D84B58
-	.incbin "graphics/pokemon/footprints/scyther_footprint.1bpp"
+	.incbin "graphics/pokemon/scyther/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jynx_still_front_pic:: @ 8D84B78
-	.incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jynx/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jynx_palette:: @ 8D84F44
-	.incbin "graphics/pokemon/palettes/jynx_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jynx/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jynx_back_pic:: @ 8D84F6C
-	.incbin "graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jynx/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jynx_shiny_palette:: @ 8D85258
-	.incbin "graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jynx/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jynx_icon:: @ 8D85280
-	.incbin "graphics/pokemon/icons/jynx_icon.4bpp"
+	.incbin "graphics/pokemon/jynx/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jynx_footprint:: @ 8D85680
-	.incbin "graphics/pokemon/footprints/jynx_footprint.1bpp"
+	.incbin "graphics/pokemon/jynx/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electabuzz_still_front_pic:: @ 8D856A0
-	.incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electabuzz/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electabuzz_palette:: @ 8D85AF8
-	.incbin "graphics/pokemon/palettes/electabuzz_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electabuzz/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electabuzz_back_pic:: @ 8D85B20
-	.incbin "graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electabuzz/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electabuzz_shiny_palette:: @ 8D85E30
-	.incbin "graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electabuzz/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electabuzz_icon:: @ 8D85E58
-	.incbin "graphics/pokemon/icons/electabuzz_icon.4bpp"
+	.incbin "graphics/pokemon/electabuzz/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electabuzz_footprint:: @ 8D86258
-	.incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp"
+	.incbin "graphics/pokemon/electabuzz/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magmar_still_front_pic:: @ 8D86278
-	.incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magmar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magmar_palette:: @ 8D866A8
-	.incbin "graphics/pokemon/palettes/magmar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magmar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magmar_back_pic:: @ 8D866D0
-	.incbin "graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magmar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magmar_shiny_palette:: @ 8D86A08
-	.incbin "graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magmar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magmar_icon:: @ 8D86A30
-	.incbin "graphics/pokemon/icons/magmar_icon.4bpp"
+	.incbin "graphics/pokemon/magmar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magmar_footprint:: @ 8D86E30
-	.incbin "graphics/pokemon/footprints/magmar_footprint.1bpp"
+	.incbin "graphics/pokemon/magmar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pinsir_still_front_pic:: @ 8D86E50
-	.incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pinsir/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pinsir_palette:: @ 8D87280
-	.incbin "graphics/pokemon/palettes/pinsir_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pinsir/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pinsir_back_pic:: @ 8D872A4
-	.incbin "graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pinsir/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pinsir_shiny_palette:: @ 8D875F8
-	.incbin "graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pinsir/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pinsir_icon:: @ 8D8761C
-	.incbin "graphics/pokemon/icons/pinsir_icon.4bpp"
+	.incbin "graphics/pokemon/pinsir/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pinsir_footprint:: @ 8D87A1C
-	.incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp"
+	.incbin "graphics/pokemon/pinsir/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tauros_still_front_pic:: @ 8D87A3C
-	.incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tauros/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tauros_palette:: @ 8D87E9C
-	.incbin "graphics/pokemon/palettes/tauros_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tauros/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tauros_back_pic:: @ 8D87EC4
-	.incbin "graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tauros/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tauros_shiny_palette:: @ 8D88178
-	.incbin "graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tauros/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tauros_icon:: @ 8D881A0
-	.incbin "graphics/pokemon/icons/tauros_icon.4bpp"
+	.incbin "graphics/pokemon/tauros/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tauros_footprint:: @ 8D885A0
-	.incbin "graphics/pokemon/footprints/tauros_footprint.1bpp"
+	.incbin "graphics/pokemon/tauros/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magikarp_still_front_pic:: @ 8D885C0
-	.incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magikarp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magikarp_palette:: @ 8D88908
-	.incbin "graphics/pokemon/palettes/magikarp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magikarp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magikarp_back_pic:: @ 8D88930
-	.incbin "graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magikarp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magikarp_shiny_palette:: @ 8D88C60
-	.incbin "graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magikarp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magikarp_icon:: @ 8D88C88
-	.incbin "graphics/pokemon/icons/magikarp_icon.4bpp"
+	.incbin "graphics/pokemon/magikarp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magikarp_footprint:: @ 8D89088
-	.incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp"
+	.incbin "graphics/pokemon/magikarp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gyarados_still_front_pic:: @ 8D890A8
-	.incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gyarados/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gyarados_palette:: @ 8D8964C
-	.incbin "graphics/pokemon/palettes/gyarados_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gyarados/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gyarados_back_pic:: @ 8D89674
-	.incbin "graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gyarados/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gyarados_shiny_palette:: @ 8D89B2C
-	.incbin "graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gyarados/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gyarados_icon:: @ 8D89B54
-	.incbin "graphics/pokemon/icons/gyarados_icon.4bpp"
+	.incbin "graphics/pokemon/gyarados/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gyarados_footprint:: @ 8D89F54
-	.incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp"
+	.incbin "graphics/pokemon/gyarados/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lapras_still_front_pic:: @ 8D89F74
-	.incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lapras/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lapras_palette:: @ 8D8A354
-	.incbin "graphics/pokemon/palettes/lapras_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lapras/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lapras_back_pic:: @ 8D8A37C
-	.incbin "graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lapras/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lapras_shiny_palette:: @ 8D8A6C0
-	.incbin "graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lapras/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lapras_icon:: @ 8D8A6E8
-	.incbin "graphics/pokemon/icons/lapras_icon.4bpp"
+	.incbin "graphics/pokemon/lapras/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lapras_footprint:: @ 8D8AAE8
-	.incbin "graphics/pokemon/footprints/lapras_footprint.1bpp"
+	.incbin "graphics/pokemon/lapras/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ditto_still_front_pic:: @ 8D8AB08
-	.incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ditto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ditto_palette:: @ 8D8ACF8
-	.incbin "graphics/pokemon/palettes/ditto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ditto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ditto_back_pic:: @ 8D8AD18
-	.incbin "graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ditto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ditto_shiny_palette:: @ 8D8AF18
-	.incbin "graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ditto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ditto_icon:: @ 8D8AF38
-	.incbin "graphics/pokemon/icons/ditto_icon.4bpp"
+	.incbin "graphics/pokemon/ditto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ditto_footprint:: @ 8D8B338
-	.incbin "graphics/pokemon/footprints/ditto_footprint.1bpp"
+	.incbin "graphics/pokemon/ditto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_eevee_still_front_pic:: @ 8D8B358
-	.incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/eevee/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_eevee_palette:: @ 8D8B644
-	.incbin "graphics/pokemon/palettes/eevee_palette.gbapal.lz"
+	.incbin "graphics/pokemon/eevee/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_eevee_back_pic:: @ 8D8B66C
-	.incbin "graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/eevee/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_eevee_shiny_palette:: @ 8D8B994
-	.incbin "graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/eevee/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_eevee_icon:: @ 8D8B9BC
-	.incbin "graphics/pokemon/icons/eevee_icon.4bpp"
+	.incbin "graphics/pokemon/eevee/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_eevee_footprint:: @ 8D8BDBC
-	.incbin "graphics/pokemon/footprints/eevee_footprint.1bpp"
+	.incbin "graphics/pokemon/eevee/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vaporeon_still_front_pic:: @ 8D8BDDC
-	.incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vaporeon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vaporeon_palette:: @ 8D8C170
-	.incbin "graphics/pokemon/palettes/vaporeon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vaporeon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vaporeon_back_pic:: @ 8D8C198
-	.incbin "graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vaporeon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vaporeon_shiny_palette:: @ 8D8C460
-	.incbin "graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vaporeon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vaporeon_icon:: @ 8D8C488
-	.incbin "graphics/pokemon/icons/vaporeon_icon.4bpp"
+	.incbin "graphics/pokemon/vaporeon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vaporeon_footprint:: @ 8D8C888
-	.incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp"
+	.incbin "graphics/pokemon/vaporeon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jolteon_still_front_pic:: @ 8D8C8A8
-	.incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jolteon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jolteon_palette:: @ 8D8CBF8
-	.incbin "graphics/pokemon/palettes/jolteon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jolteon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jolteon_back_pic:: @ 8D8CC20
-	.incbin "graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jolteon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jolteon_shiny_palette:: @ 8D8CFCC
-	.incbin "graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jolteon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jolteon_icon:: @ 8D8CFF4
-	.incbin "graphics/pokemon/icons/jolteon_icon.4bpp"
+	.incbin "graphics/pokemon/jolteon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jolteon_footprint:: @ 8D8D3F4
-	.incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp"
+	.incbin "graphics/pokemon/jolteon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flareon_still_front_pic:: @ 8D8D414
-	.incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flareon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flareon_palette:: @ 8D8D798
-	.incbin "graphics/pokemon/palettes/flareon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flareon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flareon_back_pic:: @ 8D8D7C0
-	.incbin "graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flareon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flareon_shiny_palette:: @ 8D8DB50
-	.incbin "graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flareon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flareon_icon:: @ 8D8DB78
-	.incbin "graphics/pokemon/icons/flareon_icon.4bpp"
+	.incbin "graphics/pokemon/flareon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flareon_footprint:: @ 8D8DF78
-	.incbin "graphics/pokemon/footprints/flareon_footprint.1bpp"
+	.incbin "graphics/pokemon/flareon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_porygon_still_front_pic:: @ 8D8DF98
-	.incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon_palette:: @ 8D8E250
-	.incbin "graphics/pokemon/palettes/porygon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_porygon_back_pic:: @ 8D8E274
-	.incbin "graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon_shiny_palette:: @ 8D8E52C
-	.incbin "graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_porygon_icon:: @ 8D8E550
-	.incbin "graphics/pokemon/icons/porygon_icon.4bpp"
+	.incbin "graphics/pokemon/porygon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_porygon_footprint:: @ 8D8E950
-	.incbin "graphics/pokemon/footprints/porygon_footprint.1bpp"
+	.incbin "graphics/pokemon/porygon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_omanyte_still_front_pic:: @ 8D8E970
-	.incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omanyte/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omanyte_palette:: @ 8D8EC00
-	.incbin "graphics/pokemon/palettes/omanyte_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omanyte/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_omanyte_back_pic:: @ 8D8EC28
-	.incbin "graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omanyte/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omanyte_shiny_palette:: @ 8D8EF74
-	.incbin "graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omanyte/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_omanyte_icon:: @ 8D8EF9C
-	.incbin "graphics/pokemon/icons/omanyte_icon.4bpp"
+	.incbin "graphics/pokemon/omanyte/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_omanyte_footprint:: @ 8D8F39C
-	.incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp"
+	.incbin "graphics/pokemon/omanyte/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_omastar_still_front_pic:: @ 8D8F3BC
-	.incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omastar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omastar_palette:: @ 8D8F77C
-	.incbin "graphics/pokemon/palettes/omastar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omastar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_omastar_back_pic:: @ 8D8F7A4
-	.incbin "graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/omastar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_omastar_shiny_palette:: @ 8D8FAE4
-	.incbin "graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/omastar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_omastar_icon:: @ 8D8FB0C
-	.incbin "graphics/pokemon/icons/omastar_icon.4bpp"
+	.incbin "graphics/pokemon/omastar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_omastar_footprint:: @ 8D8FF0C
-	.incbin "graphics/pokemon/footprints/omastar_footprint.1bpp"
+	.incbin "graphics/pokemon/omastar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kabuto_still_front_pic:: @ 8D8FF2C
-	.incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabuto/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabuto_palette:: @ 8D90154
-	.incbin "graphics/pokemon/palettes/kabuto_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabuto/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kabuto_back_pic:: @ 8D9017C
-	.incbin "graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabuto/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabuto_shiny_palette:: @ 8D90414
-	.incbin "graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabuto/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kabuto_icon:: @ 8D9043C
-	.incbin "graphics/pokemon/icons/kabuto_icon.4bpp"
+	.incbin "graphics/pokemon/kabuto/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kabuto_footprint:: @ 8D9083C
-	.incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp"
+	.incbin "graphics/pokemon/kabuto/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kabutops_still_front_pic:: @ 8D9085C
-	.incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabutops/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabutops_palette:: @ 8D90C6C
-	.incbin "graphics/pokemon/palettes/kabutops_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabutops/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kabutops_back_pic:: @ 8D90C90
-	.incbin "graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kabutops/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kabutops_shiny_palette:: @ 8D91034
-	.incbin "graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kabutops/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kabutops_icon:: @ 8D91058
-	.incbin "graphics/pokemon/icons/kabutops_icon.4bpp"
+	.incbin "graphics/pokemon/kabutops/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kabutops_footprint:: @ 8D91458
-	.incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp"
+	.incbin "graphics/pokemon/kabutops/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aerodactyl_still_front_pic:: @ 8D91478
-	.incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aerodactyl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aerodactyl_palette:: @ 8D918C8
-	.incbin "graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aerodactyl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aerodactyl_back_pic:: @ 8D918F0
-	.incbin "graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aerodactyl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aerodactyl_shiny_palette:: @ 8D91BF4
-	.incbin "graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aerodactyl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aerodactyl_icon:: @ 8D91C1C
-	.incbin "graphics/pokemon/icons/aerodactyl_icon.4bpp"
+	.incbin "graphics/pokemon/aerodactyl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aerodactyl_footprint:: @ 8D9201C
-	.incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp"
+	.incbin "graphics/pokemon/aerodactyl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snorlax_still_front_pic:: @ 8D9203C
-	.incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorlax/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorlax_palette:: @ 8D92410
-	.incbin "graphics/pokemon/palettes/snorlax_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorlax/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snorlax_back_pic:: @ 8D92438
-	.incbin "graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorlax/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorlax_shiny_palette:: @ 8D92654
-	.incbin "graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorlax/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snorlax_icon:: @ 8D9267C
-	.incbin "graphics/pokemon/icons/snorlax_icon.4bpp"
+	.incbin "graphics/pokemon/snorlax/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snorlax_footprint:: @ 8D92A7C
-	.incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp"
+	.incbin "graphics/pokemon/snorlax/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_articuno_still_front_pic:: @ 8D92A9C
-	.incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/articuno/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_articuno_palette:: @ 8D92F94
-	.incbin "graphics/pokemon/palettes/articuno_palette.gbapal.lz"
+	.incbin "graphics/pokemon/articuno/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_articuno_back_pic:: @ 8D92FBC
-	.incbin "graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/articuno/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_articuno_shiny_palette:: @ 8D93218
-	.incbin "graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/articuno/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_articuno_icon:: @ 8D93240
-	.incbin "graphics/pokemon/icons/articuno_icon.4bpp"
+	.incbin "graphics/pokemon/articuno/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_articuno_footprint:: @ 8D93640
-	.incbin "graphics/pokemon/footprints/articuno_footprint.1bpp"
+	.incbin "graphics/pokemon/articuno/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zapdos_still_front_pic:: @ 8D93660
-	.incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zapdos/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zapdos_palette:: @ 8D93AB0
-	.incbin "graphics/pokemon/palettes/zapdos_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zapdos/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zapdos_back_pic:: @ 8D93AD8
-	.incbin "graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zapdos/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zapdos_shiny_palette:: @ 8D93E14
-	.incbin "graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zapdos/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zapdos_icon:: @ 8D93E3C
-	.incbin "graphics/pokemon/icons/zapdos_icon.4bpp"
+	.incbin "graphics/pokemon/zapdos/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zapdos_footprint:: @ 8D9423C
-	.incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp"
+	.incbin "graphics/pokemon/zapdos/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_moltres_still_front_pic:: @ 8D9425C
-	.incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/moltres/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_moltres_palette:: @ 8D94728
-	.incbin "graphics/pokemon/palettes/moltres_palette.gbapal.lz"
+	.incbin "graphics/pokemon/moltres/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_moltres_back_pic:: @ 8D94750
-	.incbin "graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/moltres/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_moltres_shiny_palette:: @ 8D94A8C
-	.incbin "graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/moltres/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_moltres_icon:: @ 8D94AB4
-	.incbin "graphics/pokemon/icons/moltres_icon.4bpp"
+	.incbin "graphics/pokemon/moltres/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_moltres_footprint:: @ 8D94EB4
-	.incbin "graphics/pokemon/footprints/moltres_footprint.1bpp"
+	.incbin "graphics/pokemon/moltres/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dratini_still_front_pic:: @ 8D94ED4
-	.incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dratini/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dratini_palette:: @ 8D95190
-	.incbin "graphics/pokemon/palettes/dratini_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dratini/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dratini_back_pic:: @ 8D951B4
-	.incbin "graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dratini/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dratini_shiny_palette:: @ 8D95444
-	.incbin "graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dratini/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dratini_icon:: @ 8D95468
-	.incbin "graphics/pokemon/icons/dratini_icon.4bpp"
+	.incbin "graphics/pokemon/dratini/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dratini_footprint:: @ 8D95868
-	.incbin "graphics/pokemon/footprints/dratini_footprint.1bpp"
+	.incbin "graphics/pokemon/dratini/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dragonair_still_front_pic:: @ 8D95888
-	.incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonair/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonair_palette:: @ 8D95C20
-	.incbin "graphics/pokemon/palettes/dragonair_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonair/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dragonair_back_pic:: @ 8D95C48
-	.incbin "graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonair/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonair_shiny_palette:: @ 8D95F58
-	.incbin "graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonair/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dragonair_icon:: @ 8D95F80
-	.incbin "graphics/pokemon/icons/dragonair_icon.4bpp"
+	.incbin "graphics/pokemon/dragonair/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dragonair_footprint:: @ 8D96380
-	.incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp"
+	.incbin "graphics/pokemon/dragonair/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dragonite_still_front_pic:: @ 8D963A0
-	.incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonite_palette:: @ 8D968F0
-	.incbin "graphics/pokemon/palettes/dragonite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dragonite_back_pic:: @ 8D96918
-	.incbin "graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dragonite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dragonite_shiny_palette:: @ 8D96C10
-	.incbin "graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dragonite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dragonite_icon:: @ 8D96C38
-	.incbin "graphics/pokemon/icons/dragonite_icon.4bpp"
+	.incbin "graphics/pokemon/dragonite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dragonite_footprint:: @ 8D97038
-	.incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp"
+	.incbin "graphics/pokemon/dragonite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mewtwo_still_front_pic:: @ 8D97058
-	.incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mewtwo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mewtwo_palette:: @ 8D97494
-	.incbin "graphics/pokemon/palettes/mewtwo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mewtwo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mewtwo_back_pic:: @ 8D974B8
-	.incbin "graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mewtwo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mewtwo_shiny_palette:: @ 8D97884
-	.incbin "graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mewtwo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mewtwo_icon:: @ 8D978A8
-	.incbin "graphics/pokemon/icons/mewtwo_icon.4bpp"
+	.incbin "graphics/pokemon/mewtwo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mewtwo_footprint:: @ 8D97CA8
-	.incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp"
+	.incbin "graphics/pokemon/mewtwo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mew_still_front_pic:: @ 8D97CC8
-	.incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mew/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mew_palette:: @ 8D97F88
-	.incbin "graphics/pokemon/palettes/mew_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mew/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mew_back_pic:: @ 8D97FAC
-	.incbin "graphics/pokemon/back_pics/mew_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mew/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mew_shiny_palette:: @ 8D982FC
-	.incbin "graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mew/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mew_icon:: @ 8D98320
-	.incbin "graphics/pokemon/icons/mew_icon.4bpp"
+	.incbin "graphics/pokemon/mew/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mew_footprint:: @ 8D98720
-	.incbin "graphics/pokemon/footprints/mew_footprint.1bpp"
+	.incbin "graphics/pokemon/mew/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chikorita_still_front_pic:: @ 8D98740
-	.incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chikorita/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chikorita_palette:: @ 8D989A8
-	.incbin "graphics/pokemon/palettes/chikorita_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chikorita/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chikorita_back_pic:: @ 8D989D0
-	.incbin "graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chikorita/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chikorita_shiny_palette:: @ 8D98C94
-	.incbin "graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chikorita/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chikorita_icon:: @ 8D98CBC
-	.incbin "graphics/pokemon/icons/chikorita_icon.4bpp"
+	.incbin "graphics/pokemon/chikorita/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chikorita_footprint:: @ 8D990BC
-	.incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp"
+	.incbin "graphics/pokemon/chikorita/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bayleef_still_front_pic:: @ 8D990DC
-	.incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bayleef/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bayleef_palette:: @ 8D994B0
-	.incbin "graphics/pokemon/palettes/bayleef_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bayleef/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bayleef_back_pic:: @ 8D994D8
-	.incbin "graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bayleef/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bayleef_shiny_palette:: @ 8D99868
-	.incbin "graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bayleef/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bayleef_icon:: @ 8D99890
-	.incbin "graphics/pokemon/icons/bayleef_icon.4bpp"
+	.incbin "graphics/pokemon/bayleef/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bayleef_footprint:: @ 8D99C90
-	.incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp"
+	.incbin "graphics/pokemon/bayleef/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meganium_still_front_pic:: @ 8D99CB0
-	.incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meganium/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meganium_palette:: @ 8D9A20C
-	.incbin "graphics/pokemon/palettes/meganium_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meganium/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meganium_back_pic:: @ 8D9A234
-	.incbin "graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meganium/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meganium_shiny_palette:: @ 8D9A584
-	.incbin "graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meganium/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meganium_icon:: @ 8D9A5AC
-	.incbin "graphics/pokemon/icons/meganium_icon.4bpp"
+	.incbin "graphics/pokemon/meganium/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meganium_footprint:: @ 8D9A9AC
-	.incbin "graphics/pokemon/footprints/meganium_footprint.1bpp"
+	.incbin "graphics/pokemon/meganium/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cyndaquil_still_front_pic:: @ 8D9A9CC
-	.incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cyndaquil/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cyndaquil_palette:: @ 8D9AC58
-	.incbin "graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cyndaquil/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cyndaquil_back_pic:: @ 8D9AC80
-	.incbin "graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cyndaquil/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cyndaquil_shiny_palette:: @ 8D9AFAC
-	.incbin "graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cyndaquil/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cyndaquil_icon:: @ 8D9AFD4
-	.incbin "graphics/pokemon/icons/cyndaquil_icon.4bpp"
+	.incbin "graphics/pokemon/cyndaquil/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cyndaquil_footprint:: @ 8D9B3D4
-	.incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp"
+	.incbin "graphics/pokemon/cyndaquil/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_quilava_still_front_pic:: @ 8D9B3F4
-	.incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quilava/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quilava_palette:: @ 8D9B710
-	.incbin "graphics/pokemon/palettes/quilava_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quilava/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_quilava_back_pic:: @ 8D9B738
-	.incbin "graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quilava/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quilava_shiny_palette:: @ 8D9BAAC
-	.incbin "graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quilava/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_quilava_icon:: @ 8D9BAD4
-	.incbin "graphics/pokemon/icons/quilava_icon.4bpp"
+	.incbin "graphics/pokemon/quilava/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_quilava_footprint:: @ 8D9BED4
-	.incbin "graphics/pokemon/footprints/quilava_footprint.1bpp"
+	.incbin "graphics/pokemon/quilava/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_typhlosion_still_front_pic:: @ 8D9BEF4
-	.incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/typhlosion/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_typhlosion_palette:: @ 8D9C31C
-	.incbin "graphics/pokemon/palettes/typhlosion_palette.gbapal.lz"
+	.incbin "graphics/pokemon/typhlosion/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_typhlosion_back_pic:: @ 8D9C344
-	.incbin "graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/typhlosion/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_typhlosion_shiny_palette:: @ 8D9C748
-	.incbin "graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/typhlosion/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_typhlosion_icon:: @ 8D9C770
-	.incbin "graphics/pokemon/icons/typhlosion_icon.4bpp"
+	.incbin "graphics/pokemon/typhlosion/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_typhlosion_footprint:: @ 8D9CB70
-	.incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp"
+	.incbin "graphics/pokemon/typhlosion/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_totodile_still_front_pic:: @ 8D9CB90
-	.incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/totodile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_totodile_palette:: @ 8D9CE34
-	.incbin "graphics/pokemon/palettes/totodile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/totodile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_totodile_back_pic:: @ 8D9CE5C
-	.incbin "graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/totodile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_totodile_shiny_palette:: @ 8D9D13C
-	.incbin "graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/totodile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_totodile_icon:: @ 8D9D164
-	.incbin "graphics/pokemon/icons/totodile_icon.4bpp"
+	.incbin "graphics/pokemon/totodile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_totodile_footprint:: @ 8D9D564
-	.incbin "graphics/pokemon/footprints/totodile_footprint.1bpp"
+	.incbin "graphics/pokemon/totodile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_croconaw_still_front_pic:: @ 8D9D584
-	.incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/croconaw/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_croconaw_palette:: @ 8D9D8EC
-	.incbin "graphics/pokemon/palettes/croconaw_palette.gbapal.lz"
+	.incbin "graphics/pokemon/croconaw/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_croconaw_back_pic:: @ 8D9D914
-	.incbin "graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/croconaw/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_croconaw_shiny_palette:: @ 8D9DC64
-	.incbin "graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/croconaw/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_croconaw_icon:: @ 8D9DC8C
-	.incbin "graphics/pokemon/icons/croconaw_icon.4bpp"
+	.incbin "graphics/pokemon/croconaw/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_croconaw_footprint:: @ 8D9E08C
-	.incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp"
+	.incbin "graphics/pokemon/croconaw/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_feraligatr_still_front_pic:: @ 8D9E0AC
-	.incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feraligatr/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feraligatr_palette:: @ 8D9E618
-	.incbin "graphics/pokemon/palettes/feraligatr_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feraligatr/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_feraligatr_back_pic:: @ 8D9E640
-	.incbin "graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feraligatr/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feraligatr_shiny_palette:: @ 8D9EB0C
-	.incbin "graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feraligatr/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_feraligatr_icon:: @ 8D9EB34
-	.incbin "graphics/pokemon/icons/feraligatr_icon.4bpp"
+	.incbin "graphics/pokemon/feraligatr/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_feraligatr_footprint:: @ 8D9EF34
-	.incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp"
+	.incbin "graphics/pokemon/feraligatr/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sentret_still_front_pic:: @ 8D9EF54
-	.incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sentret/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sentret_palette:: @ 8D9F230
-	.incbin "graphics/pokemon/palettes/sentret_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sentret/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sentret_back_pic:: @ 8D9F258
-	.incbin "graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sentret/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sentret_shiny_palette:: @ 8D9F4FC
-	.incbin "graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sentret/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sentret_icon:: @ 8D9F524
-	.incbin "graphics/pokemon/icons/sentret_icon.4bpp"
+	.incbin "graphics/pokemon/sentret/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sentret_footprint:: @ 8D9F924
-	.incbin "graphics/pokemon/footprints/sentret_footprint.1bpp"
+	.incbin "graphics/pokemon/sentret/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_furret_still_front_pic:: @ 8D9F944
-	.incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/furret/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_furret_palette:: @ 8D9FC78
-	.incbin "graphics/pokemon/palettes/furret_palette.gbapal.lz"
+	.incbin "graphics/pokemon/furret/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_furret_back_pic:: @ 8D9FCA0
-	.incbin "graphics/pokemon/back_pics/furret_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/furret/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_furret_shiny_palette:: @ 8D9FFC8
-	.incbin "graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/furret/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_furret_icon:: @ 8D9FFF0
-	.incbin "graphics/pokemon/icons/furret_icon.4bpp"
+	.incbin "graphics/pokemon/furret/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_furret_footprint:: @ 8DA03F0
-	.incbin "graphics/pokemon/footprints/furret_footprint.1bpp"
+	.incbin "graphics/pokemon/furret/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hoothoot_still_front_pic:: @ 8DA0410
-	.incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoothoot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoothoot_palette:: @ 8DA0694
-	.incbin "graphics/pokemon/palettes/hoothoot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoothoot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hoothoot_back_pic:: @ 8DA06BC
-	.incbin "graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoothoot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoothoot_shiny_palette:: @ 8DA09C4
-	.incbin "graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoothoot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hoothoot_icon:: @ 8DA09EC
-	.incbin "graphics/pokemon/icons/hoothoot_icon.4bpp"
+	.incbin "graphics/pokemon/hoothoot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hoothoot_footprint:: @ 8DA0DEC
-	.incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp"
+	.incbin "graphics/pokemon/hoothoot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_noctowl_still_front_pic:: @ 8DA0E0C
-	.incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/noctowl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_noctowl_palette:: @ 8DA1160
-	.incbin "graphics/pokemon/palettes/noctowl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/noctowl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_noctowl_back_pic:: @ 8DA1188
-	.incbin "graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/noctowl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_noctowl_shiny_palette:: @ 8DA14E4
-	.incbin "graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/noctowl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_noctowl_icon:: @ 8DA150C
-	.incbin "graphics/pokemon/icons/noctowl_icon.4bpp"
+	.incbin "graphics/pokemon/noctowl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_noctowl_footprint:: @ 8DA190C
-	.incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp"
+	.incbin "graphics/pokemon/noctowl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ledyba_still_front_pic:: @ 8DA192C
-	.incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledyba/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledyba_palette:: @ 8DA1C20
-	.incbin "graphics/pokemon/palettes/ledyba_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledyba/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ledyba_back_pic:: @ 8DA1C48
-	.incbin "graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledyba/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledyba_shiny_palette:: @ 8DA1F78
-	.incbin "graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledyba/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ledyba_icon:: @ 8DA1FA0
-	.incbin "graphics/pokemon/icons/ledyba_icon.4bpp"
+	.incbin "graphics/pokemon/ledyba/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ledyba_footprint:: @ 8DA23A0
-	.incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp"
+	.incbin "graphics/pokemon/ledyba/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ledian_still_front_pic:: @ 8DA23C0
-	.incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledian/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledian_palette:: @ 8DA2748
-	.incbin "graphics/pokemon/palettes/ledian_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledian/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ledian_back_pic:: @ 8DA2770
-	.incbin "graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ledian/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ledian_shiny_palette:: @ 8DA2AC8
-	.incbin "graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ledian/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ledian_icon:: @ 8DA2AF0
-	.incbin "graphics/pokemon/icons/ledian_icon.4bpp"
+	.incbin "graphics/pokemon/ledian/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ledian_footprint:: @ 8DA2EF0
-	.incbin "graphics/pokemon/footprints/ledian_footprint.1bpp"
+	.incbin "graphics/pokemon/ledian/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spinarak_still_front_pic:: @ 8DA2F10
-	.incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinarak/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinarak_palette:: @ 8DA3184
-	.incbin "graphics/pokemon/palettes/spinarak_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinarak/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spinarak_back_pic:: @ 8DA31AC
-	.incbin "graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinarak/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinarak_shiny_palette:: @ 8DA3410
-	.incbin "graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinarak/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spinarak_icon:: @ 8DA3438
-	.incbin "graphics/pokemon/icons/spinarak_icon.4bpp"
+	.incbin "graphics/pokemon/spinarak/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spinarak_footprint:: @ 8DA3838
-	.incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp"
+	.incbin "graphics/pokemon/spinarak/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ariados_still_front_pic:: @ 8DA3858
-	.incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ariados/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ariados_palette:: @ 8DA3C18
-	.incbin "graphics/pokemon/palettes/ariados_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ariados/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ariados_back_pic:: @ 8DA3C40
-	.incbin "graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ariados/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ariados_shiny_palette:: @ 8DA3FB8
-	.incbin "graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ariados/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ariados_icon:: @ 8DA3FE0
-	.incbin "graphics/pokemon/icons/ariados_icon.4bpp"
+	.incbin "graphics/pokemon/ariados/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ariados_footprint:: @ 8DA43E0
-	.incbin "graphics/pokemon/footprints/ariados_footprint.1bpp"
+	.incbin "graphics/pokemon/ariados/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_crobat_still_front_pic:: @ 8DA4400
-	.incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crobat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crobat_palette:: @ 8DA47B0
-	.incbin "graphics/pokemon/palettes/crobat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crobat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_crobat_back_pic:: @ 8DA47D8
-	.incbin "graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crobat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crobat_shiny_palette:: @ 8DA4AE0
-	.incbin "graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crobat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_crobat_icon:: @ 8DA4B08
-	.incbin "graphics/pokemon/icons/crobat_icon.4bpp"
+	.incbin "graphics/pokemon/crobat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_crobat_footprint:: @ 8DA4F08
-	.incbin "graphics/pokemon/footprints/crobat_footprint.1bpp"
+	.incbin "graphics/pokemon/crobat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chinchou_still_front_pic:: @ 8DA4F28
-	.incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chinchou/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chinchou_palette:: @ 8DA5200
-	.incbin "graphics/pokemon/palettes/chinchou_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chinchou/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chinchou_back_pic:: @ 8DA5228
-	.incbin "graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chinchou/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chinchou_shiny_palette:: @ 8DA5520
-	.incbin "graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chinchou/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chinchou_icon:: @ 8DA5548
-	.incbin "graphics/pokemon/icons/chinchou_icon.4bpp"
+	.incbin "graphics/pokemon/chinchou/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chinchou_footprint:: @ 8DA5948
-	.incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp"
+	.incbin "graphics/pokemon/chinchou/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lanturn_still_front_pic:: @ 8DA5968
-	.incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lanturn/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lanturn_palette:: @ 8DA5CD8
-	.incbin "graphics/pokemon/palettes/lanturn_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lanturn/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lanturn_back_pic:: @ 8DA5D00
-	.incbin "graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lanturn/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lanturn_shiny_palette:: @ 8DA6000
-	.incbin "graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lanturn/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lanturn_icon:: @ 8DA6028
-	.incbin "graphics/pokemon/icons/lanturn_icon.4bpp"
+	.incbin "graphics/pokemon/lanturn/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lanturn_footprint:: @ 8DA6428
-	.incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp"
+	.incbin "graphics/pokemon/lanturn/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pichu_still_front_pic:: @ 8DA6448
-	.incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pichu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pichu_palette:: @ 8DA6664
-	.incbin "graphics/pokemon/palettes/pichu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pichu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pichu_back_pic:: @ 8DA668C
-	.incbin "graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pichu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pichu_shiny_palette:: @ 8DA68E8
-	.incbin "graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pichu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pichu_icon:: @ 8DA6910
-	.incbin "graphics/pokemon/icons/pichu_icon.4bpp"
+	.incbin "graphics/pokemon/pichu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pichu_footprint:: @ 8DA6D10
-	.incbin "graphics/pokemon/footprints/pichu_footprint.1bpp"
+	.incbin "graphics/pokemon/pichu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cleffa_still_front_pic:: @ 8DA6D30
-	.incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cleffa/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cleffa_palette:: @ 8DA6F10
-	.incbin "graphics/pokemon/palettes/cleffa_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cleffa/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cleffa_back_pic:: @ 8DA6F38
-	.incbin "graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cleffa/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cleffa_shiny_palette:: @ 8DA7174
-	.incbin "graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cleffa/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cleffa_icon:: @ 8DA719C
-	.incbin "graphics/pokemon/icons/cleffa_icon.4bpp"
+	.incbin "graphics/pokemon/cleffa/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cleffa_footprint:: @ 8DA759C
-	.incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp"
+	.incbin "graphics/pokemon/cleffa/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_igglybuff_still_front_pic:: @ 8DA75BC
-	.incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/igglybuff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_igglybuff_palette:: @ 8DA77A4
-	.incbin "graphics/pokemon/palettes/igglybuff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/igglybuff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_igglybuff_back_pic:: @ 8DA77CC
-	.incbin "graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/igglybuff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_igglybuff_shiny_palette:: @ 8DA7A08
-	.incbin "graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/igglybuff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_igglybuff_icon:: @ 8DA7A30
-	.incbin "graphics/pokemon/icons/igglybuff_icon.4bpp"
+	.incbin "graphics/pokemon/igglybuff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_igglybuff_footprint:: @ 8DA7E30
-	.incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp"
+	.incbin "graphics/pokemon/igglybuff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_togepi_still_front_pic:: @ 8DA7E50
-	.incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togepi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togepi_palette:: @ 8DA8024
-	.incbin "graphics/pokemon/palettes/togepi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togepi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_togepi_back_pic:: @ 8DA804C
-	.incbin "graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togepi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togepi_shiny_palette:: @ 8DA82C0
-	.incbin "graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togepi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_togepi_icon:: @ 8DA82E8
-	.incbin "graphics/pokemon/icons/togepi_icon.4bpp"
+	.incbin "graphics/pokemon/togepi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_togepi_footprint:: @ 8DA86E8
-	.incbin "graphics/pokemon/footprints/togepi_footprint.1bpp"
+	.incbin "graphics/pokemon/togepi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_togetic_still_front_pic:: @ 8DA8708
-	.incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togetic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togetic_palette:: @ 8DA897C
-	.incbin "graphics/pokemon/palettes/togetic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togetic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_togetic_back_pic:: @ 8DA89A4
-	.incbin "graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/togetic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_togetic_shiny_palette:: @ 8DA8CD0
-	.incbin "graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/togetic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_togetic_icon:: @ 8DA8CF8
-	.incbin "graphics/pokemon/icons/togetic_icon.4bpp"
+	.incbin "graphics/pokemon/togetic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_togetic_footprint:: @ 8DA90F8
-	.incbin "graphics/pokemon/footprints/togetic_footprint.1bpp"
+	.incbin "graphics/pokemon/togetic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_natu_still_front_pic:: @ 8DA9118
-	.incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/natu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_natu_palette:: @ 8DA92E4
-	.incbin "graphics/pokemon/palettes/natu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/natu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_natu_back_pic:: @ 8DA930C
-	.incbin "graphics/pokemon/back_pics/natu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/natu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_natu_shiny_palette:: @ 8DA9520
-	.incbin "graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/natu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_natu_icon:: @ 8DA9548
-	.incbin "graphics/pokemon/icons/natu_icon.4bpp"
+	.incbin "graphics/pokemon/natu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_natu_footprint:: @ 8DA9948
-	.incbin "graphics/pokemon/footprints/natu_footprint.1bpp"
+	.incbin "graphics/pokemon/natu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_xatu_still_front_pic:: @ 8DA9968
-	.incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/xatu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_xatu_palette:: @ 8DA9C44
-	.incbin "graphics/pokemon/palettes/xatu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/xatu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_xatu_back_pic:: @ 8DA9C6C
-	.incbin "graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/xatu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_xatu_shiny_palette:: @ 8DA9FE4
-	.incbin "graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/xatu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_xatu_icon:: @ 8DAA00C
-	.incbin "graphics/pokemon/icons/xatu_icon.4bpp"
+	.incbin "graphics/pokemon/xatu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_xatu_footprint:: @ 8DAA40C
-	.incbin "graphics/pokemon/footprints/xatu_footprint.1bpp"
+	.incbin "graphics/pokemon/xatu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mareep_still_front_pic:: @ 8DAA42C
-	.incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mareep/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mareep_palette:: @ 8DAA6E0
-	.incbin "graphics/pokemon/palettes/mareep_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mareep/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mareep_back_pic:: @ 8DAA708
-	.incbin "graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mareep/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mareep_shiny_palette:: @ 8DAA9FC
-	.incbin "graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mareep/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mareep_icon:: @ 8DAAA24
-	.incbin "graphics/pokemon/icons/mareep_icon.4bpp"
+	.incbin "graphics/pokemon/mareep/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mareep_footprint:: @ 8DAAE24
-	.incbin "graphics/pokemon/footprints/mareep_footprint.1bpp"
+	.incbin "graphics/pokemon/mareep/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flaaffy_still_front_pic:: @ 8DAAE44
-	.incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flaaffy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flaaffy_palette:: @ 8DAB144
-	.incbin "graphics/pokemon/palettes/flaaffy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flaaffy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flaaffy_back_pic:: @ 8DAB16C
-	.incbin "graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flaaffy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flaaffy_shiny_palette:: @ 8DAB488
-	.incbin "graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flaaffy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flaaffy_icon:: @ 8DAB4B0
-	.incbin "graphics/pokemon/icons/flaaffy_icon.4bpp"
+	.incbin "graphics/pokemon/flaaffy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flaaffy_footprint:: @ 8DAB8B0
-	.incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp"
+	.incbin "graphics/pokemon/flaaffy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ampharos_still_front_pic:: @ 8DAB8D0
-	.incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ampharos/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ampharos_palette:: @ 8DABC2C
-	.incbin "graphics/pokemon/palettes/ampharos_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ampharos/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ampharos_back_pic:: @ 8DABC54
-	.incbin "graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ampharos/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ampharos_shiny_palette:: @ 8DABFCC
-	.incbin "graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ampharos/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ampharos_icon:: @ 8DABFF4
-	.incbin "graphics/pokemon/icons/ampharos_icon.4bpp"
+	.incbin "graphics/pokemon/ampharos/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ampharos_footprint:: @ 8DAC3F4
-	.incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp"
+	.incbin "graphics/pokemon/ampharos/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bellossom_still_front_pic:: @ 8DAC414
-	.incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellossom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellossom_palette:: @ 8DAC684
-	.incbin "graphics/pokemon/palettes/bellossom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellossom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bellossom_back_pic:: @ 8DAC6AC
-	.incbin "graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bellossom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bellossom_shiny_palette:: @ 8DAC9D0
-	.incbin "graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bellossom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bellossom_icon:: @ 8DAC9F8
-	.incbin "graphics/pokemon/icons/bellossom_icon.4bpp"
+	.incbin "graphics/pokemon/bellossom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bellossom_footprint:: @ 8DACDF8
-	.incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp"
+	.incbin "graphics/pokemon/bellossom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marill_still_front_pic:: @ 8DACE18
-	.incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marill_palette:: @ 8DAD0DC
-	.incbin "graphics/pokemon/palettes/marill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marill_back_pic:: @ 8DAD104
-	.incbin "graphics/pokemon/back_pics/marill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marill_shiny_palette:: @ 8DAD3B0
-	.incbin "graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marill_icon:: @ 8DAD3D8
-	.incbin "graphics/pokemon/icons/marill_icon.4bpp"
+	.incbin "graphics/pokemon/marill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marill_footprint:: @ 8DAD7D8
-	.incbin "graphics/pokemon/footprints/marill_footprint.1bpp"
+	.incbin "graphics/pokemon/marill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_azumarill_still_front_pic:: @ 8DAD7F8
-	.incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azumarill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azumarill_palette:: @ 8DADAF8
-	.incbin "graphics/pokemon/palettes/azumarill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azumarill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_azumarill_back_pic:: @ 8DADB20
-	.incbin "graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azumarill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azumarill_shiny_palette:: @ 8DADDDC
-	.incbin "graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azumarill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_azumarill_icon:: @ 8DADE04
-	.incbin "graphics/pokemon/icons/azumarill_icon.4bpp"
+	.incbin "graphics/pokemon/azumarill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_azumarill_footprint:: @ 8DAE204
-	.incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp"
+	.incbin "graphics/pokemon/azumarill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sudowoodo_still_front_pic:: @ 8DAE224
-	.incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sudowoodo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sudowoodo_palette:: @ 8DAE53C
-	.incbin "graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sudowoodo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sudowoodo_back_pic:: @ 8DAE564
-	.incbin "graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sudowoodo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sudowoodo_shiny_palette:: @ 8DAE8C0
-	.incbin "graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sudowoodo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sudowoodo_icon:: @ 8DAE8E8
-	.incbin "graphics/pokemon/icons/sudowoodo_icon.4bpp"
+	.incbin "graphics/pokemon/sudowoodo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sudowoodo_footprint:: @ 8DAECE8
-	.incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp"
+	.incbin "graphics/pokemon/sudowoodo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_politoed_still_front_pic:: @ 8DAED08
-	.incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/politoed/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_politoed_palette:: @ 8DAF044
-	.incbin "graphics/pokemon/palettes/politoed_palette.gbapal.lz"
+	.incbin "graphics/pokemon/politoed/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_politoed_back_pic:: @ 8DAF06C
-	.incbin "graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/politoed/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_politoed_shiny_palette:: @ 8DAF328
-	.incbin "graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/politoed/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_politoed_icon:: @ 8DAF350
-	.incbin "graphics/pokemon/icons/politoed_icon.4bpp"
+	.incbin "graphics/pokemon/politoed/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_politoed_footprint:: @ 8DAF750
-	.incbin "graphics/pokemon/footprints/politoed_footprint.1bpp"
+	.incbin "graphics/pokemon/politoed/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hoppip_still_front_pic:: @ 8DAF770
-	.incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoppip/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoppip_palette:: @ 8DAFA24
-	.incbin "graphics/pokemon/palettes/hoppip_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoppip/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hoppip_back_pic:: @ 8DAFA4C
-	.incbin "graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hoppip/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hoppip_shiny_palette:: @ 8DAFD2C
-	.incbin "graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hoppip/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hoppip_icon:: @ 8DAFD54
-	.incbin "graphics/pokemon/icons/hoppip_icon.4bpp"
+	.incbin "graphics/pokemon/hoppip/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hoppip_footprint:: @ 8DB0154
-	.incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp"
+	.incbin "graphics/pokemon/hoppip/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skiploom_still_front_pic:: @ 8DB0174
-	.incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skiploom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skiploom_palette:: @ 8DB03FC
-	.incbin "graphics/pokemon/palettes/skiploom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skiploom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skiploom_back_pic:: @ 8DB0424
-	.incbin "graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skiploom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skiploom_shiny_palette:: @ 8DB0704
-	.incbin "graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skiploom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skiploom_icon:: @ 8DB072C
-	.incbin "graphics/pokemon/icons/skiploom_icon.4bpp"
+	.incbin "graphics/pokemon/skiploom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skiploom_footprint:: @ 8DB0B2C
-	.incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp"
+	.incbin "graphics/pokemon/skiploom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jumpluff_still_front_pic:: @ 8DB0B4C
-	.incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jumpluff/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jumpluff_palette:: @ 8DB0EB8
-	.incbin "graphics/pokemon/palettes/jumpluff_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jumpluff/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jumpluff_back_pic:: @ 8DB0EE0
-	.incbin "graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jumpluff/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jumpluff_shiny_palette:: @ 8DB12D8
-	.incbin "graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jumpluff/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jumpluff_icon:: @ 8DB1300
-	.incbin "graphics/pokemon/icons/jumpluff_icon.4bpp"
+	.incbin "graphics/pokemon/jumpluff/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jumpluff_footprint:: @ 8DB1700
-	.incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp"
+	.incbin "graphics/pokemon/jumpluff/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aipom_still_front_pic:: @ 8DB1720
-	.incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aipom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aipom_palette:: @ 8DB1A1C
-	.incbin "graphics/pokemon/palettes/aipom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aipom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aipom_back_pic:: @ 8DB1A44
-	.incbin "graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aipom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aipom_shiny_palette:: @ 8DB1D38
-	.incbin "graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aipom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aipom_icon:: @ 8DB1D60
-	.incbin "graphics/pokemon/icons/aipom_icon.4bpp"
+	.incbin "graphics/pokemon/aipom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aipom_footprint:: @ 8DB2160
-	.incbin "graphics/pokemon/footprints/aipom_footprint.1bpp"
+	.incbin "graphics/pokemon/aipom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sunkern_still_front_pic:: @ 8DB2180
-	.incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunkern/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunkern_palette:: @ 8DB23B8
-	.incbin "graphics/pokemon/palettes/sunkern_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunkern/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sunkern_back_pic:: @ 8DB23E0
-	.incbin "graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunkern/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunkern_shiny_palette:: @ 8DB26A4
-	.incbin "graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunkern/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sunkern_icon:: @ 8DB26CC
-	.incbin "graphics/pokemon/icons/sunkern_icon.4bpp"
+	.incbin "graphics/pokemon/sunkern/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sunkern_footprint:: @ 8DB2ACC
-	.incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp"
+	.incbin "graphics/pokemon/sunkern/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sunflora_still_front_pic:: @ 8DB2AEC
-	.incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunflora/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunflora_palette:: @ 8DB2E44
-	.incbin "graphics/pokemon/palettes/sunflora_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunflora/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sunflora_back_pic:: @ 8DB2E6C
-	.incbin "graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sunflora/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sunflora_shiny_palette:: @ 8DB320C
-	.incbin "graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sunflora/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sunflora_icon:: @ 8DB3234
-	.incbin "graphics/pokemon/icons/sunflora_icon.4bpp"
+	.incbin "graphics/pokemon/sunflora/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sunflora_footprint:: @ 8DB3634
-	.incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp"
+	.incbin "graphics/pokemon/sunflora/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_yanma_still_front_pic:: @ 8DB3654
-	.incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/yanma/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_yanma_palette:: @ 8DB39D8
-	.incbin "graphics/pokemon/palettes/yanma_palette.gbapal.lz"
+	.incbin "graphics/pokemon/yanma/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_yanma_back_pic:: @ 8DB3A00
-	.incbin "graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/yanma/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_yanma_shiny_palette:: @ 8DB3DB4
-	.incbin "graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/yanma/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_yanma_icon:: @ 8DB3DDC
-	.incbin "graphics/pokemon/icons/yanma_icon.4bpp"
+	.incbin "graphics/pokemon/yanma/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_yanma_footprint:: @ 8DB41DC
-	.incbin "graphics/pokemon/footprints/yanma_footprint.1bpp"
+	.incbin "graphics/pokemon/yanma/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wooper_still_front_pic:: @ 8DB41FC
-	.incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wooper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wooper_palette:: @ 8DB443C
-	.incbin "graphics/pokemon/palettes/wooper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wooper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wooper_back_pic:: @ 8DB4464
-	.incbin "graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wooper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wooper_shiny_palette:: @ 8DB46F0
-	.incbin "graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wooper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wooper_icon:: @ 8DB4718
-	.incbin "graphics/pokemon/icons/wooper_icon.4bpp"
+	.incbin "graphics/pokemon/wooper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wooper_footprint:: @ 8DB4B18
-	.incbin "graphics/pokemon/footprints/wooper_footprint.1bpp"
+	.incbin "graphics/pokemon/wooper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_quagsire_still_front_pic:: @ 8DB4B38
-	.incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quagsire/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quagsire_palette:: @ 8DB4EAC
-	.incbin "graphics/pokemon/palettes/quagsire_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quagsire/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_quagsire_back_pic:: @ 8DB4ED4
-	.incbin "graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/quagsire/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_quagsire_shiny_palette:: @ 8DB51D0
-	.incbin "graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/quagsire/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_quagsire_icon:: @ 8DB51F8
-	.incbin "graphics/pokemon/icons/quagsire_icon.4bpp"
+	.incbin "graphics/pokemon/quagsire/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_quagsire_footprint:: @ 8DB55F8
-	.incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp"
+	.incbin "graphics/pokemon/quagsire/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_espeon_still_front_pic:: @ 8DB5618
-	.incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/espeon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_espeon_palette:: @ 8DB5958
-	.incbin "graphics/pokemon/palettes/espeon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/espeon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_espeon_back_pic:: @ 8DB597C
-	.incbin "graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/espeon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_espeon_shiny_palette:: @ 8DB5C58
-	.incbin "graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/espeon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_espeon_icon:: @ 8DB5C7C
-	.incbin "graphics/pokemon/icons/espeon_icon.4bpp"
+	.incbin "graphics/pokemon/espeon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_espeon_footprint:: @ 8DB607C
-	.incbin "graphics/pokemon/footprints/espeon_footprint.1bpp"
+	.incbin "graphics/pokemon/espeon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_umbreon_still_front_pic:: @ 8DB609C
-	.incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/umbreon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_umbreon_palette:: @ 8DB63B0
-	.incbin "graphics/pokemon/palettes/umbreon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/umbreon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_umbreon_back_pic:: @ 8DB63D8
-	.incbin "graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/umbreon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_umbreon_shiny_palette:: @ 8DB66EC
-	.incbin "graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/umbreon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_umbreon_icon:: @ 8DB6714
-	.incbin "graphics/pokemon/icons/umbreon_icon.4bpp"
+	.incbin "graphics/pokemon/umbreon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_umbreon_footprint:: @ 8DB6B14
-	.incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp"
+	.incbin "graphics/pokemon/umbreon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_murkrow_still_front_pic:: @ 8DB6B34
-	.incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/murkrow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_murkrow_palette:: @ 8DB6E14
-	.incbin "graphics/pokemon/palettes/murkrow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/murkrow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_murkrow_back_pic:: @ 8DB6E3C
-	.incbin "graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/murkrow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_murkrow_shiny_palette:: @ 8DB7154
-	.incbin "graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/murkrow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_murkrow_icon:: @ 8DB717C
-	.incbin "graphics/pokemon/icons/murkrow_icon.4bpp"
+	.incbin "graphics/pokemon/murkrow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_murkrow_footprint:: @ 8DB757C
-	.incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp"
+	.incbin "graphics/pokemon/murkrow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slowking_still_front_pic:: @ 8DB759C
-	.incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowking_palette:: @ 8DB7950
-	.incbin "graphics/pokemon/palettes/slowking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slowking_back_pic:: @ 8DB7978
-	.incbin "graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slowking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slowking_shiny_palette:: @ 8DB7D04
-	.incbin "graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slowking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slowking_icon:: @ 8DB7D2C
-	.incbin "graphics/pokemon/icons/slowking_icon.4bpp"
+	.incbin "graphics/pokemon/slowking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slowking_footprint:: @ 8DB812C
-	.incbin "graphics/pokemon/footprints/slowking_footprint.1bpp"
+	.incbin "graphics/pokemon/slowking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_misdreavus_still_front_pic:: @ 8DB814C
-	.incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/misdreavus/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_misdreavus_palette:: @ 8DB840C
-	.incbin "graphics/pokemon/palettes/misdreavus_palette.gbapal.lz"
+	.incbin "graphics/pokemon/misdreavus/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_misdreavus_back_pic:: @ 8DB8434
-	.incbin "graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/misdreavus/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_misdreavus_shiny_palette:: @ 8DB8758
-	.incbin "graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/misdreavus/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_misdreavus_icon:: @ 8DB8780
-	.incbin "graphics/pokemon/icons/misdreavus_icon.4bpp"
+	.incbin "graphics/pokemon/misdreavus/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_misdreavus_footprint:: @ 8DB8B80
-	.incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp"
+	.incbin "graphics/pokemon/misdreavus/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_a_still_front_pic:: @ 8DB8BA0
-	.incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/a/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_unown_palette:: @ 8DB8D74
-	.incbin "graphics/pokemon/palettes/unown_palette.gbapal.lz"
+	.incbin "graphics/pokemon/unown/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_a_back_pic:: @ 8DB8D94
-	.incbin "graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/a/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_unown_shiny_palette:: @ 8DB8F94
-	.incbin "graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/unown/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_a_icon:: @ 8DB8FB4
-	.incbin "graphics/pokemon/icons/unown_a_icon.4bpp"
+	.incbin "graphics/pokemon/unown/a/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_unown_footprint:: @ 8DB93B4
-	.incbin "graphics/pokemon/footprints/unown_footprint.1bpp"
+	.incbin "graphics/pokemon/unown/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wobbuffet_still_front_pic:: @ 8DB93D4
-	.incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wobbuffet/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wobbuffet_palette:: @ 8DB9724
-	.incbin "graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wobbuffet/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wobbuffet_back_pic:: @ 8DB974C
-	.incbin "graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wobbuffet/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wobbuffet_shiny_palette:: @ 8DB9990
-	.incbin "graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wobbuffet/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wobbuffet_icon:: @ 8DB99B8
-	.incbin "graphics/pokemon/icons/wobbuffet_icon.4bpp"
+	.incbin "graphics/pokemon/wobbuffet/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wobbuffet_footprint:: @ 8DB9DB8
-	.incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp"
+	.incbin "graphics/pokemon/wobbuffet/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_girafarig_still_front_pic:: @ 8DB9DD8
-	.incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/girafarig/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_girafarig_palette:: @ 8DBA1DC
-	.incbin "graphics/pokemon/palettes/girafarig_palette.gbapal.lz"
+	.incbin "graphics/pokemon/girafarig/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_girafarig_back_pic:: @ 8DBA204
-	.incbin "graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/girafarig/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_girafarig_shiny_palette:: @ 8DBA5B0
-	.incbin "graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/girafarig/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_girafarig_icon:: @ 8DBA5D8
-	.incbin "graphics/pokemon/icons/girafarig_icon.4bpp"
+	.incbin "graphics/pokemon/girafarig/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_girafarig_footprint:: @ 8DBA9D8
-	.incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp"
+	.incbin "graphics/pokemon/girafarig/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pineco_still_front_pic:: @ 8DBA9F8
-	.incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pineco/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pineco_palette:: @ 8DBAD38
-	.incbin "graphics/pokemon/palettes/pineco_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pineco/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pineco_back_pic:: @ 8DBAD5C
-	.incbin "graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pineco/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pineco_shiny_palette:: @ 8DBB034
-	.incbin "graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pineco/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pineco_icon:: @ 8DBB058
-	.incbin "graphics/pokemon/icons/pineco_icon.4bpp"
+	.incbin "graphics/pokemon/pineco/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pineco_footprint:: @ 8DBB458
-	.incbin "graphics/pokemon/footprints/pineco_footprint.1bpp"
+	.incbin "graphics/pokemon/pineco/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_forretress_still_front_pic:: @ 8DBB478
-	.incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/forretress/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_forretress_palette:: @ 8DBB894
-	.incbin "graphics/pokemon/palettes/forretress_palette.gbapal.lz"
+	.incbin "graphics/pokemon/forretress/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_forretress_back_pic:: @ 8DBB8BC
-	.incbin "graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/forretress/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_forretress_shiny_palette:: @ 8DBBB7C
-	.incbin "graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/forretress/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_forretress_icon:: @ 8DBBBA4
-	.incbin "graphics/pokemon/icons/forretress_icon.4bpp"
+	.incbin "graphics/pokemon/forretress/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_forretress_footprint:: @ 8DBBFA4
-	.incbin "graphics/pokemon/footprints/forretress_footprint.1bpp"
+	.incbin "graphics/pokemon/forretress/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dunsparce_still_front_pic:: @ 8DBBFC4
-	.incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dunsparce/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dunsparce_palette:: @ 8DBC2D4
-	.incbin "graphics/pokemon/palettes/dunsparce_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dunsparce/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dunsparce_back_pic:: @ 8DBC2FC
-	.incbin "graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dunsparce/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dunsparce_shiny_palette:: @ 8DBC5F8
-	.incbin "graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dunsparce/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dunsparce_icon:: @ 8DBC620
-	.incbin "graphics/pokemon/icons/dunsparce_icon.4bpp"
+	.incbin "graphics/pokemon/dunsparce/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dunsparce_footprint:: @ 8DBCA20
-	.incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp"
+	.incbin "graphics/pokemon/dunsparce/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gligar_still_front_pic:: @ 8DBCA40
-	.incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gligar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gligar_palette:: @ 8DBCE68
-	.incbin "graphics/pokemon/palettes/gligar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gligar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gligar_back_pic:: @ 8DBCE90
-	.incbin "graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gligar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gligar_shiny_palette:: @ 8DBD268
-	.incbin "graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gligar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gligar_icon:: @ 8DBD290
-	.incbin "graphics/pokemon/icons/gligar_icon.4bpp"
+	.incbin "graphics/pokemon/gligar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gligar_footprint:: @ 8DBD690
-	.incbin "graphics/pokemon/footprints/gligar_footprint.1bpp"
+	.incbin "graphics/pokemon/gligar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_steelix_still_front_pic:: @ 8DBD6B0
-	.incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/steelix/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_steelix_palette:: @ 8DBDB78
-	.incbin "graphics/pokemon/palettes/steelix_palette.gbapal.lz"
+	.incbin "graphics/pokemon/steelix/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_steelix_back_pic:: @ 8DBDB9C
-	.incbin "graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/steelix/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_steelix_shiny_palette:: @ 8DBDFA8
-	.incbin "graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/steelix/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_steelix_icon:: @ 8DBDFCC
-	.incbin "graphics/pokemon/icons/steelix_icon.4bpp"
+	.incbin "graphics/pokemon/steelix/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_steelix_footprint:: @ 8DBE3CC
-	.incbin "graphics/pokemon/footprints/steelix_footprint.1bpp"
+	.incbin "graphics/pokemon/steelix/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snubbull_still_front_pic:: @ 8DBE3EC
-	.incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snubbull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snubbull_palette:: @ 8DBE6C0
-	.incbin "graphics/pokemon/palettes/snubbull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snubbull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snubbull_back_pic:: @ 8DBE6E8
-	.incbin "graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snubbull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snubbull_shiny_palette:: @ 8DBEA10
-	.incbin "graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snubbull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snubbull_icon:: @ 8DBEA38
-	.incbin "graphics/pokemon/icons/snubbull_icon.4bpp"
+	.incbin "graphics/pokemon/snubbull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snubbull_footprint:: @ 8DBEE38
-	.incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp"
+	.incbin "graphics/pokemon/snubbull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_granbull_still_front_pic:: @ 8DBEE58
-	.incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/granbull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_granbull_palette:: @ 8DBF1E4
-	.incbin "graphics/pokemon/palettes/granbull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/granbull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_granbull_back_pic:: @ 8DBF20C
-	.incbin "graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/granbull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_granbull_shiny_palette:: @ 8DBF530
-	.incbin "graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/granbull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_granbull_icon:: @ 8DBF558
-	.incbin "graphics/pokemon/icons/granbull_icon.4bpp"
+	.incbin "graphics/pokemon/granbull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_granbull_footprint:: @ 8DBF958
-	.incbin "graphics/pokemon/footprints/granbull_footprint.1bpp"
+	.incbin "graphics/pokemon/granbull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_qwilfish_still_front_pic:: @ 8DBF978
-	.incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/qwilfish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_qwilfish_palette:: @ 8DBFC38
-	.incbin "graphics/pokemon/palettes/qwilfish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/qwilfish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_qwilfish_back_pic:: @ 8DBFC60
-	.incbin "graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/qwilfish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_qwilfish_shiny_palette:: @ 8DBFF40
-	.incbin "graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/qwilfish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_qwilfish_icon:: @ 8DBFF68
-	.incbin "graphics/pokemon/icons/qwilfish_icon.4bpp"
+	.incbin "graphics/pokemon/qwilfish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_qwilfish_footprint:: @ 8DC0368
-	.incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp"
+	.incbin "graphics/pokemon/qwilfish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_scizor_still_front_pic:: @ 8DC0388
-	.incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scizor/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scizor_palette:: @ 8DC0870
-	.incbin "graphics/pokemon/palettes/scizor_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scizor/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_scizor_back_pic:: @ 8DC0898
-	.incbin "graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/scizor/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_scizor_shiny_palette:: @ 8DC0C18
-	.incbin "graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/scizor/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_scizor_icon:: @ 8DC0C40
-	.incbin "graphics/pokemon/icons/scizor_icon.4bpp"
+	.incbin "graphics/pokemon/scizor/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_scizor_footprint:: @ 8DC1040
-	.incbin "graphics/pokemon/footprints/scizor_footprint.1bpp"
+	.incbin "graphics/pokemon/scizor/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shuckle_still_front_pic:: @ 8DC1060
-	.incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuckle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuckle_palette:: @ 8DC1328
-	.incbin "graphics/pokemon/palettes/shuckle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuckle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shuckle_back_pic:: @ 8DC1350
-	.incbin "graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuckle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuckle_shiny_palette:: @ 8DC15A8
-	.incbin "graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuckle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shuckle_icon:: @ 8DC15D0
-	.incbin "graphics/pokemon/icons/shuckle_icon.4bpp"
+	.incbin "graphics/pokemon/shuckle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shuckle_footprint:: @ 8DC19D0
-	.incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp"
+	.incbin "graphics/pokemon/shuckle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_heracross_still_front_pic:: @ 8DC19F0
-	.incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/heracross/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_heracross_palette:: @ 8DC1DE0
-	.incbin "graphics/pokemon/palettes/heracross_palette.gbapal.lz"
+	.incbin "graphics/pokemon/heracross/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_heracross_back_pic:: @ 8DC1E08
-	.incbin "graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/heracross/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_heracross_shiny_palette:: @ 8DC2178
-	.incbin "graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/heracross/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_heracross_icon:: @ 8DC21A0
-	.incbin "graphics/pokemon/icons/heracross_icon.4bpp"
+	.incbin "graphics/pokemon/heracross/icon.4bpp"
 
 gUnknown_heracross_icon:: @ 8DC25A0
 	.incbin "baserom.gba", 0xDC25A0, 0x400
 
 	.align 2
 gFile_graphics_pokemon_footprints_heracross_footprint:: @ 8DC29A0
-	.incbin "graphics/pokemon/footprints/heracross_footprint.1bpp"
+	.incbin "graphics/pokemon/heracross/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sneasel_still_front_pic:: @ 8DC29C0
-	.incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sneasel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sneasel_palette:: @ 8DC2D04
-	.incbin "graphics/pokemon/palettes/sneasel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sneasel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sneasel_back_pic:: @ 8DC2D2C
-	.incbin "graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sneasel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sneasel_shiny_palette:: @ 8DC3050
-	.incbin "graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sneasel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sneasel_icon:: @ 8DC3078
-	.incbin "graphics/pokemon/icons/sneasel_icon.4bpp"
+	.incbin "graphics/pokemon/sneasel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sneasel_footprint:: @ 8DC3478
-	.incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp"
+	.incbin "graphics/pokemon/sneasel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_teddiursa_still_front_pic:: @ 8DC3498
-	.incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/teddiursa/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_teddiursa_palette:: @ 8DC3740
-	.incbin "graphics/pokemon/palettes/teddiursa_palette.gbapal.lz"
+	.incbin "graphics/pokemon/teddiursa/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_teddiursa_back_pic:: @ 8DC3768
-	.incbin "graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/teddiursa/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_teddiursa_shiny_palette:: @ 8DC39E0
-	.incbin "graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/teddiursa/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_teddiursa_icon:: @ 8DC3A08
-	.incbin "graphics/pokemon/icons/teddiursa_icon.4bpp"
+	.incbin "graphics/pokemon/teddiursa/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_teddiursa_footprint:: @ 8DC3E08
-	.incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp"
+	.incbin "graphics/pokemon/teddiursa/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ursaring_still_front_pic:: @ 8DC3E28
-	.incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ursaring/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ursaring_palette:: @ 8DC4260
-	.incbin "graphics/pokemon/palettes/ursaring_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ursaring/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ursaring_back_pic:: @ 8DC4288
-	.incbin "graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ursaring/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ursaring_shiny_palette:: @ 8DC4610
-	.incbin "graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ursaring/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ursaring_icon:: @ 8DC4638
-	.incbin "graphics/pokemon/icons/ursaring_icon.4bpp"
+	.incbin "graphics/pokemon/ursaring/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ursaring_footprint:: @ 8DC4A38
-	.incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp"
+	.incbin "graphics/pokemon/ursaring/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slugma_still_front_pic:: @ 8DC4A58
-	.incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slugma/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slugma_palette:: @ 8DC4CCC
-	.incbin "graphics/pokemon/palettes/slugma_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slugma/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slugma_back_pic:: @ 8DC4CF0
-	.incbin "graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slugma/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slugma_shiny_palette:: @ 8DC4FD8
-	.incbin "graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slugma/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slugma_icon:: @ 8DC4FFC
-	.incbin "graphics/pokemon/icons/slugma_icon.4bpp"
+	.incbin "graphics/pokemon/slugma/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slugma_footprint:: @ 8DC53FC
-	.incbin "graphics/pokemon/footprints/slugma_footprint.1bpp"
+	.incbin "graphics/pokemon/slugma/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magcargo_still_front_pic:: @ 8DC541C
-	.incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magcargo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magcargo_palette:: @ 8DC5764
-	.incbin "graphics/pokemon/palettes/magcargo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magcargo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magcargo_back_pic:: @ 8DC578C
-	.incbin "graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magcargo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magcargo_shiny_palette:: @ 8DC5BA4
-	.incbin "graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magcargo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magcargo_icon:: @ 8DC5BCC
-	.incbin "graphics/pokemon/icons/magcargo_icon.4bpp"
+	.incbin "graphics/pokemon/magcargo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magcargo_footprint:: @ 8DC5FCC
-	.incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp"
+	.incbin "graphics/pokemon/magcargo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swinub_still_front_pic:: @ 8DC5FEC
-	.incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swinub/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swinub_palette:: @ 8DC61E8
-	.incbin "graphics/pokemon/palettes/swinub_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swinub/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swinub_back_pic:: @ 8DC6210
-	.incbin "graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swinub/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swinub_shiny_palette:: @ 8DC644C
-	.incbin "graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swinub/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swinub_icon:: @ 8DC6474
-	.incbin "graphics/pokemon/icons/swinub_icon.4bpp"
+	.incbin "graphics/pokemon/swinub/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swinub_footprint:: @ 8DC6874
-	.incbin "graphics/pokemon/footprints/swinub_footprint.1bpp"
+	.incbin "graphics/pokemon/swinub/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_piloswine_still_front_pic:: @ 8DC6894
-	.incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/piloswine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_piloswine_palette:: @ 8DC6BBC
-	.incbin "graphics/pokemon/palettes/piloswine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/piloswine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_piloswine_back_pic:: @ 8DC6BE4
-	.incbin "graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/piloswine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_piloswine_shiny_palette:: @ 8DC6E30
-	.incbin "graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/piloswine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_piloswine_icon:: @ 8DC6E58
-	.incbin "graphics/pokemon/icons/piloswine_icon.4bpp"
+	.incbin "graphics/pokemon/piloswine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_piloswine_footprint:: @ 8DC7258
-	.incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp"
+	.incbin "graphics/pokemon/piloswine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_corsola_still_front_pic:: @ 8DC7278
-	.incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corsola/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corsola_palette:: @ 8DC7560
-	.incbin "graphics/pokemon/palettes/corsola_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corsola/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_corsola_back_pic:: @ 8DC7588
-	.incbin "graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corsola/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corsola_shiny_palette:: @ 8DC7848
-	.incbin "graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corsola/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_corsola_icon:: @ 8DC7870
-	.incbin "graphics/pokemon/icons/corsola_icon.4bpp"
+	.incbin "graphics/pokemon/corsola/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_corsola_footprint:: @ 8DC7C70
-	.incbin "graphics/pokemon/footprints/corsola_footprint.1bpp"
+	.incbin "graphics/pokemon/corsola/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_remoraid_still_front_pic:: @ 8DC7C90
-	.incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/remoraid/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_remoraid_palette:: @ 8DC7EF8
-	.incbin "graphics/pokemon/palettes/remoraid_palette.gbapal.lz"
+	.incbin "graphics/pokemon/remoraid/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_remoraid_back_pic:: @ 8DC7F20
-	.incbin "graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/remoraid/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_remoraid_shiny_palette:: @ 8DC8234
-	.incbin "graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/remoraid/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_remoraid_icon:: @ 8DC825C
-	.incbin "graphics/pokemon/icons/remoraid_icon.4bpp"
+	.incbin "graphics/pokemon/remoraid/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_remoraid_footprint:: @ 8DC865C
-	.incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp"
+	.incbin "graphics/pokemon/remoraid/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_octillery_still_front_pic:: @ 8DC867C
-	.incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/octillery/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_octillery_palette:: @ 8DC89B0
-	.incbin "graphics/pokemon/palettes/octillery_palette.gbapal.lz"
+	.incbin "graphics/pokemon/octillery/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_octillery_back_pic:: @ 8DC89D8
-	.incbin "graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/octillery/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_octillery_shiny_palette:: @ 8DC8C90
-	.incbin "graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/octillery/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_octillery_icon:: @ 8DC8CB8
-	.incbin "graphics/pokemon/icons/octillery_icon.4bpp"
+	.incbin "graphics/pokemon/octillery/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_octillery_footprint:: @ 8DC90B8
-	.incbin "graphics/pokemon/footprints/octillery_footprint.1bpp"
+	.incbin "graphics/pokemon/octillery/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_delibird_still_front_pic:: @ 8DC90D8
-	.incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delibird/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delibird_palette:: @ 8DC9448
-	.incbin "graphics/pokemon/palettes/delibird_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delibird/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_delibird_back_pic:: @ 8DC9470
-	.incbin "graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delibird/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delibird_shiny_palette:: @ 8DC9830
-	.incbin "graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delibird/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_delibird_icon:: @ 8DC9858
-	.incbin "graphics/pokemon/icons/delibird_icon.4bpp"
+	.incbin "graphics/pokemon/delibird/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_delibird_footprint:: @ 8DC9C58
-	.incbin "graphics/pokemon/footprints/delibird_footprint.1bpp"
+	.incbin "graphics/pokemon/delibird/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mantine_still_front_pic:: @ 8DC9C78
-	.incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mantine/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mantine_palette:: @ 8DCA114
-	.incbin "graphics/pokemon/palettes/mantine_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mantine/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mantine_back_pic:: @ 8DCA13C
-	.incbin "graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mantine/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mantine_shiny_palette:: @ 8DCA3DC
-	.incbin "graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mantine/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mantine_icon:: @ 8DCA404
-	.incbin "graphics/pokemon/icons/mantine_icon.4bpp"
+	.incbin "graphics/pokemon/mantine/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mantine_footprint:: @ 8DCA804
-	.incbin "graphics/pokemon/footprints/mantine_footprint.1bpp"
+	.incbin "graphics/pokemon/mantine/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skarmory_still_front_pic:: @ 8DCA824
-	.incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skarmory/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skarmory_palette:: @ 8DCAD04
-	.incbin "graphics/pokemon/palettes/skarmory_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skarmory/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skarmory_back_pic:: @ 8DCAD2C
-	.incbin "graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skarmory/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skarmory_shiny_palette:: @ 8DCB030
-	.incbin "graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skarmory/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skarmory_icon:: @ 8DCB058
-	.incbin "graphics/pokemon/icons/skarmory_icon.4bpp"
+	.incbin "graphics/pokemon/skarmory/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skarmory_footprint:: @ 8DCB458
-	.incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp"
+	.incbin "graphics/pokemon/skarmory/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_houndour_still_front_pic:: @ 8DCB478
-	.incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndour/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndour_palette:: @ 8DCB730
-	.incbin "graphics/pokemon/palettes/houndour_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndour/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_houndour_back_pic:: @ 8DCB758
-	.incbin "graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndour/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndour_shiny_palette:: @ 8DCB9D8
-	.incbin "graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndour/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_houndour_icon:: @ 8DCBA00
-	.incbin "graphics/pokemon/icons/houndour_icon.4bpp"
+	.incbin "graphics/pokemon/houndour/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_houndour_footprint:: @ 8DCBE00
-	.incbin "graphics/pokemon/footprints/houndour_footprint.1bpp"
+	.incbin "graphics/pokemon/houndour/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_houndoom_still_front_pic:: @ 8DCBE20
-	.incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndoom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndoom_palette:: @ 8DCC220
-	.incbin "graphics/pokemon/palettes/houndoom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndoom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_houndoom_back_pic:: @ 8DCC248
-	.incbin "graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/houndoom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_houndoom_shiny_palette:: @ 8DCC56C
-	.incbin "graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/houndoom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_houndoom_icon:: @ 8DCC594
-	.incbin "graphics/pokemon/icons/houndoom_icon.4bpp"
+	.incbin "graphics/pokemon/houndoom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_houndoom_footprint:: @ 8DCC994
-	.incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp"
+	.incbin "graphics/pokemon/houndoom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kingdra_still_front_pic:: @ 8DCC9B4
-	.incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingdra/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingdra_palette:: @ 8DCCDD4
-	.incbin "graphics/pokemon/palettes/kingdra_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingdra/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kingdra_back_pic:: @ 8DCCDFC
-	.incbin "graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kingdra/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kingdra_shiny_palette:: @ 8DCD1B0
-	.incbin "graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kingdra/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kingdra_icon:: @ 8DCD1D8
-	.incbin "graphics/pokemon/icons/kingdra_icon.4bpp"
+	.incbin "graphics/pokemon/kingdra/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kingdra_footprint:: @ 8DCD5D8
-	.incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp"
+	.incbin "graphics/pokemon/kingdra/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_phanpy_still_front_pic:: @ 8DCD5F8
-	.incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/phanpy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_phanpy_palette:: @ 8DCD854
-	.incbin "graphics/pokemon/palettes/phanpy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/phanpy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_phanpy_back_pic:: @ 8DCD87C
-	.incbin "graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/phanpy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_phanpy_shiny_palette:: @ 8DCDB40
-	.incbin "graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/phanpy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_phanpy_icon:: @ 8DCDB68
-	.incbin "graphics/pokemon/icons/phanpy_icon.4bpp"
+	.incbin "graphics/pokemon/phanpy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_phanpy_footprint:: @ 8DCDF68
-	.incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp"
+	.incbin "graphics/pokemon/phanpy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_donphan_still_front_pic:: @ 8DCDF88
-	.incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/donphan/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_donphan_palette:: @ 8DCE3FC
-	.incbin "graphics/pokemon/palettes/donphan_palette.gbapal.lz"
+	.incbin "graphics/pokemon/donphan/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_donphan_back_pic:: @ 8DCE424
-	.incbin "graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/donphan/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_donphan_shiny_palette:: @ 8DCE720
-	.incbin "graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/donphan/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_donphan_icon:: @ 8DCE748
-	.incbin "graphics/pokemon/icons/donphan_icon.4bpp"
+	.incbin "graphics/pokemon/donphan/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_donphan_footprint:: @ 8DCEB48
-	.incbin "graphics/pokemon/footprints/donphan_footprint.1bpp"
+	.incbin "graphics/pokemon/donphan/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_porygon2_still_front_pic:: @ 8DCEB68
-	.incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon2/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon2_palette:: @ 8DCEDF0
-	.incbin "graphics/pokemon/palettes/porygon2_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon2/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_porygon2_back_pic:: @ 8DCEE18
-	.incbin "graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/porygon2/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_porygon2_shiny_palette:: @ 8DCF134
-	.incbin "graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/porygon2/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_porygon2_icon:: @ 8DCF15C
-	.incbin "graphics/pokemon/icons/porygon2_icon.4bpp"
+	.incbin "graphics/pokemon/porygon2/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_porygon2_footprint:: @ 8DCF55C
-	.incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp"
+	.incbin "graphics/pokemon/porygon2/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_stantler_still_front_pic:: @ 8DCF57C
-	.incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/stantler/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_stantler_palette:: @ 8DCF990
-	.incbin "graphics/pokemon/palettes/stantler_palette.gbapal.lz"
+	.incbin "graphics/pokemon/stantler/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_stantler_back_pic:: @ 8DCF9B8
-	.incbin "graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/stantler/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_stantler_shiny_palette:: @ 8DCFD04
-	.incbin "graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/stantler/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_stantler_icon:: @ 8DCFD2C
-	.incbin "graphics/pokemon/icons/stantler_icon.4bpp"
+	.incbin "graphics/pokemon/stantler/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_stantler_footprint:: @ 8DD012C
-	.incbin "graphics/pokemon/footprints/stantler_footprint.1bpp"
+	.incbin "graphics/pokemon/stantler/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_smeargle_still_front_pic:: @ 8DD014C
-	.incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smeargle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smeargle_palette:: @ 8DD04E0
-	.incbin "graphics/pokemon/palettes/smeargle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smeargle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_smeargle_back_pic:: @ 8DD0508
-	.incbin "graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smeargle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smeargle_shiny_palette:: @ 8DD082C
-	.incbin "graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smeargle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_smeargle_icon:: @ 8DD0854
-	.incbin "graphics/pokemon/icons/smeargle_icon.4bpp"
+	.incbin "graphics/pokemon/smeargle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_smeargle_footprint:: @ 8DD0C54
-	.incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp"
+	.incbin "graphics/pokemon/smeargle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tyrogue_still_front_pic:: @ 8DD0C74
-	.incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyrogue/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyrogue_palette:: @ 8DD0F00
-	.incbin "graphics/pokemon/palettes/tyrogue_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyrogue/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tyrogue_back_pic:: @ 8DD0F28
-	.incbin "graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyrogue/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyrogue_shiny_palette:: @ 8DD1244
-	.incbin "graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyrogue/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tyrogue_icon:: @ 8DD126C
-	.incbin "graphics/pokemon/icons/tyrogue_icon.4bpp"
+	.incbin "graphics/pokemon/tyrogue/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tyrogue_footprint:: @ 8DD166C
-	.incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp"
+	.incbin "graphics/pokemon/tyrogue/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hitmontop_still_front_pic:: @ 8DD168C
-	.incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmontop/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmontop_palette:: @ 8DD1A18
-	.incbin "graphics/pokemon/palettes/hitmontop_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmontop/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hitmontop_back_pic:: @ 8DD1A40
-	.incbin "graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hitmontop/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68
-	.incbin "graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hitmontop/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90
-	.incbin "graphics/pokemon/icons/hitmontop_icon.4bpp"
+	.incbin "graphics/pokemon/hitmontop/icon.4bpp"
 
 gUnknown_hitmontop_unknown_data:: @ 8DD2290
 	.incbin "baserom.gba", 0xDD2290, 0x200
 
 	.align 2
 gFile_graphics_pokemon_footprints_hitmontop_footprint:: @ 8DD2490
-	.incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp"
+	.incbin "graphics/pokemon/hitmontop/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_smoochum_still_front_pic:: @ 8DD24B0
-	.incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smoochum/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smoochum_palette:: @ 8DD2708
-	.incbin "graphics/pokemon/palettes/smoochum_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smoochum/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_smoochum_back_pic:: @ 8DD2730
-	.incbin "graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/smoochum/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_smoochum_shiny_palette:: @ 8DD29A8
-	.incbin "graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/smoochum/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_smoochum_icon:: @ 8DD29D0
-	.incbin "graphics/pokemon/icons/smoochum_icon.4bpp"
+	.incbin "graphics/pokemon/smoochum/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_smoochum_footprint:: @ 8DD2DD0
-	.incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp"
+	.incbin "graphics/pokemon/smoochum/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_elekid_still_front_pic:: @ 8DD2DF0
-	.incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/elekid/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_elekid_palette:: @ 8DD30F8
-	.incbin "graphics/pokemon/palettes/elekid_palette.gbapal.lz"
+	.incbin "graphics/pokemon/elekid/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_elekid_back_pic:: @ 8DD3120
-	.incbin "graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/elekid/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_elekid_shiny_palette:: @ 8DD3478
-	.incbin "graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/elekid/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_elekid_icon:: @ 8DD34A0
-	.incbin "graphics/pokemon/icons/elekid_icon.4bpp"
+	.incbin "graphics/pokemon/elekid/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_elekid_footprint:: @ 8DD38A0
-	.incbin "graphics/pokemon/footprints/elekid_footprint.1bpp"
+	.incbin "graphics/pokemon/elekid/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_magby_still_front_pic:: @ 8DD38C0
-	.incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magby/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magby_palette:: @ 8DD3B44
-	.incbin "graphics/pokemon/palettes/magby_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magby/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_magby_back_pic:: @ 8DD3B6C
-	.incbin "graphics/pokemon/back_pics/magby_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/magby/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_magby_shiny_palette:: @ 8DD3E18
-	.incbin "graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/magby/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_magby_icon:: @ 8DD3E40
-	.incbin "graphics/pokemon/icons/magby_icon.4bpp"
+	.incbin "graphics/pokemon/magby/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_magby_footprint:: @ 8DD4240
-	.incbin "graphics/pokemon/footprints/magby_footprint.1bpp"
+	.incbin "graphics/pokemon/magby/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_miltank_still_front_pic:: @ 8DD4260
-	.incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/miltank/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_miltank_palette:: @ 8DD4610
-	.incbin "graphics/pokemon/palettes/miltank_palette.gbapal.lz"
+	.incbin "graphics/pokemon/miltank/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_miltank_back_pic:: @ 8DD4638
-	.incbin "graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/miltank/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_miltank_shiny_palette:: @ 8DD49D4
-	.incbin "graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/miltank/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_miltank_icon:: @ 8DD49FC
-	.incbin "graphics/pokemon/icons/miltank_icon.4bpp"
+	.incbin "graphics/pokemon/miltank/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_miltank_footprint:: @ 8DD4DFC
-	.incbin "graphics/pokemon/footprints/miltank_footprint.1bpp"
+	.incbin "graphics/pokemon/miltank/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blissey_still_front_pic:: @ 8DD4E1C
-	.incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blissey/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blissey_palette:: @ 8DD5204
-	.incbin "graphics/pokemon/palettes/blissey_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blissey/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blissey_back_pic:: @ 8DD522C
-	.incbin "graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blissey/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blissey_shiny_palette:: @ 8DD54F8
-	.incbin "graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blissey/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blissey_icon:: @ 8DD5520
-	.incbin "graphics/pokemon/icons/blissey_icon.4bpp"
+	.incbin "graphics/pokemon/blissey/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blissey_footprint:: @ 8DD5920
-	.incbin "graphics/pokemon/footprints/blissey_footprint.1bpp"
+	.incbin "graphics/pokemon/blissey/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_raikou_still_front_pic:: @ 8DD5940
-	.incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raikou/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raikou_palette:: @ 8DD5EBC
-	.incbin "graphics/pokemon/palettes/raikou_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raikou/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_raikou_back_pic:: @ 8DD5EE4
-	.incbin "graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/raikou/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_raikou_shiny_palette:: @ 8DD628C
-	.incbin "graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/raikou/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_raikou_icon:: @ 8DD62B4
-	.incbin "graphics/pokemon/icons/raikou_icon.4bpp"
+	.incbin "graphics/pokemon/raikou/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_raikou_footprint:: @ 8DD66B4
-	.incbin "graphics/pokemon/footprints/raikou_footprint.1bpp"
+	.incbin "graphics/pokemon/raikou/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_entei_still_front_pic:: @ 8DD66D4
-	.incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/entei/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_entei_palette:: @ 8DD6CD0
-	.incbin "graphics/pokemon/palettes/entei_palette.gbapal.lz"
+	.incbin "graphics/pokemon/entei/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_entei_back_pic:: @ 8DD6CF8
-	.incbin "graphics/pokemon/back_pics/entei_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/entei/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_entei_shiny_palette:: @ 8DD711C
-	.incbin "graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/entei/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_entei_icon:: @ 8DD7144
-	.incbin "graphics/pokemon/icons/entei_icon.4bpp"
+	.incbin "graphics/pokemon/entei/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_entei_footprint:: @ 8DD7544
-	.incbin "graphics/pokemon/footprints/entei_footprint.1bpp"
+	.incbin "graphics/pokemon/entei/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_suicune_still_front_pic:: @ 8DD7564
-	.incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/suicune/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_suicune_palette:: @ 8DD7AE8
-	.incbin "graphics/pokemon/palettes/suicune_palette.gbapal.lz"
+	.incbin "graphics/pokemon/suicune/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_suicune_back_pic:: @ 8DD7B10
-	.incbin "graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/suicune/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_suicune_shiny_palette:: @ 8DD7FEC
-	.incbin "graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/suicune/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_suicune_icon:: @ 8DD8014
-	.incbin "graphics/pokemon/icons/suicune_icon.4bpp"
+	.incbin "graphics/pokemon/suicune/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_suicune_footprint:: @ 8DD8414
-	.incbin "graphics/pokemon/footprints/suicune_footprint.1bpp"
+	.incbin "graphics/pokemon/suicune/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_larvitar_still_front_pic:: @ 8DD8434
-	.incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/larvitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_larvitar_palette:: @ 8DD8690
-	.incbin "graphics/pokemon/palettes/larvitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/larvitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_larvitar_back_pic:: @ 8DD86B8
-	.incbin "graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/larvitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_larvitar_shiny_palette:: @ 8DD8964
-	.incbin "graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/larvitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_larvitar_icon:: @ 8DD898C
-	.incbin "graphics/pokemon/icons/larvitar_icon.4bpp"
+	.incbin "graphics/pokemon/larvitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_larvitar_footprint:: @ 8DD8D8C
-	.incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp"
+	.incbin "graphics/pokemon/larvitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pupitar_still_front_pic:: @ 8DD8DAC
-	.incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pupitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pupitar_palette:: @ 8DD909C
-	.incbin "graphics/pokemon/palettes/pupitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pupitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pupitar_back_pic:: @ 8DD90C4
-	.incbin "graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pupitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pupitar_shiny_palette:: @ 8DD93FC
-	.incbin "graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pupitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pupitar_icon:: @ 8DD9424
-	.incbin "graphics/pokemon/icons/pupitar_icon.4bpp"
+	.incbin "graphics/pokemon/pupitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pupitar_footprint:: @ 8DD9824
-	.incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp"
+	.incbin "graphics/pokemon/pupitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tyranitar_still_front_pic:: @ 8DD9844
-	.incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyranitar/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyranitar_palette:: @ 8DD9D80
-	.incbin "graphics/pokemon/palettes/tyranitar_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyranitar/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tyranitar_back_pic:: @ 8DD9DA8
-	.incbin "graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tyranitar/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tyranitar_shiny_palette:: @ 8DDA194
-	.incbin "graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tyranitar/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tyranitar_icon:: @ 8DDA1BC
-	.incbin "graphics/pokemon/icons/tyranitar_icon.4bpp"
+	.incbin "graphics/pokemon/tyranitar/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tyranitar_footprint:: @ 8DDA5BC
-	.incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp"
+	.incbin "graphics/pokemon/tyranitar/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lugia_still_front_pic:: @ 8DDA5DC
-	.incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lugia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lugia_palette:: @ 8DDAAA0
-	.incbin "graphics/pokemon/palettes/lugia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lugia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lugia_back_pic:: @ 8DDAAC8
-	.incbin "graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lugia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lugia_shiny_palette:: @ 8DDAE9C
-	.incbin "graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lugia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lugia_icon:: @ 8DDAEC4
-	.incbin "graphics/pokemon/icons/lugia_icon.4bpp"
+	.incbin "graphics/pokemon/lugia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lugia_footprint:: @ 8DDB2C4
-	.incbin "graphics/pokemon/footprints/lugia_footprint.1bpp"
+	.incbin "graphics/pokemon/lugia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ho_oh_still_front_pic:: @ 8DDB2E4
-	.incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ho_oh/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ho_oh_palette:: @ 8DDB938
-	.incbin "graphics/pokemon/palettes/ho_oh_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ho_oh/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ho_oh_back_pic:: @ 8DDB960
-	.incbin "graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ho_oh/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ho_oh_shiny_palette:: @ 8DDBD70
-	.incbin "graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ho_oh/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ho_oh_icon:: @ 8DDBD98
-	.incbin "graphics/pokemon/icons/ho_oh_icon.4bpp"
+	.incbin "graphics/pokemon/ho_oh/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ho_oh_footprint:: @ 8DDC198
-	.incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp"
+	.incbin "graphics/pokemon/ho_oh/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_celebi_still_front_pic:: @ 8DDC1B8
-	.incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/celebi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_celebi_palette:: @ 8DDC430
-	.incbin "graphics/pokemon/palettes/celebi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/celebi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_celebi_back_pic:: @ 8DDC458
-	.incbin "graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/celebi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_celebi_shiny_palette:: @ 8DDC804
-	.incbin "graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/celebi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_celebi_icon:: @ 8DDC82C
-	.incbin "graphics/pokemon/icons/celebi_icon.4bpp"
+	.incbin "graphics/pokemon/celebi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_celebi_footprint:: @ 8DDCC2C
-	.incbin "graphics/pokemon/footprints/celebi_footprint.1bpp"
+	.incbin "graphics/pokemon/celebi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_double_question_mark_still_front_pic:: @ 8DDCC4C
-	.incbin "graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/question_mark/double/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_double_question_mark_palette:: @ 8DDCDD0
-	.incbin "graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/double/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCDE4
-	.incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/question_mark/double/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_double_question_mark_shiny_palette:: @ 8DDCF68
-	.incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/question_mark/double/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_treecko_still_front_pic:: @ 8DDCF7C
-	.incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/treecko/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_treecko_palette:: @ 8DDD284
-	.incbin "graphics/pokemon/palettes/treecko_palette.gbapal.lz"
+	.incbin "graphics/pokemon/treecko/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_treecko_back_pic:: @ 8DDD2AC
-	.incbin "graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/treecko/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_treecko_shiny_palette:: @ 8DDD5AC
-	.incbin "graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/treecko/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_treecko_icon:: @ 8DDD5D4
-	.incbin "graphics/pokemon/icons/treecko_icon.4bpp"
+	.incbin "graphics/pokemon/treecko/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_treecko_footprint:: @ 8DDD9D4
-	.incbin "graphics/pokemon/footprints/treecko_footprint.1bpp"
+	.incbin "graphics/pokemon/treecko/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grovyle_still_front_pic:: @ 8DDD9F4
-	.incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grovyle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grovyle_palette:: @ 8DDDE80
-	.incbin "graphics/pokemon/palettes/grovyle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grovyle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grovyle_back_pic:: @ 8DDDEA8
-	.incbin "graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grovyle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grovyle_shiny_palette:: @ 8DDE1E4
-	.incbin "graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grovyle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grovyle_icon:: @ 8DDE20C
-	.incbin "graphics/pokemon/icons/grovyle_icon.4bpp"
+	.incbin "graphics/pokemon/grovyle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grovyle_footprint:: @ 8DDE60C
-	.incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp"
+	.incbin "graphics/pokemon/grovyle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sceptile_still_front_pic:: @ 8DDE62C
-	.incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sceptile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sceptile_palette:: @ 8DDEB30
-	.incbin "graphics/pokemon/palettes/sceptile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sceptile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sceptile_back_pic:: @ 8DDEB58
-	.incbin "graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sceptile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sceptile_shiny_palette:: @ 8DDEF54
-	.incbin "graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sceptile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sceptile_icon:: @ 8DDEF7C
-	.incbin "graphics/pokemon/icons/sceptile_icon.4bpp"
+	.incbin "graphics/pokemon/sceptile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sceptile_footprint:: @ 8DDF37C
-	.incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp"
+	.incbin "graphics/pokemon/sceptile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_torchic_still_front_pic:: @ 8DDF39C
-	.incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torchic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torchic_palette:: @ 8DDF638
-	.incbin "graphics/pokemon/palettes/torchic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torchic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_torchic_back_pic:: @ 8DDF660
-	.incbin "graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torchic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torchic_shiny_palette:: @ 8DDF938
-	.incbin "graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torchic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_torchic_icon:: @ 8DDF960
-	.incbin "graphics/pokemon/icons/torchic_icon.4bpp"
+	.incbin "graphics/pokemon/torchic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_torchic_footprint:: @ 8DDFD60
-	.incbin "graphics/pokemon/footprints/torchic_footprint.1bpp"
+	.incbin "graphics/pokemon/torchic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_combusken_still_front_pic:: @ 8DDFD80
-	.incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/combusken/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_combusken_palette:: @ 8DE016C
-	.incbin "graphics/pokemon/palettes/combusken_palette.gbapal.lz"
+	.incbin "graphics/pokemon/combusken/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_combusken_back_pic:: @ 8DE0194
-	.incbin "graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/combusken/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_combusken_shiny_palette:: @ 8DE0564
-	.incbin "graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/combusken/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_combusken_icon:: @ 8DE058C
-	.incbin "graphics/pokemon/icons/combusken_icon.4bpp"
+	.incbin "graphics/pokemon/combusken/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_combusken_footprint:: @ 8DE098C
-	.incbin "graphics/pokemon/footprints/combusken_footprint.1bpp"
+	.incbin "graphics/pokemon/combusken/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_blaziken_still_front_pic:: @ 8DE09AC
-	.incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blaziken/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blaziken_palette:: @ 8DE0E24
-	.incbin "graphics/pokemon/palettes/blaziken_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blaziken/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_blaziken_back_pic:: @ 8DE0E4C
-	.incbin "graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/blaziken/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_blaziken_shiny_palette:: @ 8DE1228
-	.incbin "graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/blaziken/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_blaziken_icon:: @ 8DE1250
-	.incbin "graphics/pokemon/icons/blaziken_icon.4bpp"
+	.incbin "graphics/pokemon/blaziken/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_blaziken_footprint:: @ 8DE1650
-	.incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp"
+	.incbin "graphics/pokemon/blaziken/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mudkip_still_front_pic:: @ 8DE1670
-	.incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mudkip/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mudkip_palette:: @ 8DE1928
-	.incbin "graphics/pokemon/palettes/mudkip_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mudkip/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mudkip_back_pic:: @ 8DE1950
-	.incbin "graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mudkip/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mudkip_shiny_palette:: @ 8DE1C30
-	.incbin "graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mudkip/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mudkip_icon:: @ 8DE1C58
-	.incbin "graphics/pokemon/icons/mudkip_icon.4bpp"
+	.incbin "graphics/pokemon/mudkip/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mudkip_footprint:: @ 8DE2058
-	.incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp"
+	.incbin "graphics/pokemon/mudkip/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_marshtomp_still_front_pic:: @ 8DE2078
-	.incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marshtomp/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marshtomp_palette:: @ 8DE2400
-	.incbin "graphics/pokemon/palettes/marshtomp_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marshtomp/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_marshtomp_back_pic:: @ 8DE2428
-	.incbin "graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/marshtomp/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_marshtomp_shiny_palette:: @ 8DE27D8
-	.incbin "graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/marshtomp/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_marshtomp_icon:: @ 8DE2800
-	.incbin "graphics/pokemon/icons/marshtomp_icon.4bpp"
+	.incbin "graphics/pokemon/marshtomp/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_marshtomp_footprint:: @ 8DE2C00
-	.incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp"
+	.incbin "graphics/pokemon/marshtomp/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swampert_still_front_pic:: @ 8DE2C20
-	.incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swampert/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swampert_palette:: @ 8DE319C
-	.incbin "graphics/pokemon/palettes/swampert_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swampert/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swampert_back_pic:: @ 8DE31C4
-	.incbin "graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swampert/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swampert_shiny_palette:: @ 8DE3578
-	.incbin "graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swampert/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swampert_icon:: @ 8DE35A0
-	.incbin "graphics/pokemon/icons/swampert_icon.4bpp"
+	.incbin "graphics/pokemon/swampert/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swampert_footprint:: @ 8DE39A0
-	.incbin "graphics/pokemon/footprints/swampert_footprint.1bpp"
+	.incbin "graphics/pokemon/swampert/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_poochyena_still_front_pic:: @ 8DE39C0
-	.incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poochyena/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poochyena_palette:: @ 8DE3C88
-	.incbin "graphics/pokemon/palettes/poochyena_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poochyena/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_poochyena_back_pic:: @ 8DE3CB0
-	.incbin "graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/poochyena/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_poochyena_shiny_palette:: @ 8DE3FDC
-	.incbin "graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/poochyena/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_poochyena_icon:: @ 8DE4004
-	.incbin "graphics/pokemon/icons/poochyena_icon.4bpp"
+	.incbin "graphics/pokemon/poochyena/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_poochyena_footprint:: @ 8DE4404
-	.incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp"
+	.incbin "graphics/pokemon/poochyena/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mightyena_still_front_pic:: @ 8DE4424
-	.incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mightyena/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mightyena_palette:: @ 8DE485C
-	.incbin "graphics/pokemon/palettes/mightyena_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mightyena/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mightyena_back_pic:: @ 8DE4884
-	.incbin "graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mightyena/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mightyena_shiny_palette:: @ 8DE4BFC
-	.incbin "graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mightyena/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mightyena_icon:: @ 8DE4C24
-	.incbin "graphics/pokemon/icons/mightyena_icon.4bpp"
+	.incbin "graphics/pokemon/mightyena/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mightyena_footprint:: @ 8DE5024
-	.incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp"
+	.incbin "graphics/pokemon/mightyena/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zigzagoon_still_front_pic:: @ 8DE5044
-	.incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zigzagoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zigzagoon_palette:: @ 8DE5414
-	.incbin "graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zigzagoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zigzagoon_back_pic:: @ 8DE543C
-	.incbin "graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zigzagoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zigzagoon_shiny_palette:: @ 8DE577C
-	.incbin "graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zigzagoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zigzagoon_icon:: @ 8DE57A4
-	.incbin "graphics/pokemon/icons/zigzagoon_icon.4bpp"
+	.incbin "graphics/pokemon/zigzagoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zigzagoon_footprint:: @ 8DE5BA4
-	.incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp"
+	.incbin "graphics/pokemon/zigzagoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_linoone_still_front_pic:: @ 8DE5BC4
-	.incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/linoone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_linoone_palette:: @ 8DE5F34
-	.incbin "graphics/pokemon/palettes/linoone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/linoone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_linoone_back_pic:: @ 8DE5F5C
-	.incbin "graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/linoone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_linoone_shiny_palette:: @ 8DE6230
-	.incbin "graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/linoone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_linoone_icon:: @ 8DE6258
-	.incbin "graphics/pokemon/icons/linoone_icon.4bpp"
+	.incbin "graphics/pokemon/linoone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_linoone_footprint:: @ 8DE6658
-	.incbin "graphics/pokemon/footprints/linoone_footprint.1bpp"
+	.incbin "graphics/pokemon/linoone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wurmple_still_front_pic:: @ 8DE6678
-	.incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wurmple/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wurmple_palette:: @ 8DE6900
-	.incbin "graphics/pokemon/palettes/wurmple_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wurmple/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wurmple_back_pic:: @ 8DE6928
-	.incbin "graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wurmple/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wurmple_shiny_palette:: @ 8DE6B74
-	.incbin "graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wurmple/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wurmple_icon:: @ 8DE6B9C
-	.incbin "graphics/pokemon/icons/wurmple_icon.4bpp"
+	.incbin "graphics/pokemon/wurmple/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wurmple_footprint:: @ 8DE6F9C
-	.incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp"
+	.incbin "graphics/pokemon/wurmple/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_silcoon_still_front_pic:: @ 8DE6FBC
-	.incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/silcoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_silcoon_palette:: @ 8DE723C
-	.incbin "graphics/pokemon/palettes/silcoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/silcoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_silcoon_back_pic:: @ 8DE7264
-	.incbin "graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/silcoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_silcoon_shiny_palette:: @ 8DE7480
-	.incbin "graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/silcoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_silcoon_icon:: @ 8DE74A8
-	.incbin "graphics/pokemon/icons/silcoon_icon.4bpp"
+	.incbin "graphics/pokemon/silcoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_silcoon_footprint:: @ 8DE78A8
-	.incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp"
+	.incbin "graphics/pokemon/silcoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beautifly_still_front_pic:: @ 8DE78C8
-	.incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beautifly/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beautifly_palette:: @ 8DE7C20
-	.incbin "graphics/pokemon/palettes/beautifly_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beautifly/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beautifly_back_pic:: @ 8DE7C48
-	.incbin "graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beautifly/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beautifly_shiny_palette:: @ 8DE7FF8
-	.incbin "graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beautifly/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beautifly_icon:: @ 8DE8020
-	.incbin "graphics/pokemon/icons/beautifly_icon.4bpp"
+	.incbin "graphics/pokemon/beautifly/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beautifly_footprint:: @ 8DE8420
-	.incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp"
+	.incbin "graphics/pokemon/beautifly/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cascoon_still_front_pic:: @ 8DE8440
-	.incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cascoon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cascoon_palette:: @ 8DE86AC
-	.incbin "graphics/pokemon/palettes/cascoon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cascoon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cascoon_back_pic:: @ 8DE86D4
-	.incbin "graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cascoon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cascoon_shiny_palette:: @ 8DE88E4
-	.incbin "graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cascoon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cascoon_icon:: @ 8DE890C
-	.incbin "graphics/pokemon/icons/cascoon_icon.4bpp"
+	.incbin "graphics/pokemon/cascoon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cascoon_footprint:: @ 8DE8D0C
-	.incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp"
+	.incbin "graphics/pokemon/cascoon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dustox_still_front_pic:: @ 8DE8D2C
-	.incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dustox/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dustox_palette:: @ 8DE9094
-	.incbin "graphics/pokemon/palettes/dustox_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dustox/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dustox_back_pic:: @ 8DE90BC
-	.incbin "graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dustox/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dustox_shiny_palette:: @ 8DE9314
-	.incbin "graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dustox/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dustox_icon:: @ 8DE933C
-	.incbin "graphics/pokemon/icons/dustox_icon.4bpp"
+	.incbin "graphics/pokemon/dustox/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dustox_footprint:: @ 8DE973C
-	.incbin "graphics/pokemon/footprints/dustox_footprint.1bpp"
+	.incbin "graphics/pokemon/dustox/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lotad_still_front_pic:: @ 8DE975C
-	.incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lotad/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lotad_palette:: @ 8DE99BC
-	.incbin "graphics/pokemon/palettes/lotad_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lotad/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lotad_back_pic:: @ 8DE99E4
-	.incbin "graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lotad/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lotad_shiny_palette:: @ 8DE9CCC
-	.incbin "graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lotad/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lotad_icon:: @ 8DE9CF4
-	.incbin "graphics/pokemon/icons/lotad_icon.4bpp"
+	.incbin "graphics/pokemon/lotad/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lotad_footprint:: @ 8DEA0F4
-	.incbin "graphics/pokemon/footprints/lotad_footprint.1bpp"
+	.incbin "graphics/pokemon/lotad/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lombre_still_front_pic:: @ 8DEA114
-	.incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lombre/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lombre_palette:: @ 8DEA42C
-	.incbin "graphics/pokemon/palettes/lombre_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lombre/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lombre_back_pic:: @ 8DEA454
-	.incbin "graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lombre/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lombre_shiny_palette:: @ 8DEA750
-	.incbin "graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lombre/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lombre_icon:: @ 8DEA778
-	.incbin "graphics/pokemon/icons/lombre_icon.4bpp"
+	.incbin "graphics/pokemon/lombre/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lombre_footprint:: @ 8DEAB78
-	.incbin "graphics/pokemon/footprints/lombre_footprint.1bpp"
+	.incbin "graphics/pokemon/lombre/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ludicolo_still_front_pic:: @ 8DEAB98
-	.incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ludicolo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ludicolo_palette:: @ 8DEB07C
-	.incbin "graphics/pokemon/palettes/ludicolo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ludicolo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ludicolo_back_pic:: @ 8DEB0A4
-	.incbin "graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ludicolo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ludicolo_shiny_palette:: @ 8DEB3A0
-	.incbin "graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ludicolo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ludicolo_icon:: @ 8DEB3C8
-	.incbin "graphics/pokemon/icons/ludicolo_icon.4bpp"
+	.incbin "graphics/pokemon/ludicolo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ludicolo_footprint:: @ 8DEB7C8
-	.incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp"
+	.incbin "graphics/pokemon/ludicolo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seedot_still_front_pic:: @ 8DEB7E8
-	.incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seedot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seedot_palette:: @ 8DEBA7C
-	.incbin "graphics/pokemon/palettes/seedot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seedot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seedot_back_pic:: @ 8DEBAA4
-	.incbin "graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seedot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seedot_shiny_palette:: @ 8DEBD84
-	.incbin "graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seedot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seedot_icon:: @ 8DEBDAC
-	.incbin "graphics/pokemon/icons/seedot_icon.4bpp"
+	.incbin "graphics/pokemon/seedot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seedot_footprint:: @ 8DEC1AC
-	.incbin "graphics/pokemon/footprints/seedot_footprint.1bpp"
+	.incbin "graphics/pokemon/seedot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nuzleaf_still_front_pic:: @ 8DEC1CC
-	.incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nuzleaf/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nuzleaf_palette:: @ 8DEC4B8
-	.incbin "graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nuzleaf/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nuzleaf_back_pic:: @ 8DEC4E0
-	.incbin "graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nuzleaf/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nuzleaf_shiny_palette:: @ 8DEC7A8
-	.incbin "graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nuzleaf/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nuzleaf_icon:: @ 8DEC7D0
-	.incbin "graphics/pokemon/icons/nuzleaf_icon.4bpp"
+	.incbin "graphics/pokemon/nuzleaf/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nuzleaf_footprint:: @ 8DECBD0
-	.incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp"
+	.incbin "graphics/pokemon/nuzleaf/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shiftry_still_front_pic:: @ 8DECBF0
-	.incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shiftry/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shiftry_palette:: @ 8DED0AC
-	.incbin "graphics/pokemon/palettes/shiftry_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shiftry/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shiftry_back_pic:: @ 8DED0D4
-	.incbin "graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shiftry/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shiftry_shiny_palette:: @ 8DED398
-	.incbin "graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shiftry/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shiftry_icon:: @ 8DED3C0
-	.incbin "graphics/pokemon/icons/shiftry_icon.4bpp"
+	.incbin "graphics/pokemon/shiftry/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shiftry_footprint:: @ 8DED7C0
-	.incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp"
+	.incbin "graphics/pokemon/shiftry/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nincada_still_front_pic:: @ 8DED7E0
-	.incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nincada/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nincada_palette:: @ 8DEDA80
-	.incbin "graphics/pokemon/palettes/nincada_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nincada/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nincada_back_pic:: @ 8DEDAA8
-	.incbin "graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nincada/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nincada_shiny_palette:: @ 8DEDD60
-	.incbin "graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nincada/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nincada_icon:: @ 8DEDD88
-	.incbin "graphics/pokemon/icons/nincada_icon.4bpp"
+	.incbin "graphics/pokemon/nincada/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nincada_footprint:: @ 8DEE188
-	.incbin "graphics/pokemon/footprints/nincada_footprint.1bpp"
+	.incbin "graphics/pokemon/nincada/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ninjask_still_front_pic:: @ 8DEE1A8
-	.incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninjask/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninjask_palette:: @ 8DEE518
-	.incbin "graphics/pokemon/palettes/ninjask_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninjask/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ninjask_back_pic:: @ 8DEE540
-	.incbin "graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ninjask/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ninjask_shiny_palette:: @ 8DEE90C
-	.incbin "graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ninjask/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ninjask_icon:: @ 8DEE934
-	.incbin "graphics/pokemon/icons/ninjask_icon.4bpp"
+	.incbin "graphics/pokemon/ninjask/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ninjask_footprint:: @ 8DEED34
-	.incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp"
+	.incbin "graphics/pokemon/ninjask/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shedinja_still_front_pic:: @ 8DEED54
-	.incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shedinja/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shedinja_palette:: @ 8DEF074
-	.incbin "graphics/pokemon/palettes/shedinja_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shedinja/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shedinja_back_pic:: @ 8DEF09C
-	.incbin "graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shedinja/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shedinja_shiny_palette:: @ 8DEF43C
-	.incbin "graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shedinja/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shedinja_icon:: @ 8DEF464
-	.incbin "graphics/pokemon/icons/shedinja_icon.4bpp"
+	.incbin "graphics/pokemon/shedinja/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shedinja_footprint:: @ 8DEF864
-	.incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp"
+	.incbin "graphics/pokemon/shedinja/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_taillow_still_front_pic:: @ 8DEF884
-	.incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/taillow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_taillow_palette:: @ 8DEFADC
-	.incbin "graphics/pokemon/palettes/taillow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/taillow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_taillow_back_pic:: @ 8DEFB04
-	.incbin "graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/taillow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_taillow_shiny_palette:: @ 8DEFD24
-	.incbin "graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/taillow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_taillow_icon:: @ 8DEFD4C
-	.incbin "graphics/pokemon/icons/taillow_icon.4bpp"
+	.incbin "graphics/pokemon/taillow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_taillow_footprint:: @ 8DF014C
-	.incbin "graphics/pokemon/footprints/taillow_footprint.1bpp"
+	.incbin "graphics/pokemon/taillow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swellow_still_front_pic:: @ 8DF016C
-	.incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swellow/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swellow_palette:: @ 8DF0530
-	.incbin "graphics/pokemon/palettes/swellow_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swellow/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swellow_back_pic:: @ 8DF0558
-	.incbin "graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swellow/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swellow_shiny_palette:: @ 8DF0890
-	.incbin "graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swellow/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swellow_icon:: @ 8DF08B8
-	.incbin "graphics/pokemon/icons/swellow_icon.4bpp"
+	.incbin "graphics/pokemon/swellow/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swellow_footprint:: @ 8DF0CB8
-	.incbin "graphics/pokemon/footprints/swellow_footprint.1bpp"
+	.incbin "graphics/pokemon/swellow/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shroomish_still_front_pic:: @ 8DF0CD8
-	.incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shroomish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shroomish_palette:: @ 8DF0F40
-	.incbin "graphics/pokemon/palettes/shroomish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shroomish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shroomish_back_pic:: @ 8DF0F68
-	.incbin "graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shroomish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shroomish_shiny_palette:: @ 8DF1248
-	.incbin "graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shroomish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shroomish_icon:: @ 8DF1270
-	.incbin "graphics/pokemon/icons/shroomish_icon.4bpp"
+	.incbin "graphics/pokemon/shroomish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shroomish_footprint:: @ 8DF1670
-	.incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp"
+	.incbin "graphics/pokemon/shroomish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_breloom_still_front_pic:: @ 8DF1690
-	.incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/breloom/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_breloom_palette:: @ 8DF1A78
-	.incbin "graphics/pokemon/palettes/breloom_palette.gbapal.lz"
+	.incbin "graphics/pokemon/breloom/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_breloom_back_pic:: @ 8DF1AA0
-	.incbin "graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/breloom/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_breloom_shiny_palette:: @ 8DF1E80
-	.incbin "graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/breloom/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_breloom_icon:: @ 8DF1EA8
-	.incbin "graphics/pokemon/icons/breloom_icon.4bpp"
+	.incbin "graphics/pokemon/breloom/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_breloom_footprint:: @ 8DF22A8
-	.incbin "graphics/pokemon/footprints/breloom_footprint.1bpp"
+	.incbin "graphics/pokemon/breloom/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spinda_still_front_pic:: @ 8DF22C8
-	.incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinda/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinda_palette:: @ 8DF25C8
-	.incbin "graphics/pokemon/palettes/spinda_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinda/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spinda_back_pic:: @ 8DF25F0
-	.incbin "graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spinda/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spinda_shiny_palette:: @ 8DF292C
-	.incbin "graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spinda/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spinda_icon:: @ 8DF2954
-	.incbin "graphics/pokemon/icons/spinda_icon.4bpp"
+	.incbin "graphics/pokemon/spinda/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spinda_footprint:: @ 8DF2D54
-	.incbin "graphics/pokemon/footprints/spinda_footprint.1bpp"
+	.incbin "graphics/pokemon/spinda/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wingull_still_front_pic:: @ 8DF2D74
-	.incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wingull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wingull_palette:: @ 8DF2FB0
-	.incbin "graphics/pokemon/palettes/wingull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wingull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wingull_back_pic:: @ 8DF2FD8
-	.incbin "graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wingull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wingull_shiny_palette:: @ 8DF3328
-	.incbin "graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wingull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wingull_icon:: @ 8DF3350
-	.incbin "graphics/pokemon/icons/wingull_icon.4bpp"
+	.incbin "graphics/pokemon/wingull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wingull_footprint:: @ 8DF3750
-	.incbin "graphics/pokemon/footprints/wingull_footprint.1bpp"
+	.incbin "graphics/pokemon/wingull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_pelipper_still_front_pic:: @ 8DF3770
-	.incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pelipper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pelipper_palette:: @ 8DF3B08
-	.incbin "graphics/pokemon/palettes/pelipper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pelipper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_pelipper_back_pic:: @ 8DF3B30
-	.incbin "graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/pelipper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_pelipper_shiny_palette:: @ 8DF3EB0
-	.incbin "graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/pelipper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_pelipper_icon:: @ 8DF3ED8
-	.incbin "graphics/pokemon/icons/pelipper_icon.4bpp"
+	.incbin "graphics/pokemon/pelipper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_pelipper_footprint:: @ 8DF42D8
-	.incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp"
+	.incbin "graphics/pokemon/pelipper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_surskit_still_front_pic:: @ 8DF42F8
-	.incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/surskit/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_surskit_palette:: @ 8DF4504
-	.incbin "graphics/pokemon/palettes/surskit_palette.gbapal.lz"
+	.incbin "graphics/pokemon/surskit/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_surskit_back_pic:: @ 8DF452C
-	.incbin "graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/surskit/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_surskit_shiny_palette:: @ 8DF4764
-	.incbin "graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/surskit/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_surskit_icon:: @ 8DF478C
-	.incbin "graphics/pokemon/icons/surskit_icon.4bpp"
+	.incbin "graphics/pokemon/surskit/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_surskit_footprint:: @ 8DF4B8C
-	.incbin "graphics/pokemon/footprints/surskit_footprint.1bpp"
+	.incbin "graphics/pokemon/surskit/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_masquerain_still_front_pic:: @ 8DF4BAC
-	.incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/masquerain/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_masquerain_palette:: @ 8DF4F48
-	.incbin "graphics/pokemon/palettes/masquerain_palette.gbapal.lz"
+	.incbin "graphics/pokemon/masquerain/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_masquerain_back_pic:: @ 8DF4F70
-	.incbin "graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/masquerain/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_masquerain_shiny_palette:: @ 8DF52C8
-	.incbin "graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/masquerain/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_masquerain_icon:: @ 8DF52F0
-	.incbin "graphics/pokemon/icons/masquerain_icon.4bpp"
+	.incbin "graphics/pokemon/masquerain/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_masquerain_footprint:: @ 8DF56F0
-	.incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp"
+	.incbin "graphics/pokemon/masquerain/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wailmer_still_front_pic:: @ 8DF5710
-	.incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailmer/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailmer_palette:: @ 8DF59F0
-	.incbin "graphics/pokemon/palettes/wailmer_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailmer/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wailmer_back_pic:: @ 8DF5A18
-	.incbin "graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailmer/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailmer_shiny_palette:: @ 8DF5BFC
-	.incbin "graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailmer/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wailmer_icon:: @ 8DF5C24
-	.incbin "graphics/pokemon/icons/wailmer_icon.4bpp"
+	.incbin "graphics/pokemon/wailmer/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wailmer_footprint:: @ 8DF6024
-	.incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp"
+	.incbin "graphics/pokemon/wailmer/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wailord_still_front_pic:: @ 8DF6044
-	.incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailord/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailord_palette:: @ 8DF6408
-	.incbin "graphics/pokemon/palettes/wailord_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailord/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wailord_back_pic:: @ 8DF6430
-	.incbin "graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wailord/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wailord_shiny_palette:: @ 8DF6648
-	.incbin "graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wailord/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wailord_icon:: @ 8DF6670
-	.incbin "graphics/pokemon/icons/wailord_icon.4bpp"
+	.incbin "graphics/pokemon/wailord/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wailord_footprint:: @ 8DF6A70
-	.incbin "graphics/pokemon/footprints/wailord_footprint.1bpp"
+	.incbin "graphics/pokemon/wailord/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_skitty_still_front_pic:: @ 8DF6A90
-	.incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skitty/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skitty_palette:: @ 8DF6D90
-	.incbin "graphics/pokemon/palettes/skitty_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skitty/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_skitty_back_pic:: @ 8DF6DB8
-	.incbin "graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/skitty/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_skitty_shiny_palette:: @ 8DF7100
-	.incbin "graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/skitty/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_skitty_icon:: @ 8DF7128
-	.incbin "graphics/pokemon/icons/skitty_icon.4bpp"
+	.incbin "graphics/pokemon/skitty/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_skitty_footprint:: @ 8DF7528
-	.incbin "graphics/pokemon/footprints/skitty_footprint.1bpp"
+	.incbin "graphics/pokemon/skitty/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_delcatty_still_front_pic:: @ 8DF7548
-	.incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delcatty/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delcatty_palette:: @ 8DF78D4
-	.incbin "graphics/pokemon/palettes/delcatty_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delcatty/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_delcatty_back_pic:: @ 8DF78FC
-	.incbin "graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/delcatty/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_delcatty_shiny_palette:: @ 8DF7C98
-	.incbin "graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/delcatty/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_delcatty_icon:: @ 8DF7CC0
-	.incbin "graphics/pokemon/icons/delcatty_icon.4bpp"
+	.incbin "graphics/pokemon/delcatty/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_delcatty_footprint:: @ 8DF80C0
-	.incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp"
+	.incbin "graphics/pokemon/delcatty/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kecleon_still_front_pic:: @ 8DF80E0
-	.incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kecleon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kecleon_palette:: @ 8DF8460
-	.incbin "graphics/pokemon/palettes/kecleon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kecleon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kecleon_back_pic:: @ 8DF8488
-	.incbin "graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kecleon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kecleon_shiny_palette:: @ 8DF8860
-	.incbin "graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kecleon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kecleon_icon:: @ 8DF8888
-	.incbin "graphics/pokemon/icons/kecleon_icon.4bpp"
+	.incbin "graphics/pokemon/kecleon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kecleon_footprint:: @ 8DF8C88
-	.incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp"
+	.incbin "graphics/pokemon/kecleon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_baltoy_still_front_pic:: @ 8DF8CA8
-	.incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/baltoy/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_baltoy_palette:: @ 8DF8ECC
-	.incbin "graphics/pokemon/palettes/baltoy_palette.gbapal.lz"
+	.incbin "graphics/pokemon/baltoy/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_baltoy_back_pic:: @ 8DF8EEC
-	.incbin "graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/baltoy/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_baltoy_shiny_palette:: @ 8DF9194
-	.incbin "graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/baltoy/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_baltoy_icon:: @ 8DF91B4
-	.incbin "graphics/pokemon/icons/baltoy_icon.4bpp"
+	.incbin "graphics/pokemon/baltoy/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_baltoy_footprint:: @ 8DF95B4
-	.incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp"
+	.incbin "graphics/pokemon/baltoy/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_claydol_still_front_pic:: @ 8DF95D4
-	.incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/claydol/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_claydol_palette:: @ 8DF998C
-	.incbin "graphics/pokemon/palettes/claydol_palette.gbapal.lz"
+	.incbin "graphics/pokemon/claydol/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_claydol_back_pic:: @ 8DF99B4
-	.incbin "graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/claydol/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_claydol_shiny_palette:: @ 8DF9D88
-	.incbin "graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/claydol/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_claydol_icon:: @ 8DF9DB0
-	.incbin "graphics/pokemon/icons/claydol_icon.4bpp"
+	.incbin "graphics/pokemon/claydol/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_claydol_footprint:: @ 8DFA1B0
-	.incbin "graphics/pokemon/footprints/claydol_footprint.1bpp"
+	.incbin "graphics/pokemon/claydol/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_nosepass_still_front_pic:: @ 8DFA1D0
-	.incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nosepass/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nosepass_palette:: @ 8DFA49C
-	.incbin "graphics/pokemon/palettes/nosepass_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nosepass/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_nosepass_back_pic:: @ 8DFA4C4
-	.incbin "graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/nosepass/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_nosepass_shiny_palette:: @ 8DFA764
-	.incbin "graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/nosepass/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_nosepass_icon:: @ 8DFA78C
-	.incbin "graphics/pokemon/icons/nosepass_icon.4bpp"
+	.incbin "graphics/pokemon/nosepass/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_nosepass_footprint:: @ 8DFAB8C
-	.incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp"
+	.incbin "graphics/pokemon/nosepass/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_torkoal_still_front_pic:: @ 8DFABAC
-	.incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torkoal/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torkoal_palette:: @ 8DFB058
-	.incbin "graphics/pokemon/palettes/torkoal_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torkoal/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_torkoal_back_pic:: @ 8DFB080
-	.incbin "graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/torkoal/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_torkoal_shiny_palette:: @ 8DFB348
-	.incbin "graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/torkoal/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_torkoal_icon:: @ 8DFB370
-	.incbin "graphics/pokemon/icons/torkoal_icon.4bpp"
+	.incbin "graphics/pokemon/torkoal/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_torkoal_footprint:: @ 8DFB770
-	.incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp"
+	.incbin "graphics/pokemon/torkoal/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sableye_still_front_pic:: @ 8DFB790
-	.incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sableye/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sableye_palette:: @ 8DFBA64
-	.incbin "graphics/pokemon/palettes/sableye_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sableye/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sableye_back_pic:: @ 8DFBA8C
-	.incbin "graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sableye/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sableye_shiny_palette:: @ 8DFBDB4
-	.incbin "graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sableye/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sableye_icon:: @ 8DFBDDC
-	.incbin "graphics/pokemon/icons/sableye_icon.4bpp"
+	.incbin "graphics/pokemon/sableye/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sableye_footprint:: @ 8DFC1DC
-	.incbin "graphics/pokemon/footprints/sableye_footprint.1bpp"
+	.incbin "graphics/pokemon/sableye/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_barboach_still_front_pic:: @ 8DFC1FC
-	.incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/barboach/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_barboach_palette:: @ 8DFC48C
-	.incbin "graphics/pokemon/palettes/barboach_palette.gbapal.lz"
+	.incbin "graphics/pokemon/barboach/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_barboach_back_pic:: @ 8DFC4B4
-	.incbin "graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/barboach/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_barboach_shiny_palette:: @ 8DFC744
-	.incbin "graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/barboach/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_barboach_icon:: @ 8DFC76C
-	.incbin "graphics/pokemon/icons/barboach_icon.4bpp"
+	.incbin "graphics/pokemon/barboach/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_barboach_footprint:: @ 8DFCB6C
-	.incbin "graphics/pokemon/footprints/barboach_footprint.1bpp"
+	.incbin "graphics/pokemon/barboach/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_whiscash_still_front_pic:: @ 8DFCB8C
-	.incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whiscash/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whiscash_palette:: @ 8DFCF04
-	.incbin "graphics/pokemon/palettes/whiscash_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whiscash/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_whiscash_back_pic:: @ 8DFCF2C
-	.incbin "graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whiscash/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whiscash_shiny_palette:: @ 8DFD278
-	.incbin "graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whiscash/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_whiscash_icon:: @ 8DFD2A0
-	.incbin "graphics/pokemon/icons/whiscash_icon.4bpp"
+	.incbin "graphics/pokemon/whiscash/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_whiscash_footprint:: @ 8DFD6A0
-	.incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp"
+	.incbin "graphics/pokemon/whiscash/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_luvdisc_still_front_pic:: @ 8DFD6C0
-	.incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/luvdisc/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_luvdisc_palette:: @ 8DFD880
-	.incbin "graphics/pokemon/palettes/luvdisc_palette.gbapal.lz"
+	.incbin "graphics/pokemon/luvdisc/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_luvdisc_back_pic:: @ 8DFD8A4
-	.incbin "graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/luvdisc/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_luvdisc_shiny_palette:: @ 8DFDA78
-	.incbin "graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/luvdisc/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_luvdisc_icon:: @ 8DFDA9C
-	.incbin "graphics/pokemon/icons/luvdisc_icon.4bpp"
+	.incbin "graphics/pokemon/luvdisc/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_luvdisc_footprint:: @ 8DFDE9C
-	.incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp"
+	.incbin "graphics/pokemon/luvdisc/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_corphish_still_front_pic:: @ 8DFDEBC
-	.incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corphish/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corphish_palette:: @ 8DFE218
-	.incbin "graphics/pokemon/palettes/corphish_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corphish/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_corphish_back_pic:: @ 8DFE240
-	.incbin "graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/corphish/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_corphish_shiny_palette:: @ 8DFE55C
-	.incbin "graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/corphish/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_corphish_icon:: @ 8DFE584
-	.incbin "graphics/pokemon/icons/corphish_icon.4bpp"
+	.incbin "graphics/pokemon/corphish/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_corphish_footprint:: @ 8DFE984
-	.incbin "graphics/pokemon/footprints/corphish_footprint.1bpp"
+	.incbin "graphics/pokemon/corphish/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_crawdaunt_still_front_pic:: @ 8DFE9A4
-	.incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crawdaunt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crawdaunt_palette:: @ 8DFEE34
-	.incbin "graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crawdaunt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_crawdaunt_back_pic:: @ 8DFEE5C
-	.incbin "graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/crawdaunt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_crawdaunt_shiny_palette:: @ 8DFF240
-	.incbin "graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/crawdaunt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_crawdaunt_icon:: @ 8DFF268
-	.incbin "graphics/pokemon/icons/crawdaunt_icon.4bpp"
+	.incbin "graphics/pokemon/crawdaunt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_crawdaunt_footprint:: @ 8DFF668
-	.incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp"
+	.incbin "graphics/pokemon/crawdaunt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_feebas_still_front_pic:: @ 8DFF688
-	.incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feebas/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feebas_palette:: @ 8DFF914
-	.incbin "graphics/pokemon/palettes/feebas_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feebas/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_feebas_back_pic:: @ 8DFF93C
-	.incbin "graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/feebas/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_feebas_shiny_palette:: @ 8DFFC74
-	.incbin "graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/feebas/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_feebas_icon:: @ 8DFFC9C
-	.incbin "graphics/pokemon/icons/feebas_icon.4bpp"
+	.incbin "graphics/pokemon/feebas/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_feebas_footprint:: @ 8E0009C
-	.incbin "graphics/pokemon/footprints/feebas_footprint.1bpp"
+	.incbin "graphics/pokemon/feebas/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_milotic_still_front_pic:: @ 8E000BC
-	.incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/milotic/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_milotic_palette:: @ 8E0054C
-	.incbin "graphics/pokemon/palettes/milotic_palette.gbapal.lz"
+	.incbin "graphics/pokemon/milotic/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_milotic_back_pic:: @ 8E00574
-	.incbin "graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/milotic/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_milotic_shiny_palette:: @ 8E00868
-	.incbin "graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/milotic/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_milotic_icon:: @ 8E00890
-	.incbin "graphics/pokemon/icons/milotic_icon.4bpp"
+	.incbin "graphics/pokemon/milotic/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_milotic_footprint:: @ 8E00C90
-	.incbin "graphics/pokemon/footprints/milotic_footprint.1bpp"
+	.incbin "graphics/pokemon/milotic/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_carvanha_still_front_pic:: @ 8E00CB0
-	.incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/carvanha/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_carvanha_palette:: @ 8E00FDC
-	.incbin "graphics/pokemon/palettes/carvanha_palette.gbapal.lz"
+	.incbin "graphics/pokemon/carvanha/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_carvanha_back_pic:: @ 8E01004
-	.incbin "graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/carvanha/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_carvanha_shiny_palette:: @ 8E01314
-	.incbin "graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/carvanha/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_carvanha_icon:: @ 8E0133C
-	.incbin "graphics/pokemon/icons/carvanha_icon.4bpp"
+	.incbin "graphics/pokemon/carvanha/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_carvanha_footprint:: @ 8E0173C
-	.incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp"
+	.incbin "graphics/pokemon/carvanha/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sharpedo_still_front_pic:: @ 8E0175C
-	.incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sharpedo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sharpedo_palette:: @ 8E01AEC
-	.incbin "graphics/pokemon/palettes/sharpedo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sharpedo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sharpedo_back_pic:: @ 8E01B14
-	.incbin "graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sharpedo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sharpedo_shiny_palette:: @ 8E01E6C
-	.incbin "graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sharpedo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sharpedo_icon:: @ 8E01E94
-	.incbin "graphics/pokemon/icons/sharpedo_icon.4bpp"
+	.incbin "graphics/pokemon/sharpedo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sharpedo_footprint:: @ 8E02294
-	.incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp"
+	.incbin "graphics/pokemon/sharpedo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_trapinch_still_front_pic:: @ 8E022B4
-	.incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/trapinch/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_trapinch_palette:: @ 8E024D0
-	.incbin "graphics/pokemon/palettes/trapinch_palette.gbapal.lz"
+	.incbin "graphics/pokemon/trapinch/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_trapinch_back_pic:: @ 8E024F8
-	.incbin "graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/trapinch/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_trapinch_shiny_palette:: @ 8E02718
-	.incbin "graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/trapinch/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_trapinch_icon:: @ 8E02740
-	.incbin "graphics/pokemon/icons/trapinch_icon.4bpp"
+	.incbin "graphics/pokemon/trapinch/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_trapinch_footprint:: @ 8E02B40
-	.incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp"
+	.incbin "graphics/pokemon/trapinch/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vibrava_still_front_pic:: @ 8E02B60
-	.incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vibrava/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vibrava_palette:: @ 8E02ED0
-	.incbin "graphics/pokemon/palettes/vibrava_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vibrava/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vibrava_back_pic:: @ 8E02EF8
-	.incbin "graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vibrava/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vibrava_shiny_palette:: @ 8E03170
-	.incbin "graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vibrava/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vibrava_icon:: @ 8E03198
-	.incbin "graphics/pokemon/icons/vibrava_icon.4bpp"
+	.incbin "graphics/pokemon/vibrava/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vibrava_footprint:: @ 8E03598
-	.incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp"
+	.incbin "graphics/pokemon/vibrava/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_flygon_still_front_pic:: @ 8E035B8
-	.incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flygon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flygon_palette:: @ 8E03AA8
-	.incbin "graphics/pokemon/palettes/flygon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flygon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_flygon_back_pic:: @ 8E03AD0
-	.incbin "graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/flygon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_flygon_shiny_palette:: @ 8E03F0C
-	.incbin "graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/flygon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_flygon_icon:: @ 8E03F34
-	.incbin "graphics/pokemon/icons/flygon_icon.4bpp"
+	.incbin "graphics/pokemon/flygon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_flygon_footprint:: @ 8E04334
-	.incbin "graphics/pokemon/footprints/flygon_footprint.1bpp"
+	.incbin "graphics/pokemon/flygon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_makuhita_still_front_pic:: @ 8E04354
-	.incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/makuhita/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_makuhita_palette:: @ 8E0466C
-	.incbin "graphics/pokemon/palettes/makuhita_palette.gbapal.lz"
+	.incbin "graphics/pokemon/makuhita/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_makuhita_back_pic:: @ 8E04694
-	.incbin "graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/makuhita/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_makuhita_shiny_palette:: @ 8E04984
-	.incbin "graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/makuhita/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_makuhita_icon:: @ 8E049A8
-	.incbin "graphics/pokemon/icons/makuhita_icon.4bpp"
+	.incbin "graphics/pokemon/makuhita/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_makuhita_footprint:: @ 8E04DA8
-	.incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp"
+	.incbin "graphics/pokemon/makuhita/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_hariyama_still_front_pic:: @ 8E04DC8
-	.incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hariyama/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hariyama_palette:: @ 8E05278
-	.incbin "graphics/pokemon/palettes/hariyama_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hariyama/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_hariyama_back_pic:: @ 8E052A0
-	.incbin "graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/hariyama/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_hariyama_shiny_palette:: @ 8E05680
-	.incbin "graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/hariyama/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_hariyama_icon:: @ 8E056A8
-	.incbin "graphics/pokemon/icons/hariyama_icon.4bpp"
+	.incbin "graphics/pokemon/hariyama/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_hariyama_footprint:: @ 8E05AA8
-	.incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp"
+	.incbin "graphics/pokemon/hariyama/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_electrike_still_front_pic:: @ 8E05AC8
-	.incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrike/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrike_palette:: @ 8E05D58
-	.incbin "graphics/pokemon/palettes/electrike_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrike/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_electrike_back_pic:: @ 8E05D80
-	.incbin "graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/electrike/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_electrike_shiny_palette:: @ 8E0600C
-	.incbin "graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/electrike/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_electrike_icon:: @ 8E06034
-	.incbin "graphics/pokemon/icons/electrike_icon.4bpp"
+	.incbin "graphics/pokemon/electrike/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_electrike_footprint:: @ 8E06434
-	.incbin "graphics/pokemon/footprints/electrike_footprint.1bpp"
+	.incbin "graphics/pokemon/electrike/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_manectric_still_front_pic:: @ 8E06454
-	.incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/manectric/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_manectric_palette:: @ 8E06784
-	.incbin "graphics/pokemon/palettes/manectric_palette.gbapal.lz"
+	.incbin "graphics/pokemon/manectric/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_manectric_back_pic:: @ 8E067AC
-	.incbin "graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/manectric/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_manectric_shiny_palette:: @ 8E069D8
-	.incbin "graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/manectric/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_manectric_icon:: @ 8E06A00
-	.incbin "graphics/pokemon/icons/manectric_icon.4bpp"
+	.incbin "graphics/pokemon/manectric/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_manectric_footprint:: @ 8E06E00
-	.incbin "graphics/pokemon/footprints/manectric_footprint.1bpp"
+	.incbin "graphics/pokemon/manectric/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_numel_still_front_pic:: @ 8E06E20
-	.incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/numel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_numel_palette:: @ 8E070F0
-	.incbin "graphics/pokemon/palettes/numel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/numel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_numel_back_pic:: @ 8E07118
-	.incbin "graphics/pokemon/back_pics/numel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/numel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_numel_shiny_palette:: @ 8E073D4
-	.incbin "graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/numel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_numel_icon:: @ 8E073FC
-	.incbin "graphics/pokemon/icons/numel_icon.4bpp"
+	.incbin "graphics/pokemon/numel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_numel_footprint:: @ 8E077FC
-	.incbin "graphics/pokemon/footprints/numel_footprint.1bpp"
+	.incbin "graphics/pokemon/numel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_camerupt_still_front_pic:: @ 8E0781C
-	.incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/camerupt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_camerupt_palette:: @ 8E07C34
-	.incbin "graphics/pokemon/palettes/camerupt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/camerupt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_camerupt_back_pic:: @ 8E07C5C
-	.incbin "graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/camerupt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_camerupt_shiny_palette:: @ 8E07F20
-	.incbin "graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/camerupt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_camerupt_icon:: @ 8E07F48
-	.incbin "graphics/pokemon/icons/camerupt_icon.4bpp"
+	.incbin "graphics/pokemon/camerupt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_camerupt_footprint:: @ 8E08348
-	.incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp"
+	.incbin "graphics/pokemon/camerupt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spheal_still_front_pic:: @ 8E08368
-	.incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spheal/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spheal_palette:: @ 8E085DC
-	.incbin "graphics/pokemon/palettes/spheal_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spheal/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spheal_back_pic:: @ 8E08604
-	.incbin "graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spheal/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spheal_shiny_palette:: @ 8E08800
-	.incbin "graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spheal/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spheal_icon:: @ 8E08828
-	.incbin "graphics/pokemon/icons/spheal_icon.4bpp"
+	.incbin "graphics/pokemon/spheal/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spheal_footprint:: @ 8E08C28
-	.incbin "graphics/pokemon/footprints/spheal_footprint.1bpp"
+	.incbin "graphics/pokemon/spheal/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_sealeo_still_front_pic:: @ 8E08C48
-	.incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sealeo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sealeo_palette:: @ 8E08FC8
-	.incbin "graphics/pokemon/palettes/sealeo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sealeo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_sealeo_back_pic:: @ 8E08FF0
-	.incbin "graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/sealeo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_sealeo_shiny_palette:: @ 8E0926C
-	.incbin "graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/sealeo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_sealeo_icon:: @ 8E09294
-	.incbin "graphics/pokemon/icons/sealeo_icon.4bpp"
+	.incbin "graphics/pokemon/sealeo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_sealeo_footprint:: @ 8E09694
-	.incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp"
+	.incbin "graphics/pokemon/sealeo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_walrein_still_front_pic:: @ 8E096B4
-	.incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/walrein/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_walrein_palette:: @ 8E09B54
-	.incbin "graphics/pokemon/palettes/walrein_palette.gbapal.lz"
+	.incbin "graphics/pokemon/walrein/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_walrein_back_pic:: @ 8E09B7C
-	.incbin "graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/walrein/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_walrein_shiny_palette:: @ 8E09F04
-	.incbin "graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/walrein/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_walrein_icon:: @ 8E09F2C
-	.incbin "graphics/pokemon/icons/walrein_icon.4bpp"
+	.incbin "graphics/pokemon/walrein/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_walrein_footprint:: @ 8E0A32C
-	.incbin "graphics/pokemon/footprints/walrein_footprint.1bpp"
+	.incbin "graphics/pokemon/walrein/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cacnea_still_front_pic:: @ 8E0A34C
-	.incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacnea/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacnea_palette:: @ 8E0A65C
-	.incbin "graphics/pokemon/palettes/cacnea_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacnea/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cacnea_back_pic:: @ 8E0A684
-	.incbin "graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacnea/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacnea_shiny_palette:: @ 8E0A9E4
-	.incbin "graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacnea/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cacnea_icon:: @ 8E0AA0C
-	.incbin "graphics/pokemon/icons/cacnea_icon.4bpp"
+	.incbin "graphics/pokemon/cacnea/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cacnea_footprint:: @ 8E0AE0C
-	.incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp"
+	.incbin "graphics/pokemon/cacnea/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cacturne_still_front_pic:: @ 8E0AE2C
-	.incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacturne/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacturne_palette:: @ 8E0B264
-	.incbin "graphics/pokemon/palettes/cacturne_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacturne/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cacturne_back_pic:: @ 8E0B28C
-	.incbin "graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cacturne/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cacturne_shiny_palette:: @ 8E0B58C
-	.incbin "graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cacturne/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cacturne_icon:: @ 8E0B5B4
-	.incbin "graphics/pokemon/icons/cacturne_icon.4bpp"
+	.incbin "graphics/pokemon/cacturne/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cacturne_footprint:: @ 8E0B9B4
-	.incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp"
+	.incbin "graphics/pokemon/cacturne/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_snorunt_still_front_pic:: @ 8E0B9D4
-	.incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorunt/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorunt_palette:: @ 8E0BC98
-	.incbin "graphics/pokemon/palettes/snorunt_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorunt/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_snorunt_back_pic:: @ 8E0BCC0
-	.incbin "graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/snorunt/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_snorunt_shiny_palette:: @ 8E0BFA4
-	.incbin "graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/snorunt/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_snorunt_icon:: @ 8E0BFCC
-	.incbin "graphics/pokemon/icons/snorunt_icon.4bpp"
+	.incbin "graphics/pokemon/snorunt/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_snorunt_footprint:: @ 8E0C3CC
-	.incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp"
+	.incbin "graphics/pokemon/snorunt/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_glalie_still_front_pic:: @ 8E0C3EC
-	.incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/glalie/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_glalie_palette:: @ 8E0C7B4
-	.incbin "graphics/pokemon/palettes/glalie_palette.gbapal.lz"
+	.incbin "graphics/pokemon/glalie/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_glalie_back_pic:: @ 8E0C7DC
-	.incbin "graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/glalie/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_glalie_shiny_palette:: @ 8E0CB8C
-	.incbin "graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/glalie/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_glalie_icon:: @ 8E0CBB4
-	.incbin "graphics/pokemon/icons/glalie_icon.4bpp"
+	.incbin "graphics/pokemon/glalie/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_glalie_footprint:: @ 8E0CFB4
-	.incbin "graphics/pokemon/footprints/glalie_footprint.1bpp"
+	.incbin "graphics/pokemon/glalie/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lunatone_still_front_pic:: @ 8E0CFD4
-	.incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lunatone/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lunatone_palette:: @ 8E0D2FC
-	.incbin "graphics/pokemon/palettes/lunatone_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lunatone/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lunatone_back_pic:: @ 8E0D324
-	.incbin "graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lunatone/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lunatone_shiny_palette:: @ 8E0D67C
-	.incbin "graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lunatone/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lunatone_icon:: @ 8E0D6A4
-	.incbin "graphics/pokemon/icons/lunatone_icon.4bpp"
+	.incbin "graphics/pokemon/lunatone/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lunatone_footprint:: @ 8E0DAA4
-	.incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp"
+	.incbin "graphics/pokemon/lunatone/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_solrock_still_front_pic:: @ 8E0DAC4
-	.incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/solrock/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_solrock_palette:: @ 8E0DF10
-	.incbin "graphics/pokemon/palettes/solrock_palette.gbapal.lz"
+	.incbin "graphics/pokemon/solrock/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_solrock_back_pic:: @ 8E0DF38
-	.incbin "graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/solrock/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_solrock_shiny_palette:: @ 8E0E324
-	.incbin "graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/solrock/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_solrock_icon:: @ 8E0E34C
-	.incbin "graphics/pokemon/icons/solrock_icon.4bpp"
+	.incbin "graphics/pokemon/solrock/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_solrock_footprint:: @ 8E0E74C
-	.incbin "graphics/pokemon/footprints/solrock_footprint.1bpp"
+	.incbin "graphics/pokemon/solrock/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_azurill_still_front_pic:: @ 8E0E76C
-	.incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azurill/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azurill_palette:: @ 8E0EA34
-	.incbin "graphics/pokemon/palettes/azurill_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azurill/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_azurill_back_pic:: @ 8E0EA5C
-	.incbin "graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/azurill/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_azurill_shiny_palette:: @ 8E0ED74
-	.incbin "graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/azurill/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_azurill_icon:: @ 8E0ED9C
-	.incbin "graphics/pokemon/icons/azurill_icon.4bpp"
+	.incbin "graphics/pokemon/azurill/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_azurill_footprint:: @ 8E0F19C
-	.incbin "graphics/pokemon/footprints/azurill_footprint.1bpp"
+	.incbin "graphics/pokemon/azurill/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_spoink_still_front_pic:: @ 8E0F1BC
-	.incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spoink/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spoink_palette:: @ 8E0F428
-	.incbin "graphics/pokemon/palettes/spoink_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spoink/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_spoink_back_pic:: @ 8E0F450
-	.incbin "graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/spoink/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_spoink_shiny_palette:: @ 8E0F690
-	.incbin "graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/spoink/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_spoink_icon:: @ 8E0F6B8
-	.incbin "graphics/pokemon/icons/spoink_icon.4bpp"
+	.incbin "graphics/pokemon/spoink/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_spoink_footprint:: @ 8E0FAB8
-	.incbin "graphics/pokemon/footprints/spoink_footprint.1bpp"
+	.incbin "graphics/pokemon/spoink/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_grumpig_still_front_pic:: @ 8E0FAD8
-	.incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grumpig/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grumpig_palette:: @ 8E0FE94
-	.incbin "graphics/pokemon/palettes/grumpig_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grumpig/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_grumpig_back_pic:: @ 8E0FEBC
-	.incbin "graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/grumpig/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_grumpig_shiny_palette:: @ 8E1021C
-	.incbin "graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/grumpig/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_grumpig_icon:: @ 8E10244
-	.incbin "graphics/pokemon/icons/grumpig_icon.4bpp"
+	.incbin "graphics/pokemon/grumpig/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_grumpig_footprint:: @ 8E10644
-	.incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp"
+	.incbin "graphics/pokemon/grumpig/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_plusle_still_front_pic:: @ 8E10664
-	.incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/plusle/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_plusle_palette:: @ 8E108F0
-	.incbin "graphics/pokemon/palettes/plusle_palette.gbapal.lz"
+	.incbin "graphics/pokemon/plusle/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_plusle_back_pic:: @ 8E10918
-	.incbin "graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/plusle/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_plusle_shiny_palette:: @ 8E10BD0
-	.incbin "graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/plusle/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_plusle_icon:: @ 8E10BF8
-	.incbin "graphics/pokemon/icons/plusle_icon.4bpp"
+	.incbin "graphics/pokemon/plusle/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_plusle_footprint:: @ 8E10FF8
-	.incbin "graphics/pokemon/footprints/plusle_footprint.1bpp"
+	.incbin "graphics/pokemon/plusle/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_minun_still_front_pic:: @ 8E11018
-	.incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/minun/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_minun_palette:: @ 8E11280
-	.incbin "graphics/pokemon/palettes/minun_palette.gbapal.lz"
+	.incbin "graphics/pokemon/minun/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_minun_back_pic:: @ 8E112A8
-	.incbin "graphics/pokemon/back_pics/minun_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/minun/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_minun_shiny_palette:: @ 8E11570
-	.incbin "graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/minun/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_minun_icon:: @ 8E11598
-	.incbin "graphics/pokemon/icons/minun_icon.4bpp"
+	.incbin "graphics/pokemon/minun/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_minun_footprint:: @ 8E11998
-	.incbin "graphics/pokemon/footprints/minun_footprint.1bpp"
+	.incbin "graphics/pokemon/minun/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_mawile_still_front_pic:: @ 8E119B8
-	.incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mawile/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mawile_palette:: @ 8E11D74
-	.incbin "graphics/pokemon/palettes/mawile_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mawile/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_mawile_back_pic:: @ 8E11D9C
-	.incbin "graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/mawile/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_mawile_shiny_palette:: @ 8E1219C
-	.incbin "graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/mawile/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_mawile_icon:: @ 8E121C4
-	.incbin "graphics/pokemon/icons/mawile_icon.4bpp"
+	.incbin "graphics/pokemon/mawile/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_mawile_footprint:: @ 8E125C4
-	.incbin "graphics/pokemon/footprints/mawile_footprint.1bpp"
+	.incbin "graphics/pokemon/mawile/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_meditite_still_front_pic:: @ 8E125E4
-	.incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meditite/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meditite_palette:: @ 8E1289C
-	.incbin "graphics/pokemon/palettes/meditite_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meditite/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_meditite_back_pic:: @ 8E128C4
-	.incbin "graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/meditite/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_meditite_shiny_palette:: @ 8E12B8C
-	.incbin "graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/meditite/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_meditite_icon:: @ 8E12BB0
-	.incbin "graphics/pokemon/icons/meditite_icon.4bpp"
+	.incbin "graphics/pokemon/meditite/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_meditite_footprint:: @ 8E12FB0
-	.incbin "graphics/pokemon/footprints/meditite_footprint.1bpp"
+	.incbin "graphics/pokemon/meditite/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_medicham_still_front_pic:: @ 8E12FD0
-	.incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/medicham/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_medicham_palette:: @ 8E13300
-	.incbin "graphics/pokemon/palettes/medicham_palette.gbapal.lz"
+	.incbin "graphics/pokemon/medicham/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_medicham_back_pic:: @ 8E13328
-	.incbin "graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/medicham/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_medicham_shiny_palette:: @ 8E13660
-	.incbin "graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/medicham/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_medicham_icon:: @ 8E13688
-	.incbin "graphics/pokemon/icons/medicham_icon.4bpp"
+	.incbin "graphics/pokemon/medicham/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_medicham_footprint:: @ 8E13A88
-	.incbin "graphics/pokemon/footprints/medicham_footprint.1bpp"
+	.incbin "graphics/pokemon/medicham/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swablu_still_front_pic:: @ 8E13AA8
-	.incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swablu/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swablu_palette:: @ 8E13D80
-	.incbin "graphics/pokemon/palettes/swablu_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swablu/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swablu_back_pic:: @ 8E13DA8
-	.incbin "graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swablu/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swablu_shiny_palette:: @ 8E14160
-	.incbin "graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swablu/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swablu_icon:: @ 8E14188
-	.incbin "graphics/pokemon/icons/swablu_icon.4bpp"
+	.incbin "graphics/pokemon/swablu/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swablu_footprint:: @ 8E14588
-	.incbin "graphics/pokemon/footprints/swablu_footprint.1bpp"
+	.incbin "graphics/pokemon/swablu/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_altaria_still_front_pic:: @ 8E145A8
-	.incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/altaria/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_altaria_palette:: @ 8E14984
-	.incbin "graphics/pokemon/palettes/altaria_palette.gbapal.lz"
+	.incbin "graphics/pokemon/altaria/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_altaria_back_pic:: @ 8E149AC
-	.incbin "graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/altaria/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_altaria_shiny_palette:: @ 8E14D24
-	.incbin "graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/altaria/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_altaria_icon:: @ 8E14D4C
-	.incbin "graphics/pokemon/icons/altaria_icon.4bpp"
+	.incbin "graphics/pokemon/altaria/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_altaria_footprint:: @ 8E1514C
-	.incbin "graphics/pokemon/footprints/altaria_footprint.1bpp"
+	.incbin "graphics/pokemon/altaria/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_wynaut_still_front_pic:: @ 8E1516C
-	.incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wynaut/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wynaut_palette:: @ 8E15404
-	.incbin "graphics/pokemon/palettes/wynaut_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wynaut/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_wynaut_back_pic:: @ 8E1542C
-	.incbin "graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/wynaut/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_wynaut_shiny_palette:: @ 8E156BC
-	.incbin "graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/wynaut/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_wynaut_icon:: @ 8E156E4
-	.incbin "graphics/pokemon/icons/wynaut_icon.4bpp"
+	.incbin "graphics/pokemon/wynaut/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_wynaut_footprint:: @ 8E15AE4
-	.incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp"
+	.incbin "graphics/pokemon/wynaut/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_duskull_still_front_pic:: @ 8E15B04
-	.incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/duskull/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_duskull_palette:: @ 8E15DF4
-	.incbin "graphics/pokemon/palettes/duskull_palette.gbapal.lz"
+	.incbin "graphics/pokemon/duskull/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_duskull_back_pic:: @ 8E15E1C
-	.incbin "graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/duskull/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_duskull_shiny_palette:: @ 8E160CC
-	.incbin "graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/duskull/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_duskull_icon:: @ 8E160F4
-	.incbin "graphics/pokemon/icons/duskull_icon.4bpp"
+	.incbin "graphics/pokemon/duskull/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_duskull_footprint:: @ 8E164F4
-	.incbin "graphics/pokemon/footprints/duskull_footprint.1bpp"
+	.incbin "graphics/pokemon/duskull/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_dusclops_still_front_pic:: @ 8E16514
-	.incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dusclops/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dusclops_palette:: @ 8E168B4
-	.incbin "graphics/pokemon/palettes/dusclops_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dusclops/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_dusclops_back_pic:: @ 8E168DC
-	.incbin "graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/dusclops/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_dusclops_shiny_palette:: @ 8E16BC8
-	.incbin "graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/dusclops/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_dusclops_icon:: @ 8E16BF0
-	.incbin "graphics/pokemon/icons/dusclops_icon.4bpp"
+	.incbin "graphics/pokemon/dusclops/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_dusclops_footprint:: @ 8E16FF0
-	.incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp"
+	.incbin "graphics/pokemon/dusclops/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_roselia_still_front_pic:: @ 8E17010
-	.incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/roselia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_roselia_palette:: @ 8E1737C
-	.incbin "graphics/pokemon/palettes/roselia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/roselia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_roselia_back_pic:: @ 8E173A4
-	.incbin "graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/roselia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_roselia_shiny_palette:: @ 8E1776C
-	.incbin "graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/roselia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_roselia_icon:: @ 8E17794
-	.incbin "graphics/pokemon/icons/roselia_icon.4bpp"
+	.incbin "graphics/pokemon/roselia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_roselia_footprint:: @ 8E17B94
-	.incbin "graphics/pokemon/footprints/roselia_footprint.1bpp"
+	.incbin "graphics/pokemon/roselia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slakoth_still_front_pic:: @ 8E17BB4
-	.incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slakoth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slakoth_palette:: @ 8E17E9C
-	.incbin "graphics/pokemon/palettes/slakoth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slakoth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slakoth_back_pic:: @ 8E17EC4
-	.incbin "graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slakoth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slakoth_shiny_palette:: @ 8E181AC
-	.incbin "graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slakoth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slakoth_icon:: @ 8E181D4
-	.incbin "graphics/pokemon/icons/slakoth_icon.4bpp"
+	.incbin "graphics/pokemon/slakoth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slakoth_footprint:: @ 8E185D4
-	.incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp"
+	.incbin "graphics/pokemon/slakoth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_vigoroth_still_front_pic:: @ 8E185F4
-	.incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vigoroth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vigoroth_palette:: @ 8E189F0
-	.incbin "graphics/pokemon/palettes/vigoroth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vigoroth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_vigoroth_back_pic:: @ 8E18A18
-	.incbin "graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/vigoroth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_vigoroth_shiny_palette:: @ 8E18CE0
-	.incbin "graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/vigoroth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_vigoroth_icon:: @ 8E18D08
-	.incbin "graphics/pokemon/icons/vigoroth_icon.4bpp"
+	.incbin "graphics/pokemon/vigoroth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_vigoroth_footprint:: @ 8E19108
-	.incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp"
+	.incbin "graphics/pokemon/vigoroth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_slaking_still_front_pic:: @ 8E19128
-	.incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slaking/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slaking_palette:: @ 8E195FC
-	.incbin "graphics/pokemon/palettes/slaking_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slaking/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_slaking_back_pic:: @ 8E19624
-	.incbin "graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/slaking/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_slaking_shiny_palette:: @ 8E199E8
-	.incbin "graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/slaking/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_slaking_icon:: @ 8E19A10
-	.incbin "graphics/pokemon/icons/slaking_icon.4bpp"
+	.incbin "graphics/pokemon/slaking/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_slaking_footprint:: @ 8E19E10
-	.incbin "graphics/pokemon/footprints/slaking_footprint.1bpp"
+	.incbin "graphics/pokemon/slaking/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gulpin_still_front_pic:: @ 8E19E30
-	.incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gulpin/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gulpin_palette:: @ 8E1A048
-	.incbin "graphics/pokemon/palettes/gulpin_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gulpin/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gulpin_back_pic:: @ 8E1A070
-	.incbin "graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gulpin/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gulpin_shiny_palette:: @ 8E1A2F4
-	.incbin "graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gulpin/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gulpin_icon:: @ 8E1A31C
-	.incbin "graphics/pokemon/icons/gulpin_icon.4bpp"
+	.incbin "graphics/pokemon/gulpin/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gulpin_footprint:: @ 8E1A71C
-	.incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp"
+	.incbin "graphics/pokemon/gulpin/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_swalot_still_front_pic:: @ 8E1A73C
-	.incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swalot/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swalot_palette:: @ 8E1AA80
-	.incbin "graphics/pokemon/palettes/swalot_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swalot/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_swalot_back_pic:: @ 8E1AAA8
-	.incbin "graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/swalot/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_swalot_shiny_palette:: @ 8E1ADF0
-	.incbin "graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/swalot/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_swalot_icon:: @ 8E1AE18
-	.incbin "graphics/pokemon/icons/swalot_icon.4bpp"
+	.incbin "graphics/pokemon/swalot/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_swalot_footprint:: @ 8E1B218
-	.incbin "graphics/pokemon/footprints/swalot_footprint.1bpp"
+	.incbin "graphics/pokemon/swalot/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_tropius_still_front_pic:: @ 8E1B238
-	.incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tropius/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tropius_palette:: @ 8E1B7B0
-	.incbin "graphics/pokemon/palettes/tropius_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tropius/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_tropius_back_pic:: @ 8E1B7D8
-	.incbin "graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/tropius/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_tropius_shiny_palette:: @ 8E1BAFC
-	.incbin "graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/tropius/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_tropius_icon:: @ 8E1BB24
-	.incbin "graphics/pokemon/icons/tropius_icon.4bpp"
+	.incbin "graphics/pokemon/tropius/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_tropius_footprint:: @ 8E1BF24
-	.incbin "graphics/pokemon/footprints/tropius_footprint.1bpp"
+	.incbin "graphics/pokemon/tropius/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_whismur_still_front_pic:: @ 8E1BF44
-	.incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whismur/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whismur_palette:: @ 8E1C1D8
-	.incbin "graphics/pokemon/palettes/whismur_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whismur/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_whismur_back_pic:: @ 8E1C200
-	.incbin "graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/whismur/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_whismur_shiny_palette:: @ 8E1C470
-	.incbin "graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/whismur/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_whismur_icon:: @ 8E1C498
-	.incbin "graphics/pokemon/icons/whismur_icon.4bpp"
+	.incbin "graphics/pokemon/whismur/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_whismur_footprint:: @ 8E1C898
-	.incbin "graphics/pokemon/footprints/whismur_footprint.1bpp"
+	.incbin "graphics/pokemon/whismur/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_loudred_still_front_pic:: @ 8E1C8B8
-	.incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/loudred/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_loudred_palette:: @ 8E1CD30
-	.incbin "graphics/pokemon/palettes/loudred_palette.gbapal.lz"
+	.incbin "graphics/pokemon/loudred/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_loudred_back_pic:: @ 8E1CD58
-	.incbin "graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/loudred/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_loudred_shiny_palette:: @ 8E1D0C8
-	.incbin "graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/loudred/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_loudred_icon:: @ 8E1D0F0
-	.incbin "graphics/pokemon/icons/loudred_icon.4bpp"
+	.incbin "graphics/pokemon/loudred/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_loudred_footprint:: @ 8E1D4F0
-	.incbin "graphics/pokemon/footprints/loudred_footprint.1bpp"
+	.incbin "graphics/pokemon/loudred/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_exploud_still_front_pic:: @ 8E1D510
-	.incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exploud/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exploud_palette:: @ 8E1DA78
-	.incbin "graphics/pokemon/palettes/exploud_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exploud/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_exploud_back_pic:: @ 8E1DAA0
-	.incbin "graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/exploud/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_exploud_shiny_palette:: @ 8E1DEAC
-	.incbin "graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/exploud/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_exploud_icon:: @ 8E1DED4
-	.incbin "graphics/pokemon/icons/exploud_icon.4bpp"
+	.incbin "graphics/pokemon/exploud/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_exploud_footprint:: @ 8E1E2D4
-	.incbin "graphics/pokemon/footprints/exploud_footprint.1bpp"
+	.incbin "graphics/pokemon/exploud/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_clamperl_still_front_pic:: @ 8E1E2F4
-	.incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clamperl/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clamperl_palette:: @ 8E1E5CC
-	.incbin "graphics/pokemon/palettes/clamperl_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clamperl/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_clamperl_back_pic:: @ 8E1E5F4
-	.incbin "graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/clamperl/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_clamperl_shiny_palette:: @ 8E1E888
-	.incbin "graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/clamperl/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_clamperl_icon:: @ 8E1E8B0
-	.incbin "graphics/pokemon/icons/clamperl_icon.4bpp"
+	.incbin "graphics/pokemon/clamperl/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_clamperl_footprint:: @ 8E1ECB0
-	.incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp"
+	.incbin "graphics/pokemon/clamperl/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_huntail_still_front_pic:: @ 8E1ECD0
-	.incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/huntail/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_huntail_palette:: @ 8E1F09C
-	.incbin "graphics/pokemon/palettes/huntail_palette.gbapal.lz"
+	.incbin "graphics/pokemon/huntail/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_huntail_back_pic:: @ 8E1F0C4
-	.incbin "graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/huntail/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_huntail_shiny_palette:: @ 8E1F418
-	.incbin "graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/huntail/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_huntail_icon:: @ 8E1F440
-	.incbin "graphics/pokemon/icons/huntail_icon.4bpp"
+	.incbin "graphics/pokemon/huntail/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_huntail_footprint:: @ 8E1F840
-	.incbin "graphics/pokemon/footprints/huntail_footprint.1bpp"
+	.incbin "graphics/pokemon/huntail/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gorebyss_still_front_pic:: @ 8E1F860
-	.incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gorebyss/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gorebyss_palette:: @ 8E1FB70
-	.incbin "graphics/pokemon/palettes/gorebyss_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gorebyss/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gorebyss_back_pic:: @ 8E1FB98
-	.incbin "graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gorebyss/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gorebyss_shiny_palette:: @ 8E1FE80
-	.incbin "graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gorebyss/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gorebyss_icon:: @ 8E1FEA8
-	.incbin "graphics/pokemon/icons/gorebyss_icon.4bpp"
+	.incbin "graphics/pokemon/gorebyss/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gorebyss_footprint:: @ 8E202A8
-	.incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp"
+	.incbin "graphics/pokemon/gorebyss/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_absol_still_front_pic:: @ 8E202C8
-	.incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/absol/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_absol_palette:: @ 8E206F8
-	.incbin "graphics/pokemon/palettes/absol_palette.gbapal.lz"
+	.incbin "graphics/pokemon/absol/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_absol_back_pic:: @ 8E20720
-	.incbin "graphics/pokemon/back_pics/absol_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/absol/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_absol_shiny_palette:: @ 8E20A80
-	.incbin "graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/absol/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_absol_icon:: @ 8E20AA8
-	.incbin "graphics/pokemon/icons/absol_icon.4bpp"
+	.incbin "graphics/pokemon/absol/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_absol_footprint:: @ 8E20EA8
-	.incbin "graphics/pokemon/footprints/absol_footprint.1bpp"
+	.incbin "graphics/pokemon/absol/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shuppet_still_front_pic:: @ 8E20EC8
-	.incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuppet/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuppet_palette:: @ 8E21100
-	.incbin "graphics/pokemon/palettes/shuppet_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuppet/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shuppet_back_pic:: @ 8E21128
-	.incbin "graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shuppet/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shuppet_shiny_palette:: @ 8E213C0
-	.incbin "graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shuppet/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shuppet_icon:: @ 8E213E8
-	.incbin "graphics/pokemon/icons/shuppet_icon.4bpp"
+	.incbin "graphics/pokemon/shuppet/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shuppet_footprint:: @ 8E217E8
-	.incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp"
+	.incbin "graphics/pokemon/shuppet/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_banette_still_front_pic:: @ 8E21808
-	.incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/banette/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_banette_palette:: @ 8E21ABC
-	.incbin "graphics/pokemon/palettes/banette_palette.gbapal.lz"
+	.incbin "graphics/pokemon/banette/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_banette_back_pic:: @ 8E21AE4
-	.incbin "graphics/pokemon/back_pics/banette_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/banette/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_banette_shiny_palette:: @ 8E21D60
-	.incbin "graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/banette/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_banette_icon:: @ 8E21D88
-	.incbin "graphics/pokemon/icons/banette_icon.4bpp"
+	.incbin "graphics/pokemon/banette/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_banette_footprint:: @ 8E22188
-	.incbin "graphics/pokemon/footprints/banette_footprint.1bpp"
+	.incbin "graphics/pokemon/banette/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_seviper_still_front_pic:: @ 8E221A8
-	.incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seviper/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seviper_palette:: @ 8E225C8
-	.incbin "graphics/pokemon/palettes/seviper_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seviper/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_seviper_back_pic:: @ 8E225F0
-	.incbin "graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/seviper/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_seviper_shiny_palette:: @ 8E22A7C
-	.incbin "graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/seviper/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_seviper_icon:: @ 8E22AA4
-	.incbin "graphics/pokemon/icons/seviper_icon.4bpp"
+	.incbin "graphics/pokemon/seviper/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_seviper_footprint:: @ 8E22EA4
-	.incbin "graphics/pokemon/footprints/seviper_footprint.1bpp"
+	.incbin "graphics/pokemon/seviper/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_zangoose_still_front_pic:: @ 8E22EC4
-	.incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zangoose/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zangoose_palette:: @ 8E23290
-	.incbin "graphics/pokemon/palettes/zangoose_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zangoose/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_zangoose_back_pic:: @ 8E232B8
-	.incbin "graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/zangoose/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_zangoose_shiny_palette:: @ 8E2362C
-	.incbin "graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/zangoose/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_zangoose_icon:: @ 8E23654
-	.incbin "graphics/pokemon/icons/zangoose_icon.4bpp"
+	.incbin "graphics/pokemon/zangoose/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_zangoose_footprint:: @ 8E23A54
-	.incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp"
+	.incbin "graphics/pokemon/zangoose/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_relicanth_still_front_pic:: @ 8E23A74
-	.incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/relicanth/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_relicanth_palette:: @ 8E23E08
-	.incbin "graphics/pokemon/palettes/relicanth_palette.gbapal.lz"
+	.incbin "graphics/pokemon/relicanth/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_relicanth_back_pic:: @ 8E23E30
-	.incbin "graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/relicanth/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_relicanth_shiny_palette:: @ 8E24188
-	.incbin "graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/relicanth/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_relicanth_icon:: @ 8E241B0
-	.incbin "graphics/pokemon/icons/relicanth_icon.4bpp"
+	.incbin "graphics/pokemon/relicanth/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_relicanth_footprint:: @ 8E245B0
-	.incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp"
+	.incbin "graphics/pokemon/relicanth/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aron_still_front_pic:: @ 8E245D0
-	.incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aron/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aron_palette:: @ 8E247B8
-	.incbin "graphics/pokemon/palettes/aron_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aron/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aron_back_pic:: @ 8E247E0
-	.incbin "graphics/pokemon/back_pics/aron_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aron/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aron_shiny_palette:: @ 8E24A08
-	.incbin "graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aron/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aron_icon:: @ 8E24A30
-	.incbin "graphics/pokemon/icons/aron_icon.4bpp"
+	.incbin "graphics/pokemon/aron/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aron_footprint:: @ 8E24E30
-	.incbin "graphics/pokemon/footprints/aron_footprint.1bpp"
+	.incbin "graphics/pokemon/aron/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lairon_still_front_pic:: @ 8E24E50
-	.incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lairon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lairon_palette:: @ 8E2521C
-	.incbin "graphics/pokemon/palettes/lairon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lairon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lairon_back_pic:: @ 8E25244
-	.incbin "graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lairon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lairon_shiny_palette:: @ 8E25530
-	.incbin "graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lairon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lairon_icon:: @ 8E25558
-	.incbin "graphics/pokemon/icons/lairon_icon.4bpp"
+	.incbin "graphics/pokemon/lairon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lairon_footprint:: @ 8E25958
-	.incbin "graphics/pokemon/footprints/lairon_footprint.1bpp"
+	.incbin "graphics/pokemon/lairon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_aggron_still_front_pic:: @ 8E25978
-	.incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aggron/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aggron_palette:: @ 8E25EF4
-	.incbin "graphics/pokemon/palettes/aggron_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aggron/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_aggron_back_pic:: @ 8E25F1C
-	.incbin "graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/aggron/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_aggron_shiny_palette:: @ 8E26344
-	.incbin "graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/aggron/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_aggron_icon:: @ 8E2636C
-	.incbin "graphics/pokemon/icons/aggron_icon.4bpp"
+	.incbin "graphics/pokemon/aggron/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_aggron_footprint:: @ 8E2676C
-	.incbin "graphics/pokemon/footprints/aggron_footprint.1bpp"
+	.incbin "graphics/pokemon/aggron/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_castform_still_front_pic:: @ 8E2678C
-	.incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/castform/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_castform_palette:: @ 8E27214
-	.incbin "graphics/pokemon/palettes/castform_palette.gbapal.lz"
+	.incbin "graphics/pokemon/castform/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_castform_back_pic:: @ 8E27294
-	.incbin "graphics/pokemon/back_pics/castform_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/castform/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_castform_shiny_palette:: @ 8E27C50
-	.incbin "graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/castform/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_castform_icon:: @ 8E27CCC
-	.incbin "graphics/pokemon/icons/castform_icon.4bpp"
+	.incbin "graphics/pokemon/castform/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_castform_footprint:: @ 8E280CC
-	.incbin "graphics/pokemon/footprints/castform_footprint.1bpp"
+	.incbin "graphics/pokemon/castform/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_volbeat_still_front_pic:: @ 8E280EC
-	.incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/volbeat/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_volbeat_palette:: @ 8E2847C
-	.incbin "graphics/pokemon/palettes/volbeat_palette.gbapal.lz"
+	.incbin "graphics/pokemon/volbeat/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_volbeat_back_pic:: @ 8E284A4
-	.incbin "graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/volbeat/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_volbeat_shiny_palette:: @ 8E28804
-	.incbin "graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/volbeat/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_volbeat_icon:: @ 8E2882C
-	.incbin "graphics/pokemon/icons/volbeat_icon.4bpp"
+	.incbin "graphics/pokemon/volbeat/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_volbeat_footprint:: @ 8E28C2C
-	.incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp"
+	.incbin "graphics/pokemon/volbeat/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_illumise_still_front_pic:: @ 8E28C4C
-	.incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/illumise/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_illumise_palette:: @ 8E28FC0
-	.incbin "graphics/pokemon/palettes/illumise_palette.gbapal.lz"
+	.incbin "graphics/pokemon/illumise/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_illumise_back_pic:: @ 8E28FE8
-	.incbin "graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/illumise/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_illumise_shiny_palette:: @ 8E29304
-	.incbin "graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/illumise/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_illumise_icon:: @ 8E2932C
-	.incbin "graphics/pokemon/icons/illumise_icon.4bpp"
+	.incbin "graphics/pokemon/illumise/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_illumise_footprint:: @ 8E2972C
-	.incbin "graphics/pokemon/footprints/illumise_footprint.1bpp"
+	.incbin "graphics/pokemon/illumise/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_lileep_still_front_pic:: @ 8E2974C
-	.incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lileep/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lileep_palette:: @ 8E29A90
-	.incbin "graphics/pokemon/palettes/lileep_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lileep/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_lileep_back_pic:: @ 8E29AB8
-	.incbin "graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/lileep/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_lileep_shiny_palette:: @ 8E29DFC
-	.incbin "graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/lileep/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_lileep_icon:: @ 8E29E24
-	.incbin "graphics/pokemon/icons/lileep_icon.4bpp"
+	.incbin "graphics/pokemon/lileep/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_lileep_footprint:: @ 8E2A224
-	.incbin "graphics/pokemon/footprints/lileep_footprint.1bpp"
+	.incbin "graphics/pokemon/lileep/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_cradily_still_front_pic:: @ 8E2A244
-	.incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cradily/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cradily_palette:: @ 8E2A660
-	.incbin "graphics/pokemon/palettes/cradily_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cradily/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_cradily_back_pic:: @ 8E2A688
-	.incbin "graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/cradily/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_cradily_shiny_palette:: @ 8E2AA84
-	.incbin "graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/cradily/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_cradily_icon:: @ 8E2AAAC
-	.incbin "graphics/pokemon/icons/cradily_icon.4bpp"
+	.incbin "graphics/pokemon/cradily/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_cradily_footprint:: @ 8E2AEAC
-	.incbin "graphics/pokemon/footprints/cradily_footprint.1bpp"
+	.incbin "graphics/pokemon/cradily/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_anorith_still_front_pic:: @ 8E2AECC
-	.incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/anorith/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_anorith_palette:: @ 8E2B1F0
-	.incbin "graphics/pokemon/palettes/anorith_palette.gbapal.lz"
+	.incbin "graphics/pokemon/anorith/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_anorith_back_pic:: @ 8E2B218
-	.incbin "graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/anorith/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_anorith_shiny_palette:: @ 8E2B460
-	.incbin "graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/anorith/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_anorith_icon:: @ 8E2B488
-	.incbin "graphics/pokemon/icons/anorith_icon.4bpp"
+	.incbin "graphics/pokemon/anorith/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_anorith_footprint:: @ 8E2B888
-	.incbin "graphics/pokemon/footprints/anorith_footprint.1bpp"
+	.incbin "graphics/pokemon/anorith/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_armaldo_still_front_pic:: @ 8E2B8A8
-	.incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/armaldo/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_armaldo_palette:: @ 8E2BE28
-	.incbin "graphics/pokemon/palettes/armaldo_palette.gbapal.lz"
+	.incbin "graphics/pokemon/armaldo/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_armaldo_back_pic:: @ 8E2BE50
-	.incbin "graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/armaldo/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_armaldo_shiny_palette:: @ 8E2C288
-	.incbin "graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/armaldo/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_armaldo_icon:: @ 8E2C2B0
-	.incbin "graphics/pokemon/icons/armaldo_icon.4bpp"
+	.incbin "graphics/pokemon/armaldo/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_armaldo_footprint:: @ 8E2C6B0
-	.incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp"
+	.incbin "graphics/pokemon/armaldo/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_ralts_still_front_pic:: @ 8E2C6D0
-	.incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ralts/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ralts_palette:: @ 8E2C900
-	.incbin "graphics/pokemon/palettes/ralts_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ralts/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_ralts_back_pic:: @ 8E2C928
-	.incbin "graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/ralts/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_ralts_shiny_palette:: @ 8E2CB64
-	.incbin "graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/ralts/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_ralts_icon:: @ 8E2CB8C
-	.incbin "graphics/pokemon/icons/ralts_icon.4bpp"
+	.incbin "graphics/pokemon/ralts/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_ralts_footprint:: @ 8E2CF8C
-	.incbin "graphics/pokemon/footprints/ralts_footprint.1bpp"
+	.incbin "graphics/pokemon/ralts/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kirlia_still_front_pic:: @ 8E2CFAC
-	.incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kirlia/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kirlia_palette:: @ 8E2D2A8
-	.incbin "graphics/pokemon/palettes/kirlia_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kirlia/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kirlia_back_pic:: @ 8E2D2D0
-	.incbin "graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kirlia/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kirlia_shiny_palette:: @ 8E2D644
-	.incbin "graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kirlia/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kirlia_icon:: @ 8E2D66C
-	.incbin "graphics/pokemon/icons/kirlia_icon.4bpp"
+	.incbin "graphics/pokemon/kirlia/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kirlia_footprint:: @ 8E2DA6C
-	.incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp"
+	.incbin "graphics/pokemon/kirlia/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_gardevoir_still_front_pic:: @ 8E2DA8C
-	.incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gardevoir/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gardevoir_palette:: @ 8E2DE08
-	.incbin "graphics/pokemon/palettes/gardevoir_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gardevoir/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_gardevoir_back_pic:: @ 8E2DE30
-	.incbin "graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/gardevoir/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_gardevoir_shiny_palette:: @ 8E2E164
-	.incbin "graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/gardevoir/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_gardevoir_icon:: @ 8E2E18C
-	.incbin "graphics/pokemon/icons/gardevoir_icon.4bpp"
+	.incbin "graphics/pokemon/gardevoir/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_gardevoir_footprint:: @ 8E2E58C
-	.incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp"
+	.incbin "graphics/pokemon/gardevoir/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_bagon_still_front_pic:: @ 8E2E5AC
-	.incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bagon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bagon_palette:: @ 8E2E824
-	.incbin "graphics/pokemon/palettes/bagon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bagon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_bagon_back_pic:: @ 8E2E84C
-	.incbin "graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/bagon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_bagon_shiny_palette:: @ 8E2EB34
-	.incbin "graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/bagon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_bagon_icon:: @ 8E2EB5C
-	.incbin "graphics/pokemon/icons/bagon_icon.4bpp"
+	.incbin "graphics/pokemon/bagon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_bagon_footprint:: @ 8E2EF5C
-	.incbin "graphics/pokemon/footprints/bagon_footprint.1bpp"
+	.incbin "graphics/pokemon/bagon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_shelgon_still_front_pic:: @ 8E2EF7C
-	.incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shelgon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shelgon_palette:: @ 8E2F280
-	.incbin "graphics/pokemon/palettes/shelgon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shelgon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_shelgon_back_pic:: @ 8E2F2A8
-	.incbin "graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/shelgon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_shelgon_shiny_palette:: @ 8E2F590
-	.incbin "graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/shelgon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_shelgon_icon:: @ 8E2F5B8
-	.incbin "graphics/pokemon/icons/shelgon_icon.4bpp"
+	.incbin "graphics/pokemon/shelgon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_shelgon_footprint:: @ 8E2F9B8
-	.incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp"
+	.incbin "graphics/pokemon/shelgon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_salamence_still_front_pic:: @ 8E2F9D8
-	.incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/salamence/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_salamence_palette:: @ 8E2FE3C
-	.incbin "graphics/pokemon/palettes/salamence_palette.gbapal.lz"
+	.incbin "graphics/pokemon/salamence/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_salamence_back_pic:: @ 8E2FE64
-	.incbin "graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/salamence/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_salamence_shiny_palette:: @ 8E30148
-	.incbin "graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/salamence/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_salamence_icon:: @ 8E30170
-	.incbin "graphics/pokemon/icons/salamence_icon.4bpp"
+	.incbin "graphics/pokemon/salamence/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_salamence_footprint:: @ 8E30570
-	.incbin "graphics/pokemon/footprints/salamence_footprint.1bpp"
+	.incbin "graphics/pokemon/salamence/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_beldum_still_front_pic:: @ 8E30590
-	.incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beldum/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beldum_palette:: @ 8E30800
-	.incbin "graphics/pokemon/palettes/beldum_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beldum/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_beldum_back_pic:: @ 8E30828
-	.incbin "graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/beldum/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_beldum_shiny_palette:: @ 8E30B18
-	.incbin "graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/beldum/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_beldum_icon:: @ 8E30B40
-	.incbin "graphics/pokemon/icons/beldum_icon.4bpp"
+	.incbin "graphics/pokemon/beldum/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_beldum_footprint:: @ 8E30F40
-	.incbin "graphics/pokemon/footprints/beldum_footprint.1bpp"
+	.incbin "graphics/pokemon/beldum/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metang_still_front_pic:: @ 8E30F60
-	.incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metang/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metang_palette:: @ 8E313BC
-	.incbin "graphics/pokemon/palettes/metang_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metang/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metang_back_pic:: @ 8E313E4
-	.incbin "graphics/pokemon/back_pics/metang_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metang/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metang_shiny_palette:: @ 8E31708
-	.incbin "graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metang/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metang_icon:: @ 8E31730
-	.incbin "graphics/pokemon/icons/metang_icon.4bpp"
+	.incbin "graphics/pokemon/metang/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metang_footprint:: @ 8E31B30
-	.incbin "graphics/pokemon/footprints/metang_footprint.1bpp"
+	.incbin "graphics/pokemon/metang/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_metagross_still_front_pic:: @ 8E31B50
-	.incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metagross/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metagross_palette:: @ 8E31FB4
-	.incbin "graphics/pokemon/palettes/metagross_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metagross/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_metagross_back_pic:: @ 8E31FDC
-	.incbin "graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/metagross/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_metagross_shiny_palette:: @ 8E322A8
-	.incbin "graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/metagross/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_metagross_icon:: @ 8E322D0
-	.incbin "graphics/pokemon/icons/metagross_icon.4bpp"
+	.incbin "graphics/pokemon/metagross/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_metagross_footprint:: @ 8E326D0
-	.incbin "graphics/pokemon/footprints/metagross_footprint.1bpp"
+	.incbin "graphics/pokemon/metagross/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_regirock_still_front_pic:: @ 8E326F0
-	.incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regirock/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regirock_palette:: @ 8E32BAC
-	.incbin "graphics/pokemon/palettes/regirock_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regirock/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_regirock_back_pic:: @ 8E32BD4
-	.incbin "graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regirock/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regirock_shiny_palette:: @ 8E33020
-	.incbin "graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regirock/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_regirock_icon:: @ 8E33048
-	.incbin "graphics/pokemon/icons/regirock_icon.4bpp"
+	.incbin "graphics/pokemon/regirock/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_regirock_footprint:: @ 8E33448
-	.incbin "graphics/pokemon/footprints/regirock_footprint.1bpp"
+	.incbin "graphics/pokemon/regirock/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_regice_still_front_pic:: @ 8E33468
-	.incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regice/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regice_palette:: @ 8E338B0
-	.incbin "graphics/pokemon/palettes/regice_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regice/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_regice_back_pic:: @ 8E338D8
-	.incbin "graphics/pokemon/back_pics/regice_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/regice/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_regice_shiny_palette:: @ 8E33BC8
-	.incbin "graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/regice/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_regice_icon:: @ 8E33BF0
-	.incbin "graphics/pokemon/icons/regice_icon.4bpp"
+	.incbin "graphics/pokemon/regice/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_regice_footprint:: @ 8E33FF0
-	.incbin "graphics/pokemon/footprints/regice_footprint.1bpp"
+	.incbin "graphics/pokemon/regice/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_registeel_still_front_pic:: @ 8E34010
-	.incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/registeel/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_registeel_palette:: @ 8E34498
-	.incbin "graphics/pokemon/palettes/registeel_palette.gbapal.lz"
+	.incbin "graphics/pokemon/registeel/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_registeel_back_pic:: @ 8E344C0
-	.incbin "graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/registeel/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_registeel_shiny_palette:: @ 8E347F8
-	.incbin "graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/registeel/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_registeel_icon:: @ 8E34820
-	.incbin "graphics/pokemon/icons/registeel_icon.4bpp"
+	.incbin "graphics/pokemon/registeel/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_registeel_footprint:: @ 8E34C20
-	.incbin "graphics/pokemon/footprints/registeel_footprint.1bpp"
+	.incbin "graphics/pokemon/registeel/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_kyogre_still_front_pic:: @ 8E34C40
-	.incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kyogre/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kyogre_palette:: @ 8E350B0
-	.incbin "graphics/pokemon/palettes/kyogre_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kyogre/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_kyogre_back_pic:: @ 8E350D8
-	.incbin "graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/kyogre/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_kyogre_shiny_palette:: @ 8E35350
-	.incbin "graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/kyogre/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_kyogre_icon:: @ 8E35378
-	.incbin "graphics/pokemon/icons/kyogre_icon.4bpp"
+	.incbin "graphics/pokemon/kyogre/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_kyogre_footprint:: @ 8E35778
-	.incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp"
+	.incbin "graphics/pokemon/kyogre/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_groudon_still_front_pic:: @ 8E35798
-	.incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/groudon/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_groudon_palette:: @ 8E35D2C
-	.incbin "graphics/pokemon/palettes/groudon_palette.gbapal.lz"
+	.incbin "graphics/pokemon/groudon/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_groudon_back_pic:: @ 8E35D54
-	.incbin "graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/groudon/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_groudon_shiny_palette:: @ 8E361BC
-	.incbin "graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/groudon/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_groudon_icon:: @ 8E361E4
-	.incbin "graphics/pokemon/icons/groudon_icon.4bpp"
+	.incbin "graphics/pokemon/groudon/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_groudon_footprint:: @ 8E365E4
-	.incbin "graphics/pokemon/footprints/groudon_footprint.1bpp"
+	.incbin "graphics/pokemon/groudon/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_rayquaza_still_front_pic:: @ 8E36604
-	.incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rayquaza/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rayquaza_palette:: @ 8E36B14
-	.incbin "graphics/pokemon/palettes/rayquaza_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rayquaza/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_rayquaza_back_pic:: @ 8E36B3C
-	.incbin "graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/rayquaza/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_rayquaza_shiny_palette:: @ 8E36E74
-	.incbin "graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/rayquaza/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_rayquaza_icon:: @ 8E36E9C
-	.incbin "graphics/pokemon/icons/rayquaza_icon.4bpp"
+	.incbin "graphics/pokemon/rayquaza/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_rayquaza_footprint:: @ 8E3729C
-	.incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp"
+	.incbin "graphics/pokemon/rayquaza/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_latias_still_front_pic:: @ 8E372BC
-	.incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latias/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latias_palette:: @ 8E376E0
-	.incbin "graphics/pokemon/palettes/latias_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latias/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_latias_back_pic:: @ 8E37708
-	.incbin "graphics/pokemon/back_pics/latias_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latias/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latias_shiny_palette:: @ 8E37A04
-	.incbin "graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latias/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_latias_icon:: @ 8E37A2C
-	.incbin "graphics/pokemon/icons/latias_icon.4bpp"
+	.incbin "graphics/pokemon/latias/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_latias_footprint:: @ 8E37E2C
-	.incbin "graphics/pokemon/footprints/latias_footprint.1bpp"
+	.incbin "graphics/pokemon/latias/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_latios_still_front_pic:: @ 8E37E4C
-	.incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latios/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latios_palette:: @ 8E382A0
-	.incbin "graphics/pokemon/palettes/latios_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latios/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_latios_back_pic:: @ 8E382C8
-	.incbin "graphics/pokemon/back_pics/latios_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/latios/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_latios_shiny_palette:: @ 8E38628
-	.incbin "graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/latios/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_latios_icon:: @ 8E38650
-	.incbin "graphics/pokemon/icons/latios_icon.4bpp"
+	.incbin "graphics/pokemon/latios/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_latios_footprint:: @ 8E38A50
-	.incbin "graphics/pokemon/footprints/latios_footprint.1bpp"
+	.incbin "graphics/pokemon/latios/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_jirachi_still_front_pic:: @ 8E38A70
-	.incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jirachi/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jirachi_palette:: @ 8E38D7C
-	.incbin "graphics/pokemon/palettes/jirachi_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jirachi/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_jirachi_back_pic:: @ 8E38DA4
-	.incbin "graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/jirachi/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_jirachi_shiny_palette:: @ 8E39144
-	.incbin "graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/jirachi/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_jirachi_icon:: @ 8E3916C
-	.incbin "graphics/pokemon/icons/jirachi_icon.4bpp"
+	.incbin "graphics/pokemon/jirachi/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_jirachi_footprint:: @ 8E3956C
-	.incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp"
+	.incbin "graphics/pokemon/jirachi/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_deoxys_still_front_pic:: @ 8E3958C
-	.incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/deoxys/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_deoxys_palette:: @ 8E39D48
-	.incbin "graphics/pokemon/palettes/deoxys_palette.gbapal.lz"
+	.incbin "graphics/pokemon/deoxys/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_deoxys_back_pic:: @ 8E39D70
-	.incbin "graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/deoxys/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_deoxys_shiny_palette:: @ 8E3A360
-	.incbin "graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/deoxys/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_deoxys_icon:: @ 8E3A388
-	.incbin "graphics/pokemon/icons/deoxys_icon.4bpp"
+	.incbin "graphics/pokemon/deoxys/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_icons_deoxys_speed_icon:: @ 8E3A788
-	.incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp"
+	.incbin "graphics/pokemon/deoxys/speed_icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_deoxys_footprint:: @ 8E3AB88
-	.incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp"
+	.incbin "graphics/pokemon/deoxys/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_chimecho_still_front_pic:: @ 8E3ABA8
-	.incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chimecho/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chimecho_palette:: @ 8E3ADF4
-	.incbin "graphics/pokemon/palettes/chimecho_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chimecho/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_chimecho_back_pic:: @ 8E3AE1C
-	.incbin "graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/chimecho/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_chimecho_shiny_palette:: @ 8E3B090
-	.incbin "graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz"
+	.incbin "graphics/pokemon/chimecho/shiny.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_chimecho_icon:: @ 8E3B0B8
-	.incbin "graphics/pokemon/icons/chimecho_icon.4bpp"
+	.incbin "graphics/pokemon/chimecho/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_chimecho_footprint:: @ 8E3B4B8
-	.incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp"
+	.incbin "graphics/pokemon/chimecho/footprint.1bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_egg_still_front_pic:: @ 8E3B4D8
-	.incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/egg/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_palettes_egg_palette:: @ 8E3B68C
-	.incbin "graphics/pokemon/palettes/egg_palette.gbapal.lz"
+	.incbin "graphics/pokemon/egg/normal.gbapal.lz"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_b_still_front_pic:: @ 8E3B6AC
-	.incbin "graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/b/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_b_back_pic:: @ 8E3B884
-	.incbin "graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/b/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_B_icon:: @ 8E3BA88
-	.incbin "graphics/pokemon/icons/unown_B_icon.4bpp"
+	.incbin "graphics/pokemon/unown/B/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_c_still_front_pic:: @ 8E3BE88
-	.incbin "graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/c/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_c_back_pic:: @ 8E3C09C
-	.incbin "graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/c/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_C_icon:: @ 8E3C348
-	.incbin "graphics/pokemon/icons/unown_C_icon.4bpp"
+	.incbin "graphics/pokemon/unown/C/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_d_still_front_pic:: @ 8E3C748
-	.incbin "graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/d/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_d_back_pic:: @ 8E3C940
-	.incbin "graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/d/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_D_icon:: @ 8E3CB98
-	.incbin "graphics/pokemon/icons/unown_D_icon.4bpp"
+	.incbin "graphics/pokemon/unown/D/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_e_still_front_pic:: @ 8E3CF98
-	.incbin "graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/e/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_e_back_pic:: @ 8E3D150
-	.incbin "graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/e/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_E_icon:: @ 8E3D350
-	.incbin "graphics/pokemon/icons/unown_E_icon.4bpp"
+	.incbin "graphics/pokemon/unown/E/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_f_still_front_pic:: @ 8E3D750
-	.incbin "graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/f/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_f_back_pic:: @ 8E3D944
-	.incbin "graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/f/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_F_icon:: @ 8E3DB60
-	.incbin "graphics/pokemon/icons/unown_F_icon.4bpp"
+	.incbin "graphics/pokemon/unown/F/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_g_still_front_pic:: @ 8E3DF60
-	.incbin "graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/g/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_g_back_pic:: @ 8E3E13C
-	.incbin "graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/g/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_G_icon:: @ 8E3E388
-	.incbin "graphics/pokemon/icons/unown_G_icon.4bpp"
+	.incbin "graphics/pokemon/unown/G/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_h_still_front_pic:: @ 8E3E788
-	.incbin "graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/h/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_h_back_pic:: @ 8E3E9CC
-	.incbin "graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/h/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_H_icon:: @ 8E3EC90
-	.incbin "graphics/pokemon/icons/unown_H_icon.4bpp"
+	.incbin "graphics/pokemon/unown/H/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_i_still_front_pic:: @ 8E3F090
-	.incbin "graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/i/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_i_back_pic:: @ 8E3F228
-	.incbin "graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/i/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_I_icon:: @ 8E3F3D0
-	.incbin "graphics/pokemon/icons/unown_I_icon.4bpp"
+	.incbin "graphics/pokemon/unown/I/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_j_still_front_pic:: @ 8E3F7D0
-	.incbin "graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/j/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_j_back_pic:: @ 8E3F994
-	.incbin "graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/j/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_J_icon:: @ 8E3FB7C
-	.incbin "graphics/pokemon/icons/unown_J_icon.4bpp"
+	.incbin "graphics/pokemon/unown/J/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_k_still_front_pic:: @ 8E3FF7C
-	.incbin "graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/k/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_k_back_pic:: @ 8E4014C
-	.incbin "graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/k/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_K_icon:: @ 8E40344
-	.incbin "graphics/pokemon/icons/unown_K_icon.4bpp"
+	.incbin "graphics/pokemon/unown/K/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_l_still_front_pic:: @ 8E40744
-	.incbin "graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/l/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_l_back_pic:: @ 8E408F4
-	.incbin "graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/l/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_L_icon:: @ 8E40AC8
-	.incbin "graphics/pokemon/icons/unown_L_icon.4bpp"
+	.incbin "graphics/pokemon/unown/L/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_m_still_front_pic:: @ 8E40EC8
-	.incbin "graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/m/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_m_back_pic:: @ 8E410EC
-	.incbin "graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/m/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_M_icon:: @ 8E41394
-	.incbin "graphics/pokemon/icons/unown_M_icon.4bpp"
+	.incbin "graphics/pokemon/unown/M/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_n_still_front_pic:: @ 8E41794
-	.incbin "graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/n/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_n_back_pic:: @ 8E4198C
-	.incbin "graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/n/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_N_icon:: @ 8E41BF8
-	.incbin "graphics/pokemon/icons/unown_N_icon.4bpp"
+	.incbin "graphics/pokemon/unown/N/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_o_still_front_pic:: @ 8E41FF8
-	.incbin "graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/o/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_o_back_pic:: @ 8E42230
-	.incbin "graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/o/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_O_icon:: @ 8E424F0
-	.incbin "graphics/pokemon/icons/unown_O_icon.4bpp"
+	.incbin "graphics/pokemon/unown/O/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_p_still_front_pic:: @ 8E428F0
-	.incbin "graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/p/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_p_back_pic:: @ 8E42A90
-	.incbin "graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/p/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_P_icon:: @ 8E42C54
-	.incbin "graphics/pokemon/icons/unown_P_icon.4bpp"
+	.incbin "graphics/pokemon/unown/P/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_q_still_front_pic:: @ 8E43054
-	.incbin "graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/q/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_q_back_pic:: @ 8E43208
-	.incbin "graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/q/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Q_icon:: @ 8E433D4
-	.incbin "graphics/pokemon/icons/unown_Q_icon.4bpp"
+	.incbin "graphics/pokemon/unown/Q/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_r_still_front_pic:: @ 8E437D4
-	.incbin "graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/r/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_r_back_pic:: @ 8E43978
-	.incbin "graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/r/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_R_icon:: @ 8E43B40
-	.incbin "graphics/pokemon/icons/unown_R_icon.4bpp"
+	.incbin "graphics/pokemon/unown/R/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_s_still_front_pic:: @ 8E43F40
-	.incbin "graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/s/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_s_back_pic:: @ 8E44128
-	.incbin "graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/s/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_S_icon:: @ 8E4437C
-	.incbin "graphics/pokemon/icons/unown_S_icon.4bpp"
+	.incbin "graphics/pokemon/unown/S/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_t_still_front_pic:: @ 8E4477C
-	.incbin "graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/t/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_t_back_pic:: @ 8E4492C
-	.incbin "graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/t/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_T_icon:: @ 8E44AE0
-	.incbin "graphics/pokemon/icons/unown_T_icon.4bpp"
+	.incbin "graphics/pokemon/unown/T/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_u_still_front_pic:: @ 8E44EE0
-	.incbin "graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/u/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_u_back_pic:: @ 8E450F8
-	.incbin "graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/u/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_U_icon:: @ 8E4534C
-	.incbin "graphics/pokemon/icons/unown_U_icon.4bpp"
+	.incbin "graphics/pokemon/unown/U/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_v_still_front_pic:: @ 8E4574C
-	.incbin "graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/v/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_v_back_pic:: @ 8E45930
-	.incbin "graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/v/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_V_icon:: @ 8E45B60
-	.incbin "graphics/pokemon/icons/unown_V_icon.4bpp"
+	.incbin "graphics/pokemon/unown/V/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_w_still_front_pic:: @ 8E45F60
-	.incbin "graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/w/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_w_back_pic:: @ 8E46134
-	.incbin "graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/w/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_W_icon:: @ 8E46338
-	.incbin "graphics/pokemon/icons/unown_W_icon.4bpp"
+	.incbin "graphics/pokemon/unown/W/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_x_still_front_pic:: @ 8E46738
-	.incbin "graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/x/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_x_back_pic:: @ 8E468FC
-	.incbin "graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/x/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_X_icon:: @ 8E46AEC
-	.incbin "graphics/pokemon/icons/unown_X_icon.4bpp"
+	.incbin "graphics/pokemon/unown/X/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_y_still_front_pic:: @ 8E46EEC
-	.incbin "graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/y/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_y_back_pic:: @ 8E470C4
-	.incbin "graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/y/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Y_icon:: @ 8E472B8
-	.incbin "graphics/pokemon/icons/unown_Y_icon.4bpp"
+	.incbin "graphics/pokemon/unown/Y/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_z_still_front_pic:: @ 8E476B8
-	.incbin "graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/z/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_z_back_pic:: @ 8E47868
-	.incbin "graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/z/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_Z_icon:: @ 8E47A44
-	.incbin "graphics/pokemon/icons/unown_Z_icon.4bpp"
+	.incbin "graphics/pokemon/unown/Z/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_exclamation_mark_still_front_pic:: @ 8E47E44
-	.incbin "graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/exclamation_mark/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4
-	.incbin "graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_exclamation_mark_icon:: @ 8E4819C
-	.incbin "graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp"
+	.incbin "graphics/pokemon/unown/exclamation_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_front_pics_unown_question_mark_still_front_pic:: @ 8E4859C
-	.incbin "graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/question_mark/front.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758
-	.incbin "graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz"
+	.incbin "graphics/pokemon/unown/question_mark/back.4bpp.lz"
 
 	.align 2
 gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958
-	.incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp"
+	.incbin "graphics/pokemon/unown/question_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58
@@ -13436,11 +13436,11 @@ gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34
 
 	.align 2
 gFile_graphics_pokemon_icons_question_mark_icon:: @ 8E76F5C
-	.incbin "graphics/pokemon/icons/question_mark_icon.4bpp"
+	.incbin "graphics/pokemon/question_mark/icon.4bpp"
 
 	.align 2
 gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C
-	.incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp"
+	.incbin "graphics/pokemon/question_mark/footprint.1bpp"
 
 	.align 2
 gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C