Move trainer pics/pals and battle terrain to src

4 files changed, 498 insertions, 1328 deletions

diff --git a/data/graphics.s b/data/graphics.s
index ae725879d..ff372fa03 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1,1334 +1,6 @@
 	.section gfx_data, "aw", %progbits
 
 	.align 2
-gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58
-	.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaLeaderArchie:: @ 8E49094
-	.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntM:: @ 8E490BC
-	.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntM:: @ 8E4941C
-	.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaGruntF:: @ 8E49444
-	.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaGruntF:: @ 8E49780
-	.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSAromaLady:: @ 8E497A8
-	.incbin "graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSAromaLady:: @ 8E49A6C
-	.incbin "graphics/trainers/palettes/rs_aroma_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSRuinManiac:: @ 8E49A94
-	.incbin "graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSRuinManiac:: @ 8E49E30
-	.incbin "graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Interviewer:: @ 8E49E58
-	.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Interviewer:: @ 8E4A2FC
-	.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSTuberF:: @ 8E4A324
-	.incbin "graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSTuberF:: @ 8E4A5C8
-	.incbin "graphics/trainers/palettes/rs_tuber_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberM:: @ 8E4A5F0
-	.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberM:: @ 8E4A87C
-	.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCooltrainerM:: @ 8E4A8A4
-	.incbin "graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCooltrainerM:: @ 8E4AB8C
-	.incbin "graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCooltrainerF:: @ 8E4ABB4
-	.incbin "graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCooltrainerF:: @ 8E4AEC8
-	.incbin "graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_HexManiac:: @ 8E4AEF0
-	.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_HexManiac:: @ 8E4B25C
-	.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSLady:: @ 8E4B284
-	.incbin "graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSLady:: @ 8E4B638
-	.incbin "graphics/trainers/palettes/rs_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBeauty:: @ 8E4B660
-	.incbin "graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBeauty:: @ 8E4B948
-	.incbin "graphics/trainers/palettes/rs_beauty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RichBoy:: @ 8E4B970
-	.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RichBoy:: @ 8E4BC24
-	.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokeManiac:: @ 8E4BC4C
-	.incbin "graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokeManiac:: @ 8E4BFBC
-	.incbin "graphics/trainers/palettes/rs_pokemaniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSwimmerM:: @ 8E4BFE4
-	.incbin "graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSwimmerM:: @ 8E4C2A4
-	.incbin "graphics/trainers/palettes/rs_swimmer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBlackBelt:: @ 8E4C2CC
-	.incbin "graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBlackBelt:: @ 8E4C630
-	.incbin "graphics/trainers/palettes/rs_black_belt.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Guitarist:: @ 8E4C658
-	.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Guitarist:: @ 8E4C9DC
-	.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Kindler:: @ 8E4CA04
-	.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Kindler:: @ 8E4CD70
-	.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSCamper:: @ 8E4CD98
-	.incbin "graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSCamper:: @ 8E4D080
-	.incbin "graphics/trainers/palettes/rs_camper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugManiac:: @ 8E4D0A8
-	.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugManiac:: @ 8E4D4F8
-	.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPsychicM:: @ 8E4D520
-	.incbin "graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPsychicM:: @ 8E4D84C
-	.incbin "graphics/trainers/palettes/rs_psychic_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPsychicF:: @ 8E4D874
-	.incbin "graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPsychicF:: @ 8E4DB9C
-	.incbin "graphics/trainers/palettes/rs_psychic_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSGentleman:: @ 8E4DBC4
-	.incbin "graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSGentleman:: @ 8E4DEC4
-	.incbin "graphics/trainers/palettes/rs_gentleman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourSidney:: @ 8E4DEEC
-	.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourSidney:: @ 8E4E220
-	.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourPhoebe:: @ 8E4E248
-	.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourPhoebe:: @ 8E4E548
-	.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderRoxanne:: @ 8E4E570
-	.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderRoxanne:: @ 8E4E85C
-	.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBrawly:: @ 8E4E884
-	.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBrawly:: @ 8E4EC18
-	.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderTateAndLiza:: @ 8E4EC40
-	.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderTateAndLiza:: @ 8E4F084
-	.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidM:: @ 8E4F0AC
-	.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidM:: @ 8E4F36C
-	.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SchoolKidF:: @ 8E4F394
-	.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SchoolKidF:: @ 8E4F630
-	.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SrAndJr:: @ 8E4F658
-	.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SrAndJr:: @ 8E4FAC8
-	.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokefanM:: @ 8E4FAF0
-	.incbin "graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokefanM:: @ 8E4FEAC
-	.incbin "graphics/trainers/palettes/pokefan_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokefanF:: @ 8E4FED4
-	.incbin "graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokefanF:: @ 8E502A0
-	.incbin "graphics/trainers/palettes/pokefan_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertM:: @ 8E502C8
-	.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertM:: @ 8E50608
-	.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ExpertF:: @ 8E50630
-	.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ExpertF:: @ 8E5094C
-	.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSYoungster:: @ 8E50974
-	.incbin "graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSYoungster:: @ 8E50C1C
-	.incbin "graphics/trainers/palettes/rs_youngster.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ChampionSteven:: @ 8E50C44
-	.incbin "graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ChampionSteven:: @ 8E50F7C
-	.incbin "graphics/trainers/palettes/champion_steven.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSFisherman:: @ 8E50FA4
-	.incbin "graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSFisherman:: @ 8E51388
-	.incbin "graphics/trainers/palettes/rs_fisherman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteM:: @ 8E513B0
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteM:: @ 8E517C0
-	.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CyclingTriathleteF:: @ 8E517E8
-	.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CyclingTriathleteF:: @ 8E51BF4
-	.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteM:: @ 8E51C1C
-	.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteM:: @ 8E51ED4
-	.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RunningTriathleteF:: @ 8E51EFC
-	.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RunningTriathleteF:: @ 8E521A0
-	.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteM:: @ 8E521C8
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteM:: @ 8E524F4
-	.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmingTriathleteF:: @ 8E5251C
-	.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmingTriathleteF:: @ 8E527F8
-	.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_DragonTamer:: @ 8E52820
-	.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_DragonTamer:: @ 8E52B74
-	.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBirdKeeper:: @ 8E52B9C
-	.incbin "graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBirdKeeper:: @ 8E52ED4
-	.incbin "graphics/trainers/palettes/rs_bird_keeper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_NinjaBoy:: @ 8E52EFC
-	.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_NinjaBoy:: @ 8E531D8
-	.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BattleGirl:: @ 8E53200
-	.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BattleGirl:: @ 8E53520
-	.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ParasolLady:: @ 8E53548
-	.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ParasolLady:: @ 8E53880
-	.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSwimmerF:: @ 8E538A8
-	.incbin "graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSwimmerF:: @ 8E53B78
-	.incbin "graphics/trainers/palettes/rs_swimmer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPicnicker:: @ 8E53BA0
-	.incbin "graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPicnicker:: @ 8E53E80
-	.incbin "graphics/trainers/palettes/rs_picnicker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSTwins:: @ 8E53EA8
-	.incbin "graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSTwins:: @ 8E5426C
-	.incbin "graphics/trainers/palettes/rs_twins.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSailor:: @ 8E54294
-	.incbin "graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSailor:: @ 8E54644
-	.incbin "graphics/trainers/palettes/rs_sailor.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Collector:: @ 8E5466C
-	.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Collector:: @ 8E54A70
-	.incbin "graphics/trainers/palettes/collector.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Wally:: @ 8E54A98
-	.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Wally:: @ 8E54D68
-	.incbin "graphics/trainers/palettes/wally.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBrendan1:: @ 8E54D90
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBrendan1:: @ 8E550A4
-	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSMay1:: @ 8E550CC
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSMay1:: @ 8E553CC
-	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederM:: @ 8E553F4
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederM:: @ 8E55724
-	.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonBreederF:: @ 8E5574C
-	.incbin "graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonBreederF:: @ 8E55A80
-	.incbin "graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8
-	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonRangerM:: @ 8E55DF0
-	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSPokemonRangerF:: @ 8E55E18
-	.incbin "graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSPokemonRangerF:: @ 8E5614C
-	.incbin "graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaLeaderMaxie:: @ 8E56174
-	.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaLeaderMaxie:: @ 8E56468
-	.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntM:: @ 8E56490
-	.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntM:: @ 8E56810
-	.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaGruntF:: @ 8E56838
-	.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaGruntF:: @ 8E56BC4
-	.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSLass:: @ 8E56BEC
-	.incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSLass:: @ 8E56EC4
-	.incbin "graphics/trainers/palettes/rs_lass.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBugCatcher:: @ 8E56EEC
-	.incbin "graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBugCatcher:: @ 8E57218
-	.incbin "graphics/trainers/palettes/rs_bug_catcher.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSHiker:: @ 8E57240
-	.incbin "graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSHiker:: @ 8E576C0
-	.incbin "graphics/trainers/palettes/rs_hiker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSYoungCouple:: @ 8E576E8
-	.incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSYoungCouple:: @ 8E57AA8
-	.incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_OldCouple:: @ 8E57AD0
-	.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_OldCouple:: @ 8E57FE0
-	.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSSisAndBro:: @ 8E58008
-	.incbin "graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSSisAndBro:: @ 8E58454
-	.incbin "graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminM:: @ 8E5847C
-	.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminM:: @ 8E58830
-	.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AquaAdminF:: @ 8E58858
-	.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AquaAdminF:: @ 8E58C1C
-	.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaAdminM:: @ 8E58C44
-	.incbin "graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaAdminM:: @ 8E5901C
-	.incbin "graphics/trainers/palettes/magma_admin_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_MagmaAdminF:: @ 8E59044
-	.incbin "graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_MagmaAdminF:: @ 8E593F4
-	.incbin "graphics/trainers/palettes/magma_admin_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWattson:: @ 8E5941C
-	.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWattson:: @ 8E59764
-	.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderFlannery:: @ 8E5978C
-	.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderFlannery:: @ 8E59B0C
-	.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderNorman:: @ 8E59B34
-	.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderNorman:: @ 8E59E70
-	.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWinona:: @ 8E59E98
-	.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWinona:: @ 8E5A218
-	.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderWallace:: @ 8E5A240
-	.incbin "graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderWallace:: @ 8E5A5B8
-	.incbin "graphics/trainers/palettes/leader_wallace.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourGlacia:: @ 8E5A5E0
-	.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourGlacia:: @ 8E5A964
-	.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C
-	.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourDrake:: @ 8E5AD34
-	.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Youngster:: @ 8E5AD5C
-	.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Youngster:: @ 8E5AFFC
-	.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BugCatcher:: @ 8E5B024
-	.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BugCatcher:: @ 8E5B36C
-	.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lass:: @ 8E5B394
-	.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lass:: @ 8E5B680
-	.incbin "graphics/trainers/palettes/lass.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Sailor:: @ 8E5B6A8
-	.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Sailor:: @ 8E5B9C8
-	.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Camper:: @ 8E5B9F0
-	.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Camper:: @ 8E5BCD0
-	.incbin "graphics/trainers/palettes/camper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Picnicker:: @ 8E5BCF8
-	.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Picnicker:: @ 8E5BFE0
-	.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokeManiac:: @ 8E5C008
-	.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokeManiac:: @ 8E5C3C4
-	.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SuperNerd:: @ 8E5C3EC
-	.incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SuperNerd:: @ 8E5C704
-	.incbin "graphics/trainers/palettes/super_nerd.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Hiker:: @ 8E5C72C
-	.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Hiker:: @ 8E5CB9C
-	.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Biker:: @ 8E5CBC4
-	.incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Biker:: @ 8E5D12C
-	.incbin "graphics/trainers/palettes/biker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Burglar:: @ 8E5D154
-	.incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Burglar:: @ 8E5D4A0
-	.incbin "graphics/trainers/palettes/burglar.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Engineer:: @ 8E5D4C8
-	.incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Engineer:: @ 8E5D8D4
-	.incbin "graphics/trainers/palettes/engineer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Fisherman:: @ 8E5D8FC
-	.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Fisherman:: @ 8E5DCA8
-	.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerM:: @ 8E5DCD0
-	.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerM:: @ 8E5DFA8
-	.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CueBall:: @ 8E5DFD0
-	.incbin "graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CueBall:: @ 8E5E598
-	.incbin "graphics/trainers/palettes/cue_ball.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Gamer:: @ 8E5E5C0
-	.incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Gamer:: @ 8E5E954
-	.incbin "graphics/trainers/palettes/gamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Beauty:: @ 8E5E97C
-	.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Beauty:: @ 8E5ECD8
-	.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SwimmerF:: @ 8E5ED00
-	.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SwimmerF:: @ 8E5EFEC
-	.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicM:: @ 8E5F014
-	.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicM:: @ 8E5F374
-	.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rocker:: @ 8E5F39C
-	.incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rocker:: @ 8E5F7F8
-	.incbin "graphics/trainers/palettes/rocker.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Juggler:: @ 8E5F820
-	.incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Juggler:: @ 8E5FC5C
-	.incbin "graphics/trainers/palettes/juggler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Tamer:: @ 8E5FC84
-	.incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Tamer:: @ 8E60038
-	.incbin "graphics/trainers/palettes/tamer.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BirdKeeper:: @ 8E60060
-	.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BirdKeeper:: @ 8E60424
-	.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_BlackBelt:: @ 8E6044C
-	.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_BlackBelt:: @ 8E6086C
-	.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rival1:: @ 8E60894
-	.incbin "graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rival1:: @ 8E60B4C
-	.incbin "graphics/trainers/palettes/rival_1.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Scientist:: @ 8E60B74
-	.incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Scientist:: @ 8E60F50
-	.incbin "graphics/trainers/palettes/scientist.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderGiovanni:: @ 8E60F78
-	.incbin "graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderGiovanni:: @ 8E61288
-	.incbin "graphics/trainers/palettes/leader_giovanni.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RocketGruntM:: @ 8E612B0
-	.incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RocketGruntM:: @ 8E615E4
-	.incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CooltrainerM:: @ 8E6160C
-	.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CooltrainerM:: @ 8E618DC
-	.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CooltrainerF:: @ 8E61904
-	.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CooltrainerF:: @ 8E61C1C
-	.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourLorelei:: @ 8E61C44
-	.incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourLorelei:: @ 8E61F70
-	.incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourBruno:: @ 8E61F98
-	.incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourBruno:: @ 8E623E4
-	.incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourAgatha:: @ 8E6240C
-	.incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourAgatha:: @ 8E62728
-	.incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_EliteFourLance:: @ 8E62750
-	.incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_EliteFourLance:: @ 8E62B18
-	.incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBrock:: @ 8E62B40
-	.incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBrock:: @ 8E62E8C
-	.incbin "graphics/trainers/palettes/leader_brock.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderMisty:: @ 8E62EB4
-	.incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderMisty:: @ 8E631B4
-	.incbin "graphics/trainers/palettes/leader_misty.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderLtSurge:: @ 8E631DC
-	.incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderLtSurge:: @ 8E6356C
-	.incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderErika:: @ 8E63594
-	.incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderErika:: @ 8E63888
-	.incbin "graphics/trainers/palettes/leader_erika.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderKoga:: @ 8E638B0
-	.incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderKoga:: @ 8E63C18
-	.incbin "graphics/trainers/palettes/leader_koga.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderBlaine:: @ 8E63C40
-	.incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderBlaine:: @ 8E6404C
-	.incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_LeaderSabrina:: @ 8E64074
-	.incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_LeaderSabrina:: @ 8E6437C
-	.incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Gentleman:: @ 8E643A4
-	.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Gentleman:: @ 8E646DC
-	.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Rival2:: @ 8E64704
-	.incbin "graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Rival2:: @ 8E649F8
-	.incbin "graphics/trainers/palettes/rival_2.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ChampionRival:: @ 8E64A20
-	.incbin "graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ChampionRival:: @ 8E64D1C
-	.incbin "graphics/trainers/palettes/champion_rival.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Channeler:: @ 8E64D44
-	.incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Channeler:: @ 8E6511C
-	.incbin "graphics/trainers/palettes/channeler.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Twins:: @ 8E65144
-	.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Twins:: @ 8E65494
-	.incbin "graphics/trainers/palettes/twins.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CoolCouple:: @ 8E654BC
-	.incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CoolCouple:: @ 8E6599C
-	.incbin "graphics/trainers/palettes/cool_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_YoungCouple:: @ 8E659C4
-	.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_YoungCouple:: @ 8E65E10
-	.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CrushKin:: @ 8E65E38
-	.incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CrushKin:: @ 8E663D8
-	.incbin "graphics/trainers/palettes/crush_kin.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_SisAndBro:: @ 8E66400
-	.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_SisAndBro:: @ 8E66860
-	.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_ProfessorOak:: @ 8E66888
-	.incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_ProfessorOak:: @ 8E66BF4
-	.incbin "graphics/trainers/palettes/professor_oak.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSBrendan2:: @ 8E66C1C
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSBrendan2:: @ 8E66F30
-	.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RSMay2:: @ 8E66F58
-	.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RSMay2:: @ 8E67258
-	.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Red:: @ 8E67280
-	.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Red:: @ 8E6758C
-	.incbin "graphics/trainers/palettes/red.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Leaf:: @ 8E675B4
-	.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Leaf:: @ 8E678F0
-	.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RocketGruntF:: @ 8E67918
-	.incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RocketGruntF:: @ 8E67C30
-	.incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PsychicF:: @ 8E67C58
-	.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PsychicF:: @ 8E67FF8
-	.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_CrushGirl:: @ 8E68020
-	.incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_CrushGirl:: @ 8E6832C
-	.incbin "graphics/trainers/palettes/crush_girl.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_TuberF:: @ 8E68354
-	.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_TuberF:: @ 8E68658
-	.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonBreederF:: @ 8E68680
-	.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonBreederF:: @ 8E689C0
-	.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerM:: @ 8E689E8
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerM:: @ 8E68D48
-	.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_PokemonRangerF:: @ 8E68D70
-	.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_PokemonRangerF:: @ 8E690A4
-	.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_AromaLady:: @ 8E690CC
-	.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_AromaLady:: @ 8E6941C
-	.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_RuinManiac:: @ 8E69444
-	.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_RuinManiac:: @ 8E69850
-	.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Lady:: @ 8E69878
-	.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Lady:: @ 8E69BA0
-	.incbin "graphics/trainers/palettes/lady.gbapal.lz"
-
-	.align 2
-gTrainerFrontPic_Painter:: @ 8E69BC8
-	.incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz"
-
-	.align 2
-gTrainerPalette_Painter:: @ 8E69E94
-	.incbin "graphics/trainers/palettes/painter.gbapal.lz"
-
-	.align 2
-gTrainerBackPic_Red:: @ 8E69EBC
-	.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Leaf:: @ 8E6C6BC
-	.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_Pokedude:: @ 8E6EEBC
-	.incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_OldMan:: @ 8E70EBC
-	.incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RSBrendan:: @ 8E72EBC
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
-
-	.align 2
-gTrainerBackPic_RSMay:: @ 8E74EBC
-	.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
-
-	.align 2
-gTrainerPalette_RedBackPic:: @ 8E76EBC
-	.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_LeafBackPic:: @ 8E76EE4
-	.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_PokedudeBackPic:: @ 8E76F0C
-	.incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz"
-
-	.align 2
-gTrainerPalette_OldManBackPic:: @ 8E76F34
-	.incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz"
-
-	.align 2
-gMonIcon_QuestionMark:: @ 8E76F5C
-	.incbin "graphics/pokemon/question_mark/icon.4bpp"
-
-	.align 2
-gMonFootprint_QuestionMark:: @ 8E7735C
-	.incbin "graphics/pokemon/question_mark/footprint.1bpp"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C
-	.incbin "graphics/battle_transitions/vs_frame.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_tilemap:: @ 8E77464
-	.incbin "graphics/battle_transitions/vs_frame.bin.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_frame_palette:: @ 8E77570
-	.incbin "graphics/battle_transitions/vs_frame.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_transitions_vs_sheet:: @ 8E77598
-	.incbin "graphics/battle_transitions/vs.4bpp.lz" @from ruby
-
-	.align 2
-gFile_graphics_battle_terrain_plain_palette_palette:: @ 8E777A8
-	.incbin "graphics/battle_terrain/plain/palette.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_tiles_sheet:: @ 8E777E4
-	.incbin "graphics/battle_terrain/building/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_battle_frontier_palette:: @ 8E77D90
-	.incbin "graphics/battle_terrain/stadium/battle_frontier.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_map_tilemap:: @ 8E77DCC
-	.incbin "graphics/battle_terrain/building/map.bin.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_tiles_sheet:: @ 8E7807C
-	.incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_map_tilemap:: @ 8E78684
-	.incbin "graphics/battle_terrain/stadium/map.bin.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette_palette:: @ 8E78934
-	.incbin "graphics/battle_terrain/building/palette.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_water_kyogre_palette:: @ 8E78974
-	.incbin "graphics/battle_terrain/water/kyogre.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_cave_groudon_palette:: @ 8E789B0
-	.incbin "graphics/battle_terrain/cave/groudon.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette2_palette:: @ 8E78A08
-	.incbin "graphics/battle_terrain/building/palette2.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_palette3_palette:: @ 8E78A44
-	.incbin "graphics/battle_terrain/building/palette3.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette1_palette:: @ 8E78A80
-	.incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette2_palette:: @ 8E78AE0
-	.incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette3_palette:: @ 8E78B4C
-	.incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette4_palette:: @ 8E78B9C
-	.incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette5_palette:: @ 8E78BE4
-	.incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette6_palette:: @ 8E78C28
-	.incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_stadium_palette7_palette:: @ 8E78C78
-	.incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" @from ruby
-
-	.align 2
-gFile_graphics_battle_terrain_building_anim_tiles_sheet:: @ 8E78CB4
-	.incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4
-	.incbin "graphics/battle_terrain/building/anim_map.bin.lz"
-
-	.align 2
 gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8
 	.incbin "graphics/battle_anims/sprites/flying_dirt.4bpp.lz"
 
diff --git a/src/data/graphics/battle_terrain.h b/src/data/graphics/battle_terrain.h
new file mode 100644
index 000000000..f91c2d0d9
--- /dev/null
+++ b/src/data/graphics/battle_terrain.h
@@ -0,0 +1,30 @@
+
+const u32 gFile_graphics_battle_terrain_plain_palette_palette[] = INCBIN_U32("graphics/battle_terrain/plain/palette.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_building_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/tiles.4bpp.lz");
+
+const u32 gFile_graphics_battle_terrain_stadium_battle_frontier_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/battle_frontier.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_building_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/map.bin.lz");
+
+const u32 gFile_graphics_battle_terrain_stadium_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/stadium/tiles.4bpp.lz");
+const u32 gFile_graphics_battle_terrain_stadium_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/stadium/map.bin.lz");
+
+const u32 gFile_graphics_battle_terrain_building_palette_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_water_kyogre_palette[] = INCBIN_U32("graphics/battle_terrain/water/kyogre.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_cave_groudon_palette[] = INCBIN_U32("graphics/battle_terrain/cave/groudon.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_building_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette2.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_building_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette3.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_stadium_palette1_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette1.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette2.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette3.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette4_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette4.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette5_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette5.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette6_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette6.gbapal.lz");
+const u32 gFile_graphics_battle_terrain_stadium_palette7_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette7.gbapal.lz");
+
+const u32 gFile_graphics_battle_terrain_building_anim_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/anim_tiles.4bpp.lz");
+const u32 gFile_graphics_battle_terrain_building_anim_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/anim_map.bin.lz");
diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h
new file mode 100644
index 000000000..07183e288
--- /dev/null
+++ b/src/data/graphics/trainers.h
@@ -0,0 +1,456 @@
+const u32 gTrainerFrontPic_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/palettes/aqua_leader_archie.gbapal.lz");
+
+const u32 gTrainerFrontPic_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/palettes/aqua_grunt_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AquaGruntF[] = INCBIN_U32("graphics/trainers/palettes/aqua_grunt_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSAromaLady[] = INCBIN_U32("graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSAromaLady[] = INCBIN_U32("graphics/trainers/palettes/rs_aroma_lady.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSRuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSRuinManiac[] = INCBIN_U32("graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Interviewer[] = INCBIN_U32("graphics/trainers/palettes/interviewer.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSTuberF[] = INCBIN_U32("graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSTuberF[] = INCBIN_U32("graphics/trainers/palettes/rs_tuber_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/palettes/tuber_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSCooltrainerM[] = INCBIN_U32("graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSCooltrainerM[] = INCBIN_U32("graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSCooltrainerF[] = INCBIN_U32("graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSCooltrainerF[] = INCBIN_U32("graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_HexManiac[] = INCBIN_U32("graphics/trainers/palettes/hex_maniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSLady[] = INCBIN_U32("graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSLady[] = INCBIN_U32("graphics/trainers/palettes/rs_lady.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBeauty[] = INCBIN_U32("graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBeauty[] = INCBIN_U32("graphics/trainers/palettes/rs_beauty.gbapal.lz");
+
+const u32 gTrainerFrontPic_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RichBoy[] = INCBIN_U32("graphics/trainers/palettes/rich_boy.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPokeManiac[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPokeManiac[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemaniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSSwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSSwimmerM[] = INCBIN_U32("graphics/trainers/palettes/rs_swimmer_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBlackBelt[] = INCBIN_U32("graphics/trainers/palettes/rs_black_belt.gbapal.lz");
+
+const u32 gTrainerFrontPic_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Guitarist[] = INCBIN_U32("graphics/trainers/palettes/guitarist.gbapal.lz");
+
+const u32 gTrainerFrontPic_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Kindler[] = INCBIN_U32("graphics/trainers/palettes/kindler.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSCamper[] = INCBIN_U32("graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSCamper[] = INCBIN_U32("graphics/trainers/palettes/rs_camper.gbapal.lz");
+
+const u32 gTrainerFrontPic_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_BugManiac[] = INCBIN_U32("graphics/trainers/palettes/bug_maniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPsychicM[] = INCBIN_U32("graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPsychicM[] = INCBIN_U32("graphics/trainers/palettes/rs_psychic_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPsychicF[] = INCBIN_U32("graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPsychicF[] = INCBIN_U32("graphics/trainers/palettes/rs_psychic_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSGentleman[] = INCBIN_U32("graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSGentleman[] = INCBIN_U32("graphics/trainers/palettes/rs_gentleman.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourSidney[] = INCBIN_U32("graphics/trainers/palettes/elite_four_sidney.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/palettes/elite_four_phoebe.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/palettes/leader_roxanne.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderBrawly[] = INCBIN_U32("graphics/trainers/palettes/leader_brawly.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz");
+
+const u32 gTrainerFrontPic_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SchoolKidM[] = INCBIN_U32("graphics/trainers/palettes/school_kid_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/palettes/school_kid_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/palettes/sr_and_jr.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/palettes/pokefan_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/palettes/pokefan_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ExpertM[] = INCBIN_U32("graphics/trainers/palettes/expert_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ExpertF[] = INCBIN_U32("graphics/trainers/palettes/expert_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSYoungster[] = INCBIN_U32("graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSYoungster[] = INCBIN_U32("graphics/trainers/palettes/rs_youngster.gbapal.lz");
+
+const u32 gTrainerFrontPic_ChampionSteven[] = INCBIN_U32("graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ChampionSteven[] = INCBIN_U32("graphics/trainers/palettes/champion_steven.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSFisherman[] = INCBIN_U32("graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSFisherman[] = INCBIN_U32("graphics/trainers/palettes/rs_fisherman.gbapal.lz");
+
+const u32 gTrainerFrontPic_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/palettes/running_triathlete_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/palettes/running_triathlete_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz");
+const u32 gTrainerPalette_DragonTamer[] = INCBIN_U32("graphics/trainers/palettes/dragon_tamer.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBirdKeeper[] = INCBIN_U32("graphics/trainers/palettes/rs_bird_keeper.gbapal.lz");
+
+const u32 gTrainerFrontPic_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz");
+const u32 gTrainerPalette_NinjaBoy[] = INCBIN_U32("graphics/trainers/palettes/ninja_boy.gbapal.lz");
+
+const u32 gTrainerFrontPic_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz");
+const u32 gTrainerPalette_BattleGirl[] = INCBIN_U32("graphics/trainers/palettes/battle_girl.gbapal.lz");
+
+const u32 gTrainerFrontPic_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ParasolLady[] = INCBIN_U32("graphics/trainers/palettes/parasol_lady.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSSwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSSwimmerF[] = INCBIN_U32("graphics/trainers/palettes/rs_swimmer_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPicnicker[] = INCBIN_U32("graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPicnicker[] = INCBIN_U32("graphics/trainers/palettes/rs_picnicker.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSTwins[] = INCBIN_U32("graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSTwins[] = INCBIN_U32("graphics/trainers/palettes/rs_twins.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSSailor[] = INCBIN_U32("graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSSailor[] = INCBIN_U32("graphics/trainers/palettes/rs_sailor.gbapal.lz");
+
+const u32 gTrainerFrontPic_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Collector[] = INCBIN_U32("graphics/trainers/palettes/collector.gbapal.lz");
+
+const u32 gTrainerFrontPic_Wally[] = INCBIN_U32("graphics/trainers/front_pics/wally_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBrendan1[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBrendan1[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSMay1[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSMay1[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPokemonRangerM[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSPokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSPokemonRangerF[] = INCBIN_U32("graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz");
+const u32 gTrainerPalette_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/palettes/magma_leader_maxie.gbapal.lz");
+
+const u32 gTrainerFrontPic_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_MagmaGruntM[] = INCBIN_U32("graphics/trainers/palettes/magma_grunt_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_MagmaGruntF[] = INCBIN_U32("graphics/trainers/palettes/magma_grunt_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSLass[] = INCBIN_U32("graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSLass[] = INCBIN_U32("graphics/trainers/palettes/rs_lass.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBugCatcher[] = INCBIN_U32("graphics/trainers/palettes/rs_bug_catcher.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSHiker[] = INCBIN_U32("graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSHiker[] = INCBIN_U32("graphics/trainers/palettes/rs_hiker.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSYoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSYoungCouple[] = INCBIN_U32("graphics/trainers/palettes/rs_young_couple.gbapal.lz");
+
+const u32 gTrainerFrontPic_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz");
+const u32 gTrainerPalette_OldCouple[] = INCBIN_U32("graphics/trainers/palettes/old_couple.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSSisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSSisAndBro[] = INCBIN_U32("graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz");
+
+const u32 gTrainerFrontPic_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AquaAdminM[] = INCBIN_U32("graphics/trainers/palettes/aqua_admin_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AquaAdminF[] = INCBIN_U32("graphics/trainers/palettes/aqua_admin_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_MagmaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_MagmaAdminM[] = INCBIN_U32("graphics/trainers/palettes/magma_admin_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_MagmaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_MagmaAdminF[] = INCBIN_U32("graphics/trainers/palettes/magma_admin_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderWattson[] = INCBIN_U32("graphics/trainers/palettes/leader_wattson.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderFlannery[] = INCBIN_U32("graphics/trainers/palettes/leader_flannery.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderNorman[] = INCBIN_U32("graphics/trainers/palettes/leader_norman.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderWinona[] = INCBIN_U32("graphics/trainers/palettes/leader_winona.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderWallace[] = INCBIN_U32("graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderWallace[] = INCBIN_U32("graphics/trainers/palettes/leader_wallace.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/palettes/elite_four_glacia.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourDrake[] = INCBIN_U32("graphics/trainers/palettes/elite_four_drake.gbapal.lz");
+
+const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/palettes/youngster.gbapal.lz");
+
+const u32 gTrainerFrontPic_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz");
+const u32 gTrainerPalette_BugCatcher[] = INCBIN_U32("graphics/trainers/palettes/bug_catcher.gbapal.lz");
+
+const u32 gTrainerFrontPic_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Lass[] = INCBIN_U32("graphics/trainers/palettes/lass.gbapal.lz");
+
+const u32 gTrainerFrontPic_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Sailor[] = INCBIN_U32("graphics/trainers/palettes/sailor.gbapal.lz");
+
+const u32 gTrainerFrontPic_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Camper[] = INCBIN_U32("graphics/trainers/palettes/camper.gbapal.lz");
+
+const u32 gTrainerFrontPic_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Picnicker[] = INCBIN_U32("graphics/trainers/palettes/picnicker.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokeManiac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokeManiac[] = INCBIN_U32("graphics/trainers/palettes/pokemaniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_SuperNerd[] = INCBIN_U32("graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SuperNerd[] = INCBIN_U32("graphics/trainers/palettes/super_nerd.gbapal.lz");
+
+const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/palettes/hiker.gbapal.lz");
+
+const u32 gTrainerFrontPic_Biker[] = INCBIN_U32("graphics/trainers/front_pics/biker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Biker[] = INCBIN_U32("graphics/trainers/palettes/biker.gbapal.lz");
+
+const u32 gTrainerFrontPic_Burglar[] = INCBIN_U32("graphics/trainers/front_pics/burglar_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Burglar[] = INCBIN_U32("graphics/trainers/palettes/burglar.gbapal.lz");
+
+const u32 gTrainerFrontPic_Engineer[] = INCBIN_U32("graphics/trainers/front_pics/engineer_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Engineer[] = INCBIN_U32("graphics/trainers/palettes/engineer.gbapal.lz");
+
+const u32 gTrainerFrontPic_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Fisherman[] = INCBIN_U32("graphics/trainers/palettes/fisherman.gbapal.lz");
+
+const u32 gTrainerFrontPic_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SwimmerM[] = INCBIN_U32("graphics/trainers/palettes/swimmer_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_CueBall[] = INCBIN_U32("graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CueBall[] = INCBIN_U32("graphics/trainers/palettes/cue_ball.gbapal.lz");
+
+const u32 gTrainerFrontPic_Gamer[] = INCBIN_U32("graphics/trainers/front_pics/gamer_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Gamer[] = INCBIN_U32("graphics/trainers/palettes/gamer.gbapal.lz");
+
+const u32 gTrainerFrontPic_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Beauty[] = INCBIN_U32("graphics/trainers/palettes/beauty.gbapal.lz");
+
+const u32 gTrainerFrontPic_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SwimmerF[] = INCBIN_U32("graphics/trainers/palettes/swimmer_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PsychicM[] = INCBIN_U32("graphics/trainers/palettes/psychic_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_Rocker[] = INCBIN_U32("graphics/trainers/front_pics/rocker_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Rocker[] = INCBIN_U32("graphics/trainers/palettes/rocker.gbapal.lz");
+
+const u32 gTrainerFrontPic_Juggler[] = INCBIN_U32("graphics/trainers/front_pics/juggler_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Juggler[] = INCBIN_U32("graphics/trainers/palettes/juggler.gbapal.lz");
+
+const u32 gTrainerFrontPic_Tamer[] = INCBIN_U32("graphics/trainers/front_pics/tamer_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Tamer[] = INCBIN_U32("graphics/trainers/palettes/tamer.gbapal.lz");
+
+const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz");
+const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/palettes/bird_keeper.gbapal.lz");
+
+const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz");
+const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/palettes/black_belt.gbapal.lz");
+
+const u32 gTrainerFrontPic_Rival1[] = INCBIN_U32("graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Rival1[] = INCBIN_U32("graphics/trainers/palettes/rival_1.gbapal.lz");
+
+const u32 gTrainerFrontPic_Scientist[] = INCBIN_U32("graphics/trainers/front_pics/scientist_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Scientist[] = INCBIN_U32("graphics/trainers/palettes/scientist.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderGiovanni[] = INCBIN_U32("graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderGiovanni[] = INCBIN_U32("graphics/trainers/palettes/leader_giovanni.gbapal.lz");
+
+const u32 gTrainerFrontPic_RocketGruntM[] = INCBIN_U32("graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RocketGruntM[] = INCBIN_U32("graphics/trainers/palettes/rocket_grunt_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_CooltrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CooltrainerM[] = INCBIN_U32("graphics/trainers/palettes/cool_trainer_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_CooltrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CooltrainerF[] = INCBIN_U32("graphics/trainers/palettes/cool_trainer_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourLorelei[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourLorelei[] = INCBIN_U32("graphics/trainers/palettes/elite_four_lorelei.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourBruno[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourBruno[] = INCBIN_U32("graphics/trainers/palettes/elite_four_bruno.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourAgatha[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourAgatha[] = INCBIN_U32("graphics/trainers/palettes/elite_four_agatha.gbapal.lz");
+
+const u32 gTrainerFrontPic_EliteFourLance[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz");
+const u32 gTrainerPalette_EliteFourLance[] = INCBIN_U32("graphics/trainers/palettes/elite_four_lance.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderBrock[] = INCBIN_U32("graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderBrock[] = INCBIN_U32("graphics/trainers/palettes/leader_brock.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderMisty[] = INCBIN_U32("graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderMisty[] = INCBIN_U32("graphics/trainers/palettes/leader_misty.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderLtSurge[] = INCBIN_U32("graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderLtSurge[] = INCBIN_U32("graphics/trainers/palettes/leader_lt_surge.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderErika[] = INCBIN_U32("graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderErika[] = INCBIN_U32("graphics/trainers/palettes/leader_erika.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderKoga[] = INCBIN_U32("graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderKoga[] = INCBIN_U32("graphics/trainers/palettes/leader_koga.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderBlaine[] = INCBIN_U32("graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderBlaine[] = INCBIN_U32("graphics/trainers/palettes/leader_blaine.gbapal.lz");
+
+const u32 gTrainerFrontPic_LeaderSabrina[] = INCBIN_U32("graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz");
+const u32 gTrainerPalette_LeaderSabrina[] = INCBIN_U32("graphics/trainers/palettes/leader_sabrina.gbapal.lz");
+
+const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/palettes/gentleman.gbapal.lz");
+
+const u32 gTrainerFrontPic_Rival2[] = INCBIN_U32("graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Rival2[] = INCBIN_U32("graphics/trainers/palettes/rival_2.gbapal.lz");
+
+const u32 gTrainerFrontPic_ChampionRival[] = INCBIN_U32("graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ChampionRival[] = INCBIN_U32("graphics/trainers/palettes/champion_rival.gbapal.lz");
+
+const u32 gTrainerFrontPic_Channeler[] = INCBIN_U32("graphics/trainers/front_pics/channeler_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Channeler[] = INCBIN_U32("graphics/trainers/palettes/channeler.gbapal.lz");
+
+const u32 gTrainerFrontPic_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Twins[] = INCBIN_U32("graphics/trainers/palettes/twins.gbapal.lz");
+
+const u32 gTrainerFrontPic_CoolCouple[] = INCBIN_U32("graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CoolCouple[] = INCBIN_U32("graphics/trainers/palettes/cool_couple.gbapal.lz");
+
+const u32 gTrainerFrontPic_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz");
+const u32 gTrainerPalette_YoungCouple[] = INCBIN_U32("graphics/trainers/palettes/young_couple.gbapal.lz");
+
+const u32 gTrainerFrontPic_CrushKin[] = INCBIN_U32("graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CrushKin[] = INCBIN_U32("graphics/trainers/palettes/crush_kin.gbapal.lz");
+
+const u32 gTrainerFrontPic_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz");
+const u32 gTrainerPalette_SisAndBro[] = INCBIN_U32("graphics/trainers/palettes/sis_and_bro.gbapal.lz");
+
+const u32 gTrainerFrontPic_ProfessorOak[] = INCBIN_U32("graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz");
+const u32 gTrainerPalette_ProfessorOak[] = INCBIN_U32("graphics/trainers/palettes/professor_oak.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSBrendan2[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSBrendan2[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz");
+
+const u32 gTrainerFrontPic_RSMay2[] = INCBIN_U32("graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RSMay2[] = INCBIN_U32("graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz");
+
+const u32 gTrainerFrontPic_Red[] = INCBIN_U32("graphics/trainers/front_pics/red_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Red[] = INCBIN_U32("graphics/trainers/palettes/red.gbapal.lz");
+
+const u32 gTrainerFrontPic_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Leaf[] = INCBIN_U32("graphics/trainers/palettes/leaf.gbapal.lz");
+
+const u32 gTrainerFrontPic_RocketGruntF[] = INCBIN_U32("graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RocketGruntF[] = INCBIN_U32("graphics/trainers/palettes/rocket_grunt_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PsychicF[] = INCBIN_U32("graphics/trainers/palettes/psychic_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_CrushGirl[] = INCBIN_U32("graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz");
+const u32 gTrainerPalette_CrushGirl[] = INCBIN_U32("graphics/trainers/palettes/crush_girl.gbapal.lz");
+
+const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/palettes/tuber_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz");
+
+const u32 gTrainerFrontPic_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokemonRangerF[] = INCBIN_U32("graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz");
+
+const u32 gTrainerFrontPic_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz");
+const u32 gTrainerPalette_AromaLady[] = INCBIN_U32("graphics/trainers/palettes/aroma_lady.gbapal.lz");
+
+const u32 gTrainerFrontPic_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz");
+const u32 gTrainerPalette_RuinManiac[] = INCBIN_U32("graphics/trainers/palettes/ruin_maniac.gbapal.lz");
+
+const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/palettes/lady.gbapal.lz");
+
+const u32 gTrainerFrontPic_Painter[] = INCBIN_U32("graphics/trainers/front_pics/painter_front_pic.4bpp.lz");
+const u32 gTrainerPalette_Painter[] = INCBIN_U32("graphics/trainers/palettes/painter.gbapal.lz");
+
+const u8 gTrainerBackPic_Red[] = INCBIN_U8("graphics/trainers/back_pics/red_back_pic.4bpp");
+const u8 gTrainerBackPic_Leaf[] = INCBIN_U8("graphics/trainers/back_pics/leaf_back_pic.4bpp");
+const u8 gTrainerBackPic_Pokedude[] = INCBIN_U8("graphics/trainers/back_pics/pokedude_back_pic.4bpp");
+const u8 gTrainerBackPic_OldMan[] = INCBIN_U8("graphics/trainers/back_pics/old_man_back_pic.4bpp");
+
+const u8 gTrainerBackPic_RSBrendan[] = INCBIN_U8("graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp");
+const u8 gTrainerBackPic_RSMay[] = INCBIN_U8("graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp");
+
+const u32 gTrainerPalette_RedBackPic[] = INCBIN_U32("graphics/trainers/palettes/leaf_back_pic.gbapal.lz");
+const u32 gTrainerPalette_LeafBackPic[] = INCBIN_U32("graphics/trainers/palettes/red_back_pic.gbapal.lz");
+const u32 gTrainerPalette_PokedudeBackPic[] = INCBIN_U32("graphics/trainers/palettes/pokedude_back_pic.gbapal.lz");
+const u32 gTrainerPalette_OldManBackPic[] = INCBIN_U32("graphics/trainers/palettes/old_man_back_pic.gbapal.lz");
diff --git a/src/graphics.c b/src/graphics.c
index d80d2ae9b..d415604c0 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -954,3 +954,15 @@ const u32 gBattleAnimSpritePal_FlatRock[] = INCBIN_U32("graphics/battle_anims/sp
 const u16 gUnknown_8D2FBB4[] = INCBIN_U16("graphics/interface/unk_8D2FBB4.gbapal");
 
 #include "data/graphics/pokemon.h"
+#include "data/graphics/trainers.h"
+
+const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
+const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
+
+const u32 gFile_graphics_battle_transitions_vs_frame_sheet[] = INCBIN_U32("graphics/battle_transitions/vs_frame.4bpp.lz");
+const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz");
+const u32 gFile_graphics_battle_transitions_vs_frame_palette[] = INCBIN_U32("graphics/battle_transitions/vs_frame.gbapal.lz");
+
+const u32 gFile_graphics_battle_transitions_vs_sheet[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz");
+
+#include "data/graphics/battle_terrain.h"