From 5f6672ee078d878fd089ed0d5925d46ee21511db Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 16 Oct 2019 22:52:41 -0700 Subject: [PATCH] Rename trainer front pics and palettes. --- data/graphics.s | 780 +++++++++--------- .../arena_tycoon_greta_front_pic.png | Bin 702 -> 0 bytes .../trainers/front_pics/brendan_front_pic.png | Bin 698 -> 0 bytes ...t_pic.png => champion_rival_front_pic.png} | Bin ..._pic.png => champion_steven_front_pic.png} | Bin .../front_pics/champion_wallace_front_pic.png | Bin 978 -> 0 bytes ...k_front_pic.png => cue_ball_front_pic.png} | Bin .../front_pics/dome_ace_tucker_front_pic.png | Bin 906 -> 0 bytes .../factory_head_noland_front_pic.png | Bin 736 -> 0 bytes ..._pic.png => leader_giovanni_front_pic.png} | Bin .../front_pics/leader_juan_front_pic.png | Bin 820 -> 0 bytes ...t_pic.png => leader_wallace_front_pic.png} | Bin ...nt_pic.png => magma_admin_f_front_pic.png} | Bin ...nt_pic.png => magma_admin_m_front_pic.png} | Bin .../trainers/front_pics/may_front_pic.png | Bin 689 -> 0 bytes .../palace_maven_spenser_front_pic.png | Bin 802 -> 0 bytes .../front_pics/pike_queen_lucy_front_pic.png | Bin 678 -> 0 bytes ..._front_pic.png => pokefan_f_front_pic.png} | Bin ..._front_pic.png => pokefan_m_front_pic.png} | Bin ...ic.png => pokemon_breeder_f_front_pic.png} | Bin ...ic.png => pokemon_breeder_m_front_pic.png} | Bin ...nt_pic.png => professor_oak_front_pic.png} | Bin .../pyramid_king_brandon_front_pic.png | Bin 721 -> 0 bytes ..._1_front_pic.png => rival_1_front_pic.png} | Bin ..._2_front_pic.png => rival_2_front_pic.png} | Bin ...nt_pic.png => rs_aroma_lady_front_pic.png} | Bin ..._front_pic.png => rs_beauty_front_pic.png} | Bin ...t_pic.png => rs_bird_keeper_front_pic.png} | Bin ...nt_pic.png => rs_black_belt_front_pic.png} | Bin ...t_pic.png => rs_bug_catcher_front_pic.png} | Bin ..._front_pic.png => rs_camper_front_pic.png} | Bin ...ic.png => rs_cool_trainer_f_front_pic.png} | Bin ...ic.png => rs_cool_trainer_m_front_pic.png} | Bin ...ont_pic.png => rs_fisherman_front_pic.png} | Bin ...ont_pic.png => rs_gentleman_front_pic.png} | Bin ...r_front_pic.png => rs_hiker_front_pic.png} | Bin ...dy_front_pic.png => rs_lady_front_pic.png} | Bin ...ss_front_pic.png => rs_lass_front_pic.png} | Bin ...ont_pic.png => rs_picnicker_front_pic.png} | Bin ...nt_pic.png => rs_pokemaniac_front_pic.png} | Bin ...png => rs_pokemon_breeder_f_front_pic.png} | Bin ....png => rs_pokemon_ranger_f_front_pic.png} | Bin ....png => rs_pokemon_ranger_m_front_pic.png} | Bin ...ont_pic.png => rs_psychic_f_front_pic.png} | Bin ...ont_pic.png => rs_psychic_m_front_pic.png} | Bin ...t_pic.png => rs_ruin_maniac_front_pic.png} | Bin ..._front_pic.png => rs_sailor_front_pic.png} | Bin ...t_pic.png => rs_sis_and_bro_front_pic.png} | Bin ...ont_pic.png => rs_swimmer_f_front_pic.png} | Bin ...ont_pic.png => rs_swimmer_m_front_pic.png} | Bin ...front_pic.png => rs_tuber_f_front_pic.png} | Bin ...s_front_pic.png => rs_twins_front_pic.png} | Bin ..._pic.png => rs_young_couple_front_pic.png} | Bin ...ont_pic.png => rs_youngster_front_pic.png} | Bin .../salon_maiden_anabel_front_pic.png | Bin 667 -> 0 bytes ...er_front_pic.png => tuber_f_front_pic.png} | Bin ..._m_front_pic.png => tuber_m_front_pic.png} | Bin .../trainers/palettes/arena_tycoon_greta.pal | 19 - graphics/trainers/palettes/brendan.pal | 19 - .../{blue_1.pal => champion_rival.pal} | 0 .../{steven.pal => champion_steven.pal} | 0 .../palettes/{roughneck.pal => cue_ball.pal} | 0 .../trainers/palettes/dome_ace_tucker.pal | 19 - .../palettes/emerald_leaf_back_pic.pal | 19 - .../palettes/emerald_red_back_pic.pal | 19 - .../trainers/palettes/factory_head_noland.pal | 19 - .../{giovanni.pal => leader_giovanni.pal} | 0 graphics/trainers/palettes/leader_juan.pal | 19 - ...hampion_wallace.pal => leader_wallace.pal} | 0 .../{magma_admin.pal => magma_admin_f.pal} | 0 ...by_magma_admin_f.pal => magma_admin_m.pal} | 0 graphics/trainers/palettes/may.pal | 19 - .../palettes/palace_maven_spenser.pal | 19 - .../trainers/palettes/pike_queen_lucy.pal | 19 - .../{winstrate_f.pal => pokefan_f.pal} | 0 .../{winstrate_m.pal => pokefan_m.pal} | 0 ...emon_breeder.pal => pokemon_breeder_f.pal} | 0 ...on_breeder_m.pal => pokemon_breeder_m.pal} | 0 .../palettes/{oak.pal => professor_oak.pal} | 0 .../palettes/pyramid_king_brandon.pal | 19 - .../palettes/{blue_2.pal => rival_1.pal} | 0 .../{champion_blue.pal => rival_2.pal} | 0 ...erald_aroma_lady.pal => rs_aroma_lady.pal} | 0 .../{emerald_beauty.pal => rs_beauty.pal} | 0 ...ald_bird_keeper.pal => rs_bird_keeper.pal} | 0 ...erald_black_belt.pal => rs_black_belt.pal} | 0 ...ald_bug_catcher.pal => rs_bug_catcher.pal} | 0 .../{emerald_camper.pal => rs_camper.pal} | 0 ...ol_trainer_f.pal => rs_cool_trainer_f.pal} | 0 ...ol_trainer_m.pal => rs_cool_trainer_m.pal} | 0 ...emerald_fisherman.pal => rs_fisherman.pal} | 0 ...emerald_gentleman.pal => rs_gentleman.pal} | 0 .../{emerald_hiker.pal => rs_hiker.pal} | 0 .../{emerald_lady.pal => rs_lady.pal} | 0 .../{emerald_lass.pal => rs_lass.pal} | 0 ...emerald_picnicker.pal => rs_picnicker.pal} | 0 ...erald_pokemaniac.pal => rs_pokemaniac.pal} | 0 ...breeder_f.pal => rs_pokemon_breeder_f.pal} | 0 ...n_ranger_f.pal => rs_pokemon_ranger_f.pal} | 0 ...n_ranger_m.pal => rs_pokemon_ranger_m.pal} | 0 ...emerald_psychic_f.pal => rs_psychic_f.pal} | 0 ...emerald_psychic_m.pal => rs_psychic_m.pal} | 0 ...ald_ruin_maniac.pal => rs_ruin_maniac.pal} | 0 .../{emerald_sailor.pal => rs_sailor.pal} | 0 ...ald_sis_and_bro.pal => rs_sis_and_bro.pal} | 0 ...emerald_swimmer_f.pal => rs_swimmer_f.pal} | 0 ...emerald_swimmer_m.pal => rs_swimmer_m.pal} | 0 .../{emerald_tuber_f.pal => rs_tuber_f.pal} | 0 .../{emerald_twins.pal => rs_twins.pal} | 0 ...d_young_couple.pal => rs_young_couple.pal} | 0 ...emerald_youngster.pal => rs_youngster.pal} | 0 .../trainers/palettes/salon_maiden_anabel.pal | 19 - .../palettes/{tuber.pal => tuber_f.pal} | 0 .../{emerald_tuber_m.pal => tuber_m.pal} | 0 include/constants/trainers.h | 2 +- include/data.h | 4 +- include/graphics.h | 4 +- src/data.c | 20 +- src/pokemon.c | 4 +- 119 files changed, 407 insertions(+), 635 deletions(-) delete mode 100644 graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png delete mode 100644 graphics/trainers/front_pics/brendan_front_pic.png rename graphics/trainers/front_pics/{champion_blue_front_pic.png => champion_rival_front_pic.png} (100%) rename graphics/trainers/front_pics/{steven_front_pic.png => champion_steven_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/champion_wallace_front_pic.png rename graphics/trainers/front_pics/{roughneck_front_pic.png => cue_ball_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/dome_ace_tucker_front_pic.png delete mode 100644 graphics/trainers/front_pics/factory_head_noland_front_pic.png rename graphics/trainers/front_pics/{giovanni_front_pic.png => leader_giovanni_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/leader_juan_front_pic.png rename graphics/trainers/front_pics/{ruby_sapphire_champion_wallace_front_pic.png => leader_wallace_front_pic.png} (100%) rename graphics/trainers/front_pics/{ruby_magma_admin_f_front_pic.png => magma_admin_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{magma_admin_front_pic.png => magma_admin_m_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/may_front_pic.png delete mode 100644 graphics/trainers/front_pics/palace_maven_spenser_front_pic.png delete mode 100644 graphics/trainers/front_pics/pike_queen_lucy_front_pic.png rename graphics/trainers/front_pics/{winstrate_f_front_pic.png => pokefan_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{winstrate_m_front_pic.png => pokefan_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{pokemon_breeder_front_pic.png => pokemon_breeder_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_pokemon_breeder_m_front_pic.png => pokemon_breeder_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{oak_front_pic.png => professor_oak_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png rename graphics/trainers/front_pics/{blue_1_front_pic.png => rival_1_front_pic.png} (100%) rename graphics/trainers/front_pics/{blue_2_front_pic.png => rival_2_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_aroma_lady_front_pic.png => rs_aroma_lady_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_beauty_front_pic.png => rs_beauty_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_bird_keeper_front_pic.png => rs_bird_keeper_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_black_belt_front_pic.png => rs_black_belt_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_bug_catcher_front_pic.png => rs_bug_catcher_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_camper_front_pic.png => rs_camper_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_cool_trainer_f_front_pic.png => rs_cool_trainer_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_cool_trainer_m_front_pic.png => rs_cool_trainer_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_fisherman_front_pic.png => rs_fisherman_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_gentleman_front_pic.png => rs_gentleman_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_hiker_front_pic.png => rs_hiker_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_lady_front_pic.png => rs_lady_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_lass_front_pic.png => rs_lass_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_picnicker_front_pic.png => rs_picnicker_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_pokemaniac_front_pic.png => rs_pokemaniac_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_pokemon_breeder_f_front_pic.png => rs_pokemon_breeder_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_pokemon_ranger_f_front_pic.png => rs_pokemon_ranger_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_pokemon_ranger_m_front_pic.png => rs_pokemon_ranger_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_psychic_f_front_pic.png => rs_psychic_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_psychic_m_front_pic.png => rs_psychic_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_ruin_maniac_front_pic.png => rs_ruin_maniac_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_sailor_front_pic.png => rs_sailor_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_sis_and_bro_front_pic.png => rs_sis_and_bro_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_swimmer_f_front_pic.png => rs_swimmer_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_swimmer_m_front_pic.png => rs_swimmer_m_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_tuber_f_front_pic.png => rs_tuber_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_twins_front_pic.png => rs_twins_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_young_couple_front_pic.png => rs_young_couple_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_youngster_front_pic.png => rs_youngster_front_pic.png} (100%) delete mode 100644 graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png rename graphics/trainers/front_pics/{tuber_front_pic.png => tuber_f_front_pic.png} (100%) rename graphics/trainers/front_pics/{emerald_tuber_m_front_pic.png => tuber_m_front_pic.png} (100%) delete mode 100644 graphics/trainers/palettes/arena_tycoon_greta.pal delete mode 100644 graphics/trainers/palettes/brendan.pal rename graphics/trainers/palettes/{blue_1.pal => champion_rival.pal} (100%) rename graphics/trainers/palettes/{steven.pal => champion_steven.pal} (100%) rename graphics/trainers/palettes/{roughneck.pal => cue_ball.pal} (100%) delete mode 100644 graphics/trainers/palettes/dome_ace_tucker.pal delete mode 100644 graphics/trainers/palettes/emerald_leaf_back_pic.pal delete mode 100644 graphics/trainers/palettes/emerald_red_back_pic.pal delete mode 100644 graphics/trainers/palettes/factory_head_noland.pal rename graphics/trainers/palettes/{giovanni.pal => leader_giovanni.pal} (100%) delete mode 100644 graphics/trainers/palettes/leader_juan.pal rename graphics/trainers/palettes/{champion_wallace.pal => leader_wallace.pal} (100%) rename graphics/trainers/palettes/{magma_admin.pal => magma_admin_f.pal} (100%) rename graphics/trainers/palettes/{ruby_magma_admin_f.pal => magma_admin_m.pal} (100%) delete mode 100644 graphics/trainers/palettes/may.pal delete mode 100644 graphics/trainers/palettes/palace_maven_spenser.pal delete mode 100644 graphics/trainers/palettes/pike_queen_lucy.pal rename graphics/trainers/palettes/{winstrate_f.pal => pokefan_f.pal} (100%) rename graphics/trainers/palettes/{winstrate_m.pal => pokefan_m.pal} (100%) rename graphics/trainers/palettes/{pokemon_breeder.pal => pokemon_breeder_f.pal} (100%) rename graphics/trainers/palettes/{emerald_pokemon_breeder_m.pal => pokemon_breeder_m.pal} (100%) rename graphics/trainers/palettes/{oak.pal => professor_oak.pal} (100%) delete mode 100644 graphics/trainers/palettes/pyramid_king_brandon.pal rename graphics/trainers/palettes/{blue_2.pal => rival_1.pal} (100%) rename graphics/trainers/palettes/{champion_blue.pal => rival_2.pal} (100%) rename graphics/trainers/palettes/{emerald_aroma_lady.pal => rs_aroma_lady.pal} (100%) rename graphics/trainers/palettes/{emerald_beauty.pal => rs_beauty.pal} (100%) rename graphics/trainers/palettes/{emerald_bird_keeper.pal => rs_bird_keeper.pal} (100%) rename graphics/trainers/palettes/{emerald_black_belt.pal => rs_black_belt.pal} (100%) rename graphics/trainers/palettes/{emerald_bug_catcher.pal => rs_bug_catcher.pal} (100%) rename graphics/trainers/palettes/{emerald_camper.pal => rs_camper.pal} (100%) rename graphics/trainers/palettes/{emerald_cool_trainer_f.pal => rs_cool_trainer_f.pal} (100%) rename graphics/trainers/palettes/{emerald_cool_trainer_m.pal => rs_cool_trainer_m.pal} (100%) rename graphics/trainers/palettes/{emerald_fisherman.pal => rs_fisherman.pal} (100%) rename graphics/trainers/palettes/{emerald_gentleman.pal => rs_gentleman.pal} (100%) rename graphics/trainers/palettes/{emerald_hiker.pal => rs_hiker.pal} (100%) rename graphics/trainers/palettes/{emerald_lady.pal => rs_lady.pal} (100%) rename graphics/trainers/palettes/{emerald_lass.pal => rs_lass.pal} (100%) rename graphics/trainers/palettes/{emerald_picnicker.pal => rs_picnicker.pal} (100%) rename graphics/trainers/palettes/{emerald_pokemaniac.pal => rs_pokemaniac.pal} (100%) rename graphics/trainers/palettes/{emerald_pokemon_breeder_f.pal => rs_pokemon_breeder_f.pal} (100%) rename graphics/trainers/palettes/{emerald_pokemon_ranger_f.pal => rs_pokemon_ranger_f.pal} (100%) rename graphics/trainers/palettes/{emerald_pokemon_ranger_m.pal => rs_pokemon_ranger_m.pal} (100%) rename graphics/trainers/palettes/{emerald_psychic_f.pal => rs_psychic_f.pal} (100%) rename graphics/trainers/palettes/{emerald_psychic_m.pal => rs_psychic_m.pal} (100%) rename graphics/trainers/palettes/{emerald_ruin_maniac.pal => rs_ruin_maniac.pal} (100%) rename graphics/trainers/palettes/{emerald_sailor.pal => rs_sailor.pal} (100%) rename graphics/trainers/palettes/{emerald_sis_and_bro.pal => rs_sis_and_bro.pal} (100%) rename graphics/trainers/palettes/{emerald_swimmer_f.pal => rs_swimmer_f.pal} (100%) rename graphics/trainers/palettes/{emerald_swimmer_m.pal => rs_swimmer_m.pal} (100%) rename graphics/trainers/palettes/{emerald_tuber_f.pal => rs_tuber_f.pal} (100%) rename graphics/trainers/palettes/{emerald_twins.pal => rs_twins.pal} (100%) rename graphics/trainers/palettes/{emerald_young_couple.pal => rs_young_couple.pal} (100%) rename graphics/trainers/palettes/{emerald_youngster.pal => rs_youngster.pal} (100%) delete mode 100644 graphics/trainers/palettes/salon_maiden_anabel.pal rename graphics/trainers/palettes/{tuber.pal => tuber_f.pal} (100%) rename graphics/trainers/palettes/{emerald_tuber_m.pal => tuber_m.pal} (100%) diff --git a/data/graphics.s b/data/graphics.s index db441a1f6..3df819968 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -12212,1187 +12212,1187 @@ gMonIcon_UnownQuestionMark:: @ 8E48958 .incbin "graphics/pokemon/unown/question_mark/icon.4bpp" .align 2 -gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58 +gTrainerFrontPic_AquaLeaderArchie:: @ 8E48D58 .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aqua_leader_archie:: @ 8E49094 +gTrainerPalette_AquaLeaderArchie:: @ 8E49094 .incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_aqua_grunt_m_front_pic:: @ 8E490BC +gTrainerFrontPic_AquaGruntM:: @ 8E490BC .incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aqua_grunt_m:: @ 8E4941C +gTrainerPalette_AquaGruntM:: @ 8E4941C .incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_aqua_grunt_f_front_pic:: @ 8E49444 +gTrainerFrontPic_AquaGruntF:: @ 8E49444 .incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aqua_grunt_f:: @ 8E49780 +gTrainerPalette_AquaGruntF:: @ 8E49780 .incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_aroma_lady_front_pic:: @ 8E497A8 - .incbin "graphics/trainers/front_pics/emerald_aroma_lady_front_pic.4bpp.lz" +gTrainerFrontPic_RSAromaLady:: @ 8E497A8 + .incbin "graphics/trainers/front_pics/rs_aroma_lady_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_aroma_lady:: @ 8E49A6C - .incbin "graphics/trainers/palettes/emerald_aroma_lady.gbapal.lz" +gTrainerPalette_RSAromaLady:: @ 8E49A6C + .incbin "graphics/trainers/palettes/rs_aroma_lady.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_ruin_maniac_front_pic:: @ 8E49A94 - .incbin "graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.4bpp.lz" +gTrainerFrontPic_RSRuinManiac:: @ 8E49A94 + .incbin "graphics/trainers/front_pics/rs_ruin_maniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_ruin_maniac:: @ 8E49E30 - .incbin "graphics/trainers/palettes/emerald_ruin_maniac.gbapal.lz" +gTrainerPalette_RSRuinManiac:: @ 8E49E30 + .incbin "graphics/trainers/palettes/rs_ruin_maniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_interviewer_front_pic:: @ 8E49E58 +gTrainerFrontPic_Interviewer:: @ 8E49E58 .incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_interviewer:: @ 8E4A2FC +gTrainerPalette_Interviewer:: @ 8E4A2FC .incbin "graphics/trainers/palettes/interviewer.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_tuber_f_front_pic:: @ 8E4A324 - .incbin "graphics/trainers/front_pics/emerald_tuber_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSTuberF:: @ 8E4A324 + .incbin "graphics/trainers/front_pics/rs_tuber_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_tuber_f:: @ 8E4A5C8 - .incbin "graphics/trainers/palettes/emerald_tuber_f.gbapal.lz" +gTrainerPalette_RSTuberF:: @ 8E4A5C8 + .incbin "graphics/trainers/palettes/rs_tuber_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_tuber_m_front_pic:: @ 8E4A5F0 - .incbin "graphics/trainers/front_pics/emerald_tuber_m_front_pic.4bpp.lz" +gTrainerFrontPic_TuberM:: @ 8E4A5F0 + .incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_tuber_m:: @ 8E4A87C - .incbin "graphics/trainers/palettes/emerald_tuber_m.gbapal.lz" +gTrainerPalette_TuberM:: @ 8E4A87C + .incbin "graphics/trainers/palettes/tuber_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_cool_trainer_m_front_pic:: @ 8E4A8A4 - .incbin "graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.4bpp.lz" +gTrainerFrontPic_RSCooltrainerM:: @ 8E4A8A4 + .incbin "graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_cool_trainer_m:: @ 8E4AB8C - .incbin "graphics/trainers/palettes/emerald_cool_trainer_m.gbapal.lz" +gTrainerPalette_RSCooltrainerM:: @ 8E4AB8C + .incbin "graphics/trainers/palettes/rs_cool_trainer_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_cool_trainer_f_front_pic:: @ 8E4ABB4 - .incbin "graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSCooltrainerF:: @ 8E4ABB4 + .incbin "graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_cool_trainer_f:: @ 8E4AEC8 - .incbin "graphics/trainers/palettes/emerald_cool_trainer_f.gbapal.lz" +gTrainerPalette_RSCooltrainerF:: @ 8E4AEC8 + .incbin "graphics/trainers/palettes/rs_cool_trainer_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_hex_maniac_front_pic:: @ 8E4AEF0 +gTrainerFrontPic_HexManiac:: @ 8E4AEF0 .incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_hex_maniac:: @ 8E4B25C +gTrainerPalette_HexManiac:: @ 8E4B25C .incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_lady_front_pic:: @ 8E4B284 - .incbin "graphics/trainers/front_pics/emerald_lady_front_pic.4bpp.lz" +gTrainerFrontPic_RSLady:: @ 8E4B284 + .incbin "graphics/trainers/front_pics/rs_lady_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_lady:: @ 8E4B638 - .incbin "graphics/trainers/palettes/emerald_lady.gbapal.lz" +gTrainerPalette_RSLady:: @ 8E4B638 + .incbin "graphics/trainers/palettes/rs_lady.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_beauty_front_pic:: @ 8E4B660 - .incbin "graphics/trainers/front_pics/emerald_beauty_front_pic.4bpp.lz" +gTrainerFrontPic_RSBeauty:: @ 8E4B660 + .incbin "graphics/trainers/front_pics/rs_beauty_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_beauty:: @ 8E4B948 - .incbin "graphics/trainers/palettes/emerald_beauty.gbapal.lz" +gTrainerPalette_RSBeauty:: @ 8E4B948 + .incbin "graphics/trainers/palettes/rs_beauty.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_rich_boy_front_pic:: @ 8E4B970 +gTrainerFrontPic_RichBoy:: @ 8E4B970 .incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_rich_boy:: @ 8E4BC24 +gTrainerPalette_RichBoy:: @ 8E4BC24 .incbin "graphics/trainers/palettes/rich_boy.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_pokemaniac_front_pic:: @ 8E4BC4C - .incbin "graphics/trainers/front_pics/emerald_pokemaniac_front_pic.4bpp.lz" +gTrainerFrontPic_RSPokeManiac:: @ 8E4BC4C + .incbin "graphics/trainers/front_pics/rs_pokemaniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_pokemaniac:: @ 8E4BFBC - .incbin "graphics/trainers/palettes/emerald_pokemaniac.gbapal.lz" +gTrainerPalette_RSPokeManiac:: @ 8E4BFBC + .incbin "graphics/trainers/palettes/rs_pokemaniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_swimmer_m_front_pic:: @ 8E4BFE4 - .incbin "graphics/trainers/front_pics/emerald_swimmer_m_front_pic.4bpp.lz" +gTrainerFrontPic_RSSwimmerM:: @ 8E4BFE4 + .incbin "graphics/trainers/front_pics/rs_swimmer_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_swimmer_m:: @ 8E4C2A4 - .incbin "graphics/trainers/palettes/emerald_swimmer_m.gbapal.lz" +gTrainerPalette_RSSwimmerM:: @ 8E4C2A4 + .incbin "graphics/trainers/palettes/rs_swimmer_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC - .incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz" +gTrainerFrontPic_RSBlackBelt:: @ 8E4C2CC + .incbin "graphics/trainers/front_pics/rs_black_belt_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_black_belt:: @ 8E4C630 - .incbin "graphics/trainers/palettes/emerald_black_belt.gbapal.lz" +gTrainerPalette_RSBlackBelt:: @ 8E4C630 + .incbin "graphics/trainers/palettes/rs_black_belt.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658 +gTrainerFrontPic_Guitarist:: @ 8E4C658 .incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_guitarist:: @ 8E4C9DC +gTrainerPalette_Guitarist:: @ 8E4C9DC .incbin "graphics/trainers/palettes/guitarist.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_kindler_front_pic:: @ 8E4CA04 +gTrainerFrontPic_Kindler:: @ 8E4CA04 .incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_kindler:: @ 8E4CD70 +gTrainerPalette_Kindler:: @ 8E4CD70 .incbin "graphics/trainers/palettes/kindler.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_camper_front_pic:: @ 8E4CD98 - .incbin "graphics/trainers/front_pics/emerald_camper_front_pic.4bpp.lz" +gTrainerFrontPic_RSCamper:: @ 8E4CD98 + .incbin "graphics/trainers/front_pics/rs_camper_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_camper:: @ 8E4D080 - .incbin "graphics/trainers/palettes/emerald_camper.gbapal.lz" +gTrainerPalette_RSCamper:: @ 8E4D080 + .incbin "graphics/trainers/palettes/rs_camper.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_bug_maniac_front_pic:: @ 8E4D0A8 +gTrainerFrontPic_BugManiac:: @ 8E4D0A8 .incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_bug_maniac:: @ 8E4D4F8 +gTrainerPalette_BugManiac:: @ 8E4D4F8 .incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_psychic_m_front_pic:: @ 8E4D520 - .incbin "graphics/trainers/front_pics/emerald_psychic_m_front_pic.4bpp.lz" +gTrainerFrontPic_RSPsychicM:: @ 8E4D520 + .incbin "graphics/trainers/front_pics/rs_psychic_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_psychic_m:: @ 8E4D84C - .incbin "graphics/trainers/palettes/emerald_psychic_m.gbapal.lz" +gTrainerPalette_RSPsychicM:: @ 8E4D84C + .incbin "graphics/trainers/palettes/rs_psychic_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_psychic_f_front_pic:: @ 8E4D874 - .incbin "graphics/trainers/front_pics/emerald_psychic_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSPsychicF:: @ 8E4D874 + .incbin "graphics/trainers/front_pics/rs_psychic_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_psychic_f:: @ 8E4DB9C - .incbin "graphics/trainers/palettes/emerald_psychic_f.gbapal.lz" +gTrainerPalette_RSPsychicF:: @ 8E4DB9C + .incbin "graphics/trainers/palettes/rs_psychic_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_gentleman_front_pic:: @ 8E4DBC4 - .incbin "graphics/trainers/front_pics/emerald_gentleman_front_pic.4bpp.lz" +gTrainerFrontPic_RSGentleman:: @ 8E4DBC4 + .incbin "graphics/trainers/front_pics/rs_gentleman_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_gentleman:: @ 8E4DEC4 - .incbin "graphics/trainers/palettes/emerald_gentleman.gbapal.lz" +gTrainerPalette_RSGentleman:: @ 8E4DEC4 + .incbin "graphics/trainers/palettes/rs_gentleman.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_sidney_front_pic:: @ 8E4DEEC +gTrainerFrontPic_EliteFourSidney:: @ 8E4DEEC .incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_sidney:: @ 8E4E220 +gTrainerPalette_EliteFourSidney:: @ 8E4E220 .incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_phoebe_front_pic:: @ 8E4E248 +gTrainerFrontPic_EliteFourPhoebe:: @ 8E4E248 .incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_phoebe:: @ 8E4E548 +gTrainerPalette_EliteFourPhoebe:: @ 8E4E548 .incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_roxanne_front_pic:: @ 8E4E570 +gTrainerFrontPic_LeaderRoxanne:: @ 8E4E570 .incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_roxanne:: @ 8E4E85C +gTrainerPalette_LeaderRoxanne:: @ 8E4E85C .incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_brawly_front_pic:: @ 8E4E884 +gTrainerFrontPic_LeaderBrawly:: @ 8E4E884 .incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_brawly:: @ 8E4EC18 +gTrainerPalette_LeaderBrawly:: @ 8E4EC18 .incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_tate_and_liza_front_pic:: @ 8E4EC40 +gTrainerFrontPic_LeaderTateAndLiza:: @ 8E4EC40 .incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_tate_and_liza:: @ 8E4F084 +gTrainerPalette_LeaderTateAndLiza:: @ 8E4F084 .incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_school_kid_m_front_pic:: @ 8E4F0AC +gTrainerFrontPic_SchoolKidM:: @ 8E4F0AC .incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_school_kid_m:: @ 8E4F36C +gTrainerPalette_SchoolKidM:: @ 8E4F36C .incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_school_kid_f_front_pic:: @ 8E4F394 +gTrainerFrontPic_SchoolKidF:: @ 8E4F394 .incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_school_kid_f:: @ 8E4F630 +gTrainerPalette_SchoolKidF:: @ 8E4F630 .incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_sr_and_jr_front_pic:: @ 8E4F658 +gTrainerFrontPic_SrAndJr:: @ 8E4F658 .incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_sr_and_jr:: @ 8E4FAC8 +gTrainerPalette_SrAndJr:: @ 8E4FAC8 .incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_winstrate_m_front_pic:: @ 8E4FAF0 - .incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz" +gTrainerFrontPic_PokefanM:: @ 8E4FAF0 + .incbin "graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_winstrate_m:: @ 8E4FEAC - .incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz" +gTrainerPalette_PokefanM:: @ 8E4FEAC + .incbin "graphics/trainers/palettes/pokefan_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_winstrate_f_front_pic:: @ 8E4FED4 - .incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz" +gTrainerFrontPic_PokefanF:: @ 8E4FED4 + .incbin "graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_winstrate_f:: @ 8E502A0 - .incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz" +gTrainerPalette_PokefanF:: @ 8E502A0 + .incbin "graphics/trainers/palettes/pokefan_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_expert_m_front_pic:: @ 8E502C8 +gTrainerFrontPic_ExpertM:: @ 8E502C8 .incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_expert_m:: @ 8E50608 +gTrainerPalette_ExpertM:: @ 8E50608 .incbin "graphics/trainers/palettes/expert_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_expert_f_front_pic:: @ 8E50630 +gTrainerFrontPic_ExpertF:: @ 8E50630 .incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_expert_f:: @ 8E5094C +gTrainerPalette_ExpertF:: @ 8E5094C .incbin "graphics/trainers/palettes/expert_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_youngster_front_pic:: @ 8E50974 - .incbin "graphics/trainers/front_pics/emerald_youngster_front_pic.4bpp.lz" +gTrainerFrontPic_RSYoungster:: @ 8E50974 + .incbin "graphics/trainers/front_pics/rs_youngster_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_youngster:: @ 8E50C1C - .incbin "graphics/trainers/palettes/emerald_youngster.gbapal.lz" +gTrainerPalette_RSYoungster:: @ 8E50C1C + .incbin "graphics/trainers/palettes/rs_youngster.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_steven_front_pic:: @ 8E50C44 - .incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz" +gTrainerFrontPic_ChampionSteven:: @ 8E50C44 + .incbin "graphics/trainers/front_pics/champion_steven_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_steven:: @ 8E50F7C - .incbin "graphics/trainers/palettes/steven.gbapal.lz" +gTrainerPalette_ChampionSteven:: @ 8E50F7C + .incbin "graphics/trainers/palettes/champion_steven.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_fisherman_front_pic:: @ 8E50FA4 - .incbin "graphics/trainers/front_pics/emerald_fisherman_front_pic.4bpp.lz" +gTrainerFrontPic_RSFisherman:: @ 8E50FA4 + .incbin "graphics/trainers/front_pics/rs_fisherman_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_fisherman:: @ 8E51388 - .incbin "graphics/trainers/palettes/emerald_fisherman.gbapal.lz" +gTrainerPalette_RSFisherman:: @ 8E51388 + .incbin "graphics/trainers/palettes/rs_fisherman.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_cycling_triathlete_m_front_pic:: @ 8E513B0 +gTrainerFrontPic_CyclingTriathleteM:: @ 8E513B0 .incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_cycling_triathlete_m:: @ 8E517C0 +gTrainerPalette_CyclingTriathleteM:: @ 8E517C0 .incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_cycling_triathlete_f_front_pic:: @ 8E517E8 +gTrainerFrontPic_CyclingTriathleteF:: @ 8E517E8 .incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_cycling_triathlete_f:: @ 8E51BF4 +gTrainerPalette_CyclingTriathleteF:: @ 8E51BF4 .incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_running_triathlete_m_front_pic:: @ 8E51C1C +gTrainerFrontPic_RunningTriathleteM:: @ 8E51C1C .incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_running_triathlete_m:: @ 8E51ED4 +gTrainerPalette_RunningTriathleteM:: @ 8E51ED4 .incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_running_triathlete_f_front_pic:: @ 8E51EFC +gTrainerFrontPic_RunningTriathleteF:: @ 8E51EFC .incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_running_triathlete_f:: @ 8E521A0 +gTrainerPalette_RunningTriathleteF:: @ 8E521A0 .incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_swimming_triathlete_m_front_pic:: @ 8E521C8 +gTrainerFrontPic_SwimmingTriathleteM:: @ 8E521C8 .incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_swimming_triathlete_m:: @ 8E524F4 +gTrainerPalette_SwimmingTriathleteM:: @ 8E524F4 .incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_swimming_triathlete_f_front_pic:: @ 8E5251C +gTrainerFrontPic_SwimmingTriathleteF:: @ 8E5251C .incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_swimming_triathlete_f:: @ 8E527F8 +gTrainerPalette_SwimmingTriathleteF:: @ 8E527F8 .incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_dragon_tamer_front_pic:: @ 8E52820 +gTrainerFrontPic_DragonTamer:: @ 8E52820 .incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_dragon_tamer:: @ 8E52B74 +gTrainerPalette_DragonTamer:: @ 8E52B74 .incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_bird_keeper_front_pic:: @ 8E52B9C - .incbin "graphics/trainers/front_pics/emerald_bird_keeper_front_pic.4bpp.lz" +gTrainerFrontPic_RSBirdKeeper:: @ 8E52B9C + .incbin "graphics/trainers/front_pics/rs_bird_keeper_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_bird_keeper:: @ 8E52ED4 - .incbin "graphics/trainers/palettes/emerald_bird_keeper.gbapal.lz" +gTrainerPalette_RSBirdKeeper:: @ 8E52ED4 + .incbin "graphics/trainers/palettes/rs_bird_keeper.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ninja_boy_front_pic:: @ 8E52EFC +gTrainerFrontPic_NinjaBoy:: @ 8E52EFC .incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ninja_boy:: @ 8E531D8 +gTrainerPalette_NinjaBoy:: @ 8E531D8 .incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_battle_girl_front_pic:: @ 8E53200 +gTrainerFrontPic_BattleGirl:: @ 8E53200 .incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_battle_girl:: @ 8E53520 +gTrainerPalette_BattleGirl:: @ 8E53520 .incbin "graphics/trainers/palettes/battle_girl.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_parasol_lady_front_pic:: @ 8E53548 +gTrainerFrontPic_ParasolLady:: @ 8E53548 .incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_parasol_lady:: @ 8E53880 +gTrainerPalette_ParasolLady:: @ 8E53880 .incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_swimmer_f_front_pic:: @ 8E538A8 - .incbin "graphics/trainers/front_pics/emerald_swimmer_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSSwimmerF:: @ 8E538A8 + .incbin "graphics/trainers/front_pics/rs_swimmer_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_swimmer_f:: @ 8E53B78 - .incbin "graphics/trainers/palettes/emerald_swimmer_f.gbapal.lz" +gTrainerPalette_RSSwimmerF:: @ 8E53B78 + .incbin "graphics/trainers/palettes/rs_swimmer_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_picnicker_front_pic:: @ 8E53BA0 - .incbin "graphics/trainers/front_pics/emerald_picnicker_front_pic.4bpp.lz" +gTrainerFrontPic_RSPicnicker:: @ 8E53BA0 + .incbin "graphics/trainers/front_pics/rs_picnicker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_picnicker:: @ 8E53E80 - .incbin "graphics/trainers/palettes/emerald_picnicker.gbapal.lz" +gTrainerPalette_RSPicnicker:: @ 8E53E80 + .incbin "graphics/trainers/palettes/rs_picnicker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_twins_front_pic:: @ 8E53EA8 - .incbin "graphics/trainers/front_pics/emerald_twins_front_pic.4bpp.lz" +gTrainerFrontPic_RSTwins:: @ 8E53EA8 + .incbin "graphics/trainers/front_pics/rs_twins_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_twins:: @ 8E5426C - .incbin "graphics/trainers/palettes/emerald_twins.gbapal.lz" +gTrainerPalette_RSTwins:: @ 8E5426C + .incbin "graphics/trainers/palettes/rs_twins.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_sailor_front_pic:: @ 8E54294 - .incbin "graphics/trainers/front_pics/emerald_sailor_front_pic.4bpp.lz" +gTrainerFrontPic_RSSailor:: @ 8E54294 + .incbin "graphics/trainers/front_pics/rs_sailor_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_sailor:: @ 8E54644 - .incbin "graphics/trainers/palettes/emerald_sailor.gbapal.lz" +gTrainerPalette_RSSailor:: @ 8E54644 + .incbin "graphics/trainers/palettes/rs_sailor.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_collector_front_pic:: @ 8E5466C +gTrainerFrontPic_Collector:: @ 8E5466C .incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_collector:: @ 8E54A70 +gTrainerPalette_Collector:: @ 8E54A70 .incbin "graphics/trainers/palettes/collector.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_wally_front_pic:: @ 8E54A98 +gTrainerFrontPic_Wally:: @ 8E54A98 .incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_wally:: @ 8E54D68 +gTrainerPalette_Wally:: @ 8E54D68 .incbin "graphics/trainers/palettes/wally.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic:: @ 8E54D90 +gTrainerFrontPic_RSBrendan1:: @ 8E54D90 .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruby_sapphire_brendan:: @ 8E550A4 +gTrainerPalette_RSBrendan1:: @ 8E550A4 .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic:: @ 8E550CC +gTrainerFrontPic_RSMay1:: @ 8E550CC .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruby_sapphire_may:: @ 8E553CC +gTrainerPalette_RSMay1:: @ 8E553Cc .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_m_front_pic:: @ 8E553F4 - .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.4bpp.lz" +gTrainerFrontPic_PokemonBreederM:: @ 8E553F4 + .incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_pokemon_breeder_m:: @ 8E55724 - .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_m.gbapal.lz" +gTrainerPalette_PokemonBreederM:: @ 8E55724 + .incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_f_front_pic:: @ 8E5574C - .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSPokemonBreederF:: @ 8E5574C + .incbin "graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_pokemon_breeder_f:: @ 8E55A80 - .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_f.gbapal.lz" +gTrainerPalette_RSPokemonBreederF:: @ 8E55A80 + .incbin "graphics/trainers/palettes/rs_pokemon_breeder_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_m_front_pic:: @ 8E55AA8 - .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.4bpp.lz" +gTrainerFrontPic_RSPokemonRangerM:: @ 8E55AA8 + .incbin "graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_pokemon_ranger_m:: @ 8E55DF0 - .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_m.gbapal.lz" +gTrainerPalette_RSPokemonRangerM:: @ 8E55Df0 + .incbin "graphics/trainers/palettes/rs_pokemon_ranger_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_f_front_pic:: @ 8E55E18 - .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.4bpp.lz" +gTrainerFrontPic_RSPokemonRangerF:: @ 8E55E18 + .incbin "graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_pokemon_ranger_f:: @ 8E5614C - .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_f.gbapal.lz" +gTrainerPalette_RSPokemonRangerF:: @ 8E5614C + .incbin "graphics/trainers/palettes/rs_pokemon_ranger_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_magma_leader_maxie_front_pic:: @ 8E56174 +gTrainerFrontPic_MagmaLeaderMaxie:: @ 8E56174 .incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_magma_leader_maxie:: @ 8E56468 +gTrainerPalette_MagmaLeaderMaxie:: @ 8E56468 .incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_magma_grunt_m_front_pic:: @ 8E56490 +gTrainerFrontPic_MagmaGruntM:: @ 8E56490 .incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_magma_grunt_m:: @ 8E56810 +gTrainerPalette_MagmaGruntM:: @ 8E56810 .incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_magma_grunt_f_front_pic:: @ 8E56838 +gTrainerFrontPic_MagmaGruntF:: @ 8E56838 .incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_magma_grunt_f:: @ 8E56BC4 +gTrainerPalette_MagmaGruntF:: @ 8E56Bc4 .incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_lass_front_pic:: @ 8E56BEC - .incbin "graphics/trainers/front_pics/emerald_lass_front_pic.4bpp.lz" +gTrainerFrontPic_RSLass:: @ 8E56BEC + .incbin "graphics/trainers/front_pics/rs_lass_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_lass:: @ 8E56EC4 - .incbin "graphics/trainers/palettes/emerald_lass.gbapal.lz" +gTrainerPalette_RSLass:: @ 8E56Ec4 + .incbin "graphics/trainers/palettes/rs_lass.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_bug_catcher_front_pic:: @ 8E56EEC - .incbin "graphics/trainers/front_pics/emerald_bug_catcher_front_pic.4bpp.lz" +gTrainerFrontPic_RSBugCatcher:: @ 8E56EEC + .incbin "graphics/trainers/front_pics/rs_bug_catcher_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_bug_catcher:: @ 8E57218 - .incbin "graphics/trainers/palettes/emerald_bug_catcher.gbapal.lz" +gTrainerPalette_RSBugCatcher:: @ 8E57218 + .incbin "graphics/trainers/palettes/rs_bug_catcher.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_hiker_front_pic:: @ 8E57240 - .incbin "graphics/trainers/front_pics/emerald_hiker_front_pic.4bpp.lz" +gTrainerFrontPic_RSHiker:: @ 8E57240 + .incbin "graphics/trainers/front_pics/rs_hiker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_hiker:: @ 8E576C0 - .incbin "graphics/trainers/palettes/emerald_hiker.gbapal.lz" +gTrainerPalette_RSHiker:: @ 8E576C0 + .incbin "graphics/trainers/palettes/rs_hiker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_young_couple_front_pic:: @ 8E576E8 - .incbin "graphics/trainers/front_pics/emerald_young_couple_front_pic.4bpp.lz" +gTrainerFrontPic_RSYoungCouple:: @ 8E576E8 + .incbin "graphics/trainers/front_pics/rs_young_couple_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_young_couple:: @ 8E57AA8 - .incbin "graphics/trainers/palettes/emerald_young_couple.gbapal.lz" +gTrainerPalette_RSYoungCouple:: @ 8E57Aa8 + .incbin "graphics/trainers/palettes/rs_young_couple.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_old_couple_front_pic:: @ 8E57AD0 +gTrainerFrontPic_OldCouple:: @ 8E57AD0 .incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_old_couple:: @ 8E57FE0 +gTrainerPalette_OldCouple:: @ 8E57Fe0 .incbin "graphics/trainers/palettes/old_couple.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_emerald_sis_and_bro_front_pic:: @ 8E58008 - .incbin "graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.4bpp.lz" +gTrainerFrontPic_RSSisAndBro:: @ 8E58008 + .incbin "graphics/trainers/front_pics/rs_sis_and_bro_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_emerald_sis_and_bro:: @ 8E58454 - .incbin "graphics/trainers/palettes/emerald_sis_and_bro.gbapal.lz" +gTrainerPalette_RSSisAndBro:: @ 8E58454 + .incbin "graphics/trainers/palettes/rs_sis_and_bro.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_aqua_admin_m_front_pic:: @ 8E5847C +gTrainerFrontPic_AquaAdminM:: @ 8E5847C .incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aqua_admin_m:: @ 8E58830 +gTrainerPalette_AquaAdminM:: @ 8E58830 .incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_aqua_admin_f_front_pic:: @ 8E58858 +gTrainerFrontPic_AquaAdminF:: @ 8E58858 .incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aqua_admin_f:: @ 8E58C1C +gTrainerPalette_AquaAdminF:: @ 8E58C1C .incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_magma_admin_front_pic:: @ 8E58C44 - .incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz" +gTrainerFrontPic_MagmaAdminM:: @ 8E58C44 + .incbin "graphics/trainers/front_pics/magma_admin_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_magma_admin:: @ 8E5901C - .incbin "graphics/trainers/palettes/magma_admin.gbapal.lz" +gTrainerPalette_MagmaAdminM:: @ 8E5901C + .incbin "graphics/trainers/palettes/magma_admin_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_magma_admin_f_front_pic:: @ 8E59044 - .incbin "graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.4bpp.lz" +gTrainerFrontPic_MagmaAdminF:: @ 8E59044 + .incbin "graphics/trainers/front_pics/magma_admin_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruby_magma_admin_f:: @ 8E593F4 - .incbin "graphics/trainers/palettes/ruby_magma_admin_f.gbapal.lz" +gTrainerPalette_MagmaAdminF:: @ 8E593F4 + .incbin "graphics/trainers/palettes/magma_admin_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_wattson_front_pic:: @ 8E5941C +gTrainerFrontPic_LeaderWattson:: @ 8E5941C .incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_wattson:: @ 8E59764 +gTrainerPalette_LeaderWattson:: @ 8E59764 .incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_flannery_front_pic:: @ 8E5978C +gTrainerFrontPic_LeaderFlannery:: @ 8E5978C .incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_flannery:: @ 8E59B0C +gTrainerPalette_LeaderFlannery:: @ 8E59B0C .incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_norman_front_pic:: @ 8E59B34 +gTrainerFrontPic_LeaderNorman:: @ 8E59B34 .incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_norman:: @ 8E59E70 +gTrainerPalette_LeaderNorman:: @ 8E59E70 .incbin "graphics/trainers/palettes/leader_norman.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_winona_front_pic:: @ 8E59E98 +gTrainerFrontPic_LeaderWinona:: @ 8E59E98 .incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_winona:: @ 8E5A218 +gTrainerPalette_LeaderWinona:: @ 8E5A218 .incbin "graphics/trainers/palettes/leader_winona.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_sapphire_champion_wallace_front_pic:: @ 8E5A240 - .incbin "graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.4bpp.lz" +gTrainerFrontPic_LeaderWallace:: @ 8E5A240 + .incbin "graphics/trainers/front_pics/leader_wallace_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_champion_wallace:: @ 8E5A5B8 - .incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz" +gTrainerPalette_LeaderWallace:: @ 8E5A5B8 + .incbin "graphics/trainers/palettes/leader_wallace.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_glacia_front_pic:: @ 8E5A5E0 +gTrainerFrontPic_EliteFourGlacia:: @ 8E5A5E0 .incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_glacia:: @ 8E5A964 +gTrainerPalette_EliteFourGlacia:: @ 8E5A964 .incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_drake_front_pic:: @ 8E5A98C +gTrainerFrontPic_EliteFourDrake:: @ 8E5A98C .incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_drake:: @ 8E5AD34 +gTrainerPalette_EliteFourDrake:: @ 8E5Ad34 .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_youngster_front_pic:: @ 8E5AD5C +gTrainerFrontPic_Youngster:: @ 8E5AD5C .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_youngster:: @ 8E5AFFC +gTrainerPalette_Youngster:: @ 8E5Affc .incbin "graphics/trainers/palettes/youngster.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_bug_catcher_front_pic:: @ 8E5B024 +gTrainerFrontPic_BugCatcher:: @ 8E5B024 .incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_bug_catcher:: @ 8E5B36C +gTrainerPalette_BugCatcher:: @ 8E5B36C .incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_lass_front_pic:: @ 8E5B394 +gTrainerFrontPic_Lass:: @ 8E5B394 .incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_lass:: @ 8E5B680 +gTrainerPalette_Lass:: @ 8E5B680 .incbin "graphics/trainers/palettes/lass.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_sailor_front_pic:: @ 8E5B6A8 +gTrainerFrontPic_Sailor:: @ 8E5B6A8 .incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_sailor:: @ 8E5B9C8 +gTrainerPalette_Sailor:: @ 8E5B9C8 .incbin "graphics/trainers/palettes/sailor.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_camper_front_pic:: @ 8E5B9F0 +gTrainerFrontPic_Camper:: @ 8E5B9F0 .incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_camper:: @ 8E5BCD0 +gTrainerPalette_Camper:: @ 8E5Bcd0 .incbin "graphics/trainers/palettes/camper.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_picnicker_front_pic:: @ 8E5BCF8 +gTrainerFrontPic_Picnicker:: @ 8E5BCF8 .incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_picnicker:: @ 8E5BFE0 +gTrainerPalette_Picnicker:: @ 8E5Bfe0 .incbin "graphics/trainers/palettes/picnicker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_pokemaniac_front_pic:: @ 8E5C008 +gTrainerFrontPic_PokeManiac:: @ 8E5C008 .incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_pokemaniac:: @ 8E5C3C4 +gTrainerPalette_PokeManiac:: @ 8E5C3C4 .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_super_nerd_front_pic:: @ 8E5C3EC +gTrainerFrontPic_SuperNerd:: @ 8E5C3EC .incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_super_nerd:: @ 8E5C704 +gTrainerPalette_SuperNerd:: @ 8E5C704 .incbin "graphics/trainers/palettes/super_nerd.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_hiker_front_pic:: @ 8E5C72C +gTrainerFrontPic_Hiker:: @ 8E5C72C .incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_hiker:: @ 8E5CB9C +gTrainerPalette_Hiker:: @ 8E5Cb9C .incbin "graphics/trainers/palettes/hiker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_biker_front_pic:: @ 8E5CBC4 +gTrainerFrontPic_Biker:: @ 8E5CBC4 .incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_biker:: @ 8E5D12C +gTrainerPalette_Biker:: @ 8E5D12C .incbin "graphics/trainers/palettes/biker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_burglar_front_pic:: @ 8E5D154 +gTrainerFrontPic_Burglar:: @ 8E5D154 .incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_burglar:: @ 8E5D4A0 +gTrainerPalette_Burglar:: @ 8E5D4A0 .incbin "graphics/trainers/palettes/burglar.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_engineer_front_pic:: @ 8E5D4C8 +gTrainerFrontPic_Engineer:: @ 8E5D4C8 .incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_engineer:: @ 8E5D8D4 +gTrainerPalette_Engineer:: @ 8E5D8D4 .incbin "graphics/trainers/palettes/engineer.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_fisherman_front_pic:: @ 8E5D8FC +gTrainerFrontPic_Fisherman:: @ 8E5D8FC .incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_fisherman:: @ 8E5DCA8 +gTrainerPalette_Fisherman:: @ 8E5Dca8 .incbin "graphics/trainers/palettes/fisherman.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_swimmer_m_front_pic:: @ 8E5DCD0 +gTrainerFrontPic_SwimmerM:: @ 8E5DCD0 .incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_swimmer_m:: @ 8E5DFA8 +gTrainerPalette_SwimmerM:: @ 8E5Dfa8 .incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_roughneck_front_pic:: @ 8E5DFD0 - .incbin "graphics/trainers/front_pics/roughneck_front_pic.4bpp.lz" +gTrainerFrontPic_CueBall:: @ 8E5DFD0 + .incbin "graphics/trainers/front_pics/cue_ball_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_roughneck:: @ 8E5E598 - .incbin "graphics/trainers/palettes/roughneck.gbapal.lz" +gTrainerPalette_CueBall:: @ 8E5E598 + .incbin "graphics/trainers/palettes/cue_ball.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_gamer_front_pic:: @ 8E5E5C0 +gTrainerFrontPic_Gamer:: @ 8E5E5C0 .incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_gamer:: @ 8E5E954 +gTrainerPalette_Gamer:: @ 8E5E954 .incbin "graphics/trainers/palettes/gamer.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_beauty_front_pic:: @ 8E5E97C +gTrainerFrontPic_Beauty:: @ 8E5E97C .incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_beauty:: @ 8E5ECD8 +gTrainerPalette_Beauty:: @ 8E5Ecd8 .incbin "graphics/trainers/palettes/beauty.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_swimmer_f_front_pic:: @ 8E5ED00 +gTrainerFrontPic_SwimmerF:: @ 8E5ED00 .incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_swimmer_f:: @ 8E5EFEC +gTrainerPalette_SwimmerF:: @ 8E5Efec .incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_psychic_m_front_pic:: @ 8E5F014 +gTrainerFrontPic_PsychicM:: @ 8E5F014 .incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_psychic_m:: @ 8E5F374 +gTrainerPalette_PsychicM:: @ 8E5F374 .incbin "graphics/trainers/palettes/psychic_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_rocker_front_pic:: @ 8E5F39C +gTrainerFrontPic_Rocker:: @ 8E5F39C .incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_rocker:: @ 8E5F7F8 +gTrainerPalette_Rocker:: @ 8E5F7F8 .incbin "graphics/trainers/palettes/rocker.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_juggler_front_pic:: @ 8E5F820 +gTrainerFrontPic_Juggler:: @ 8E5F820 .incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_juggler:: @ 8E5FC5C +gTrainerPalette_Juggler:: @ 8E5Fc5C .incbin "graphics/trainers/palettes/juggler.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_tamer_front_pic:: @ 8E5FC84 +gTrainerFrontPic_Tamer:: @ 8E5FC84 .incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_tamer:: @ 8E60038 +gTrainerPalette_Tamer:: @ 8E60038 .incbin "graphics/trainers/palettes/tamer.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_bird_keeper_front_pic:: @ 8E60060 +gTrainerFrontPic_BirdKeeper:: @ 8E60060 .incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_bird_keeper:: @ 8E60424 +gTrainerPalette_BirdKeeper:: @ 8E60424 .incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C +gTrainerFrontPic_BlackBelt:: @ 8E6044C .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_black_belt:: @ 8E6086C +gTrainerPalette_BlackBelt:: @ 8E6086C .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_blue_1_front_pic:: @ 8E60894 - .incbin "graphics/trainers/front_pics/blue_1_front_pic.4bpp.lz" +gTrainerFrontPic_Rival1:: @ 8E60894 + .incbin "graphics/trainers/front_pics/rival_1_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_blue_1:: @ 8E60B4C - .incbin "graphics/trainers/palettes/blue_1.gbapal.lz" +gTrainerPalette_Rival1:: @ 8E60B4C + .incbin "graphics/trainers/palettes/rival_1.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_scientist_front_pic:: @ 8E60B74 +gTrainerFrontPic_Scientist:: @ 8E60B74 .incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_scientist:: @ 8E60F50 +gTrainerPalette_Scientist:: @ 8E60F50 .incbin "graphics/trainers/palettes/scientist.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_giovanni_front_pic:: @ 8E60F78 - .incbin "graphics/trainers/front_pics/giovanni_front_pic.4bpp.lz" +gTrainerFrontPic_LeaderGiovanni:: @ 8E60F78 + .incbin "graphics/trainers/front_pics/leader_giovanni_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_giovanni:: @ 8E61288 - .incbin "graphics/trainers/palettes/giovanni.gbapal.lz" +gTrainerPalette_LeaderGiovanni:: @ 8E61288 + .incbin "graphics/trainers/palettes/leader_giovanni.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_rocket_grunt_m_front_pic:: @ 8E612B0 +gTrainerFrontPic_RocketGruntM:: @ 8E612B0 .incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_rocket_grunt_m:: @ 8E615E4 +gTrainerPalette_RocketGruntM:: @ 8E615E4 .incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_cool_trainer_m_front_pic:: @ 8E6160C +gTrainerFrontPic_CooltrainerM:: @ 8E6160C .incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_cool_trainer_m:: @ 8E618DC +gTrainerPalette_CooltrainerM:: @ 8E618Dc .incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_cool_trainer_f_front_pic:: @ 8E61904 +gTrainerFrontPic_CooltrainerF:: @ 8E61904 .incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_cool_trainer_f:: @ 8E61C1C +gTrainerPalette_CooltrainerF:: @ 8E61C1C .incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_lorelei_front_pic:: @ 8E61C44 +gTrainerFrontPic_EliteFourLorelei:: @ 8E61C44 .incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_lorelei:: @ 8E61F70 +gTrainerPalette_EliteFourLorelei:: @ 8E61F70 .incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_bruno_front_pic:: @ 8E61F98 +gTrainerFrontPic_EliteFourBruno:: @ 8E61F98 .incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_bruno:: @ 8E623E4 +gTrainerPalette_EliteFourBruno:: @ 8E623E4 .incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_agatha_front_pic:: @ 8E6240C +gTrainerFrontPic_EliteFourAgatha:: @ 8E6240C .incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_agatha:: @ 8E62728 +gTrainerPalette_EliteFourAgatha:: @ 8E62728 .incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_elite_four_lance_front_pic:: @ 8E62750 +gTrainerFrontPic_EliteFourLance:: @ 8E62750 .incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_elite_four_lance:: @ 8E62B18 +gTrainerPalette_EliteFourLance:: @ 8E62B18 .incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_brock_front_pic:: @ 8E62B40 +gTrainerFrontPic_LeaderBrock:: @ 8E62B40 .incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_brock:: @ 8E62E8C +gTrainerPalette_LeaderBrock:: @ 8E62E8C .incbin "graphics/trainers/palettes/leader_brock.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_misty_front_pic:: @ 8E62EB4 +gTrainerFrontPic_LeaderMisty:: @ 8E62EB4 .incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_misty:: @ 8E631B4 +gTrainerPalette_LeaderMisty:: @ 8E631B4 .incbin "graphics/trainers/palettes/leader_misty.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_lt_surge_front_pic:: @ 8E631DC +gTrainerFrontPic_LeaderLtSurge:: @ 8E631DC .incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_lt_surge:: @ 8E6356C +gTrainerPalette_LeaderLtSurge:: @ 8E6356C .incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_erika_front_pic:: @ 8E63594 +gTrainerFrontPic_LeaderErika:: @ 8E63594 .incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_erika:: @ 8E63888 +gTrainerPalette_LeaderErika:: @ 8E63888 .incbin "graphics/trainers/palettes/leader_erika.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_koga_front_pic:: @ 8E638B0 +gTrainerFrontPic_LeaderKoga:: @ 8E638B0 .incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_koga:: @ 8E63C18 +gTrainerPalette_LeaderKoga:: @ 8E63C18 .incbin "graphics/trainers/palettes/leader_koga.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_blaine_front_pic:: @ 8E63C40 +gTrainerFrontPic_LeaderBlaine:: @ 8E63C40 .incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_blaine:: @ 8E6404C +gTrainerPalette_LeaderBlaine:: @ 8E6404C .incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leader_sabrina_front_pic:: @ 8E64074 +gTrainerFrontPic_LeaderSabrina:: @ 8E64074 .incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leader_sabrina:: @ 8E6437C +gTrainerPalette_LeaderSabrina:: @ 8E6437C .incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_gentleman_front_pic:: @ 8E643A4 +gTrainerFrontPic_Gentleman:: @ 8E643A4 .incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_gentleman:: @ 8E646DC +gTrainerPalette_Gentleman:: @ 8E646Dc .incbin "graphics/trainers/palettes/gentleman.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_blue_2_front_pic:: @ 8E64704 - .incbin "graphics/trainers/front_pics/blue_2_front_pic.4bpp.lz" +gTrainerFrontPic_Rival2:: @ 8E64704 + .incbin "graphics/trainers/front_pics/rival_2_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_blue_2:: @ 8E649F8 - .incbin "graphics/trainers/palettes/blue_2.gbapal.lz" +gTrainerPalette_Rival2:: @ 8E649F8 + .incbin "graphics/trainers/palettes/rival_2.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_champion_blue_front_pic:: @ 8E64A20 - .incbin "graphics/trainers/front_pics/champion_blue_front_pic.4bpp.lz" +gTrainerFrontPic_ChampionRival:: @ 8E64A20 + .incbin "graphics/trainers/front_pics/champion_rival_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_champion_blue:: @ 8E64D1C - .incbin "graphics/trainers/palettes/champion_blue.gbapal.lz" +gTrainerPalette_ChampionRival:: @ 8E64D1C + .incbin "graphics/trainers/palettes/champion_rival.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_channeler_front_pic:: @ 8E64D44 +gTrainerFrontPic_Channeler:: @ 8E64D44 .incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_channeler:: @ 8E6511C +gTrainerPalette_Channeler:: @ 8E6511C .incbin "graphics/trainers/palettes/channeler.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_twins_front_pic:: @ 8E65144 +gTrainerFrontPic_Twins:: @ 8E65144 .incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_twins:: @ 8E65494 +gTrainerPalette_Twins:: @ 8E65494 .incbin "graphics/trainers/palettes/twins.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_cool_couple_front_pic:: @ 8E654BC +gTrainerFrontPic_CoolCouple:: @ 8E654BC .incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_cool_couple:: @ 8E6599C +gTrainerPalette_CoolCouple:: @ 8E6599C .incbin "graphics/trainers/palettes/cool_couple.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_young_couple_front_pic:: @ 8E659C4 +gTrainerFrontPic_YoungCouple:: @ 8E659C4 .incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_young_couple:: @ 8E65E10 +gTrainerPalette_YoungCouple:: @ 8E65E10 .incbin "graphics/trainers/palettes/young_couple.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_crush_kin_front_pic:: @ 8E65E38 +gTrainerFrontPic_CrushKin:: @ 8E65E38 .incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_crush_kin:: @ 8E663D8 +gTrainerPalette_CrushKin:: @ 8E663D8 .incbin "graphics/trainers/palettes/crush_kin.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_sis_and_bro_front_pic:: @ 8E66400 +gTrainerFrontPic_SisAndBro:: @ 8E66400 .incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_sis_and_bro:: @ 8E66860 +gTrainerPalette_SisAndBro:: @ 8E66860 .incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_oak_front_pic:: @ 8E66888 +gTrainerFrontPic_ProfessorOak:: @ 8E66888 .incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_oak:: @ 8E66BF4 +gTrainerPalette_ProfessorOak:: @ 8E66Bf4 .incbin "graphics/trainers/palettes/oak.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic2:: @ 8E66C1C +gTrainerFrontPic_RSBrendan2:: @ 8E66C1C .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruby_sapphire_brendan2:: @ 8E66F30 +gTrainerPalette_RSBrendan2:: @ 8E66F30 .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic2:: @ 8E66F58 +gTrainerFrontPic_RSMay2:: @ 8E66F58 .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruby_sapphire_may2:: @ 8E67258 +gTrainerPalette_RSMay2:: @ 8E67258 .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_red_front_pic:: @ 8E67280 +gTrainerFrontPic_Red:: @ 8E67280 .incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_red:: @ 8E6758C +gTrainerPalette_Red:: @ 8E6758C .incbin "graphics/trainers/palettes/red.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_leaf_front_pic:: @ 8E675B4 +gTrainerFrontPic_Leaf:: @ 8E675B4 .incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_leaf:: @ 8E678F0 +gTrainerPalette_Leaf:: @ 8E678F0 .incbin "graphics/trainers/palettes/leaf.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_rocket_grunt_f_front_pic:: @ 8E67918 +gTrainerFrontPic_RocketGruntF:: @ 8E67918 .incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_rocket_grunt_f:: @ 8E67C30 +gTrainerPalette_RocketGruntF:: @ 8E67C30 .incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_psychic_f_front_pic:: @ 8E67C58 +gTrainerFrontPic_PsychicF:: @ 8E67C58 .incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_psychic_f:: @ 8E67FF8 +gTrainerPalette_PsychicF:: @ 8E67Ff8 .incbin "graphics/trainers/palettes/psychic_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_crush_girl_front_pic:: @ 8E68020 +gTrainerFrontPic_CrushGirl:: @ 8E68020 .incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_crush_girl:: @ 8E6832C +gTrainerPalette_CrushGirl:: @ 8E6832C .incbin "graphics/trainers/palettes/crush_girl.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_tuber_front_pic:: @ 8E68354 - .incbin "graphics/trainers/front_pics/tuber_front_pic.4bpp.lz" +gTrainerFrontPic_TubeFr:: @ 8E68354 + .incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_tuber:: @ 8E68658 - .incbin "graphics/trainers/palettes/tuber.gbapal.lz" +gTrainerPalette_TuberF:: @ 8E68658 + .incbin "graphics/trainers/palettes/tuber_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_pokemon_breeder_front_pic:: @ 8E68680 - .incbin "graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz" +gTrainerFrontPic_PokemonBreederF:: @ 8E68680 + .incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_pokemon_breeder:: @ 8E689C0 - .incbin "graphics/trainers/palettes/pokemon_breeder.gbapal.lz" +gTrainerPalette_PokemonBreederF:: @ 8E689C0 + .incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_pokemon_ranger_m_front_pic:: @ 8E689E8 +gTrainerFrontPic_PokemonRangerM:: @ 8E689E8 .incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_pokemon_ranger_m:: @ 8E68D48 +gTrainerPalette_PokemonRangerM:: @ 8E68D48 .incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_pokemon_ranger_f_front_pic:: @ 8E68D70 +gTrainerFrontPic_PokemonRangerF:: @ 8E68D70 .incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_pokemon_ranger_f:: @ 8E690A4 +gTrainerPalette_PokemonRangerF:: @ 8E690A4 .incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_aroma_lady_front_pic:: @ 8E690CC +gTrainerFrontPic_AromaLady:: @ 8E690CC .incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_aroma_lady:: @ 8E6941C +gTrainerPalette_AromaLady:: @ 8E6941C .incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_ruin_maniac_front_pic:: @ 8E69444 +gTrainerFrontPic_RuinManiac:: @ 8E69444 .incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_ruin_maniac:: @ 8E69850 +gTrainerPalette_RuinManiac:: @ 8E69850 .incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_lady_front_pic:: @ 8E69878 +gTrainerFrontPic_Lady:: @ 8E69878 .incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_lady:: @ 8E69BA0 +gTrainerPalette_Lady:: @ 8E69Ba0 .incbin "graphics/trainers/palettes/lady.gbapal.lz" .align 2 -gFile_graphics_trainers_front_pics_painter_front_pic:: @ 8E69BC8 +gTrainerFrontPic_Painter:: @ 8E69BC8 .incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_painter:: @ 8E69E94 +gTrainerPalette_Painter:: @ 8E69E94 .incbin "graphics/trainers/palettes/painter.gbapal.lz" .align 2 @@ -13412,27 +13412,27 @@ gTrainerBackPic_OldMan:: @ 8E70EBC .incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp" .align 2 -gTrainerBackPic_RubySapphireBrendan:: @ 8E72EBC +gTrainerBackPic_RSBrendan:: @ 8E72EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp" .align 2 -gTrainerBackPic_RubySapphireMay:: @ 8E74EBC +gTrainerBackPic_RSMay:: @ 8E74EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" .align 2 -gFile_graphics_trainers_palettes_leaf_back_pic:: @ 8E76EBC +gTrainerPalette_LeafBackPic:: @ 8E76Ebc .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" .align 2 -gFile_graphics_trainers_palettes_red_back_pic:: @ 8E76EE4 +gTrainerPalette_RedBackPic:: @ 8E76Ee4 .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" .align 2 -gFile_graphics_trainers_palettes_pokedude_back_pic:: @ 8E76F0C +gTrainerPalette_PokeDudeBackPic:: @ 8E76F0C .incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz" .align 2 -gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34 +gTrainerPalette_OldManBackPic:: @ 8E76F34 .incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz" .align 2 diff --git a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png deleted file mode 100644 index a15872c611d348e8efe7a28673cd943860d0ed7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmV;v0zv(WP)K)G=$@KokJrqcJAda;TX@Kn|U2D-e$cmo!6+m!1bh z>&XZ5P!BH1Qz^-yo7%|+EsdeI!CLeuG8GS{Xsj?Tlyq`UE32uf`+71I+tHnWL2uFH z-goak2}ub3UxKyE*o&=s%d|T8w*brJODuMDzP)RjFP~fOwji(P?mj^1`1)(dEL?Yr z$@7|)+e161$(Wfntz?fonszYbK+o$e%Z{H3DrEVoo3?eX<<#uMP6A*}+vDKEY~TB= z=1YPhzE>)u;0dMW@2ap5v{&Vg3Y1$l%*+PYySb^pU5 zdnE*T=y;II?`s7n>JSTe46{`J2!lA!#~4S^q9V)2;N!#%u8MLHl;1^gb`^&yA;aZ~ z3&A)JOELfeW#B^|9g2s52w>qkF8mM!UIZZU9p{ZM9Th|1@iMyPS@9J)UffKUPSYpT zuJkZM)aV(nzsSo|yJtjiJ!ySpP~#GOuO$_RZS%W4p&)BAvM*ubht!pUGzaBLvr#Wf zfMUB&a6(B*)l|fjJgPus;mcZ&jGI^eGsH> zb1;|o7<7Nd087EJI_mb8S8)%8x|t;in_@6*wlcl`612pC_A@jNFcku2wH;DXk2Ro3 zK>uHeSK$U&9UF>HAgO^pjKmCX=;lK)IV$6KokJ*gDS>Qg0S2#5H~}%)_*A8>L?jZo8S&P zV|TED_yelM(tKp=d4PCvo}2VZ*zK5xCv(Ji7AGa$P#X#e?q^inBXAV>s*OjgO2L4bb#XsjqV#S#eA>`h8( z6k@>oN=nJBf_WtQsZ=_%2?LbOrq#Rf2|QRXJ}+y&{~`|DzJC3H#pI>m?~UR)yeA|( z&Zsk?3mgTmss|rVCq$Hx)Tm~!w3_pLT;o96`Vs*WRZ}}S>Nfct>h@U#$mz7Z<8+&^ z?jyCaaVHGci>#wP8qj_Q-Hsztpw<`DSPx zw^FOJJDV78U&^oT((po)WZ6T3*$cP$4DZQqXX2hrkrZ_$68N};7}0gJ6_FKy zR7*%E8a9n+@c1heePFBu7h>y_&lPkrHX(3!Zw{!gM@+y&Rw|-}>NNzAKji?&08xct zgAWSdxxkzQ_+IlKjpV<8Y{EbcG39`QAkb>D05Qg zw`mcU{&5b#9;j=IIur!6;dlPKTpd_%#!2cFYg}gqVLu}z5oCK07*qoM6N<$f|piEqyPW_ diff --git a/graphics/trainers/front_pics/champion_blue_front_pic.png b/graphics/trainers/front_pics/champion_rival_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/champion_blue_front_pic.png rename to graphics/trainers/front_pics/champion_rival_front_pic.png diff --git a/graphics/trainers/front_pics/steven_front_pic.png b/graphics/trainers/front_pics/champion_steven_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/steven_front_pic.png rename to graphics/trainers/front_pics/champion_steven_front_pic.png diff --git a/graphics/trainers/front_pics/champion_wallace_front_pic.png b/graphics/trainers/front_pics/champion_wallace_front_pic.png deleted file mode 100644 index 24c43eca869e7f1421769f292a268a4e88f5a789..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmV;@11WmbdM_3#GyV8uQixZE)i?u;Bm3t2m_5yEZQ`|0S>~mMiL4{>i4d_-nAZe z^-Y(4zkc6$@4k13(0{as+D6X}`Fh&MgFT~dfv-ClYzu}3K^UlC8(FUmBVzZJX?_(j zs8aS4zxr}}{6eRcro4)D-DD=@4loA7D+M}b>^VX?Mh!jg31%2GQ9v~f;UbQE#5*Ws zdr(1v`;lXwKxI29V7?CtkRt8TB!v{ybGyRjQQ?B@0niDgn3_vIxwJLhlX>LTbFkzYk<^tfK|w z_!g&S^{3Zo9#X#lgIkQklMu|@HMaLop^4v0L*`d`X; zSz+wMU~lMeu!QIOWf{l#Y#xjVLv{__0nzI?fiY~nQTE+#bg8R^;HU+#j4Q{JF#ApC zC!i7;V*qgrkV9OpR$XCef?yk90Eue4=}Baf&OwxeBnO1dH$BQdq{|MN%(MfO6i-gI z0GOt%&TB&x2@X;%K!-!OZ3B}gDa#Ww<8&E-BgJg+l$lAD?QaxH4&cX@$#rnbr<-j` z;d^BlQ2zqs;c&?XsQMB+AjkG401uodmnoI&AOU}0seuWni6v{Ft$lC<=QZPxVjFyh zJ2u#>LO4A3kTg>G>v3q|o67RXrZNj)ox~er$xiSrLh0u?{Rlu>hkds}#=gnf2vtfo zFi~*h{|01?VMZ7a`Lga7~l07*qoM6N<$f(2H+ A8~^|S diff --git a/graphics/trainers/front_pics/roughneck_front_pic.png b/graphics/trainers/front_pics/cue_ball_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/roughneck_front_pic.png rename to graphics/trainers/front_pics/cue_ball_front_pic.png diff --git a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png deleted file mode 100644 index 78b92b0c96686d2b25fb362b59bc1ccc7bd1ef83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmV;519kj~P)l;-Ah)xBD*i%N6V&GzQiYMhkC?(U1#v||7N{{R30uvh?H00001 zbW%=J06^y0W&i*K2uVaiR7i=flrd=AKomd^9I%Q9BWKB0B6slC#4a>L2q}07ZK)@_ z-n!Iswl_dupD5uw7+Qac!;{*!DIOG0g- ze~|2ZPyhcreH)?w7(#9EfoLy7xl;8Efvi=-gble;t|hw!A*J{~e@vp0U|IaWhteWhE)MKo9HG--H*OJ3sHgdVD||VLS)CKtFHD zPxi0;ZRTcTId}(m9C$P?Kiuyd<27Qb^t<+JvCxN3VYr{;TEf>vR?IZ>4vY=&PLc6C z@@1G7GY%gsS5P$&#$#4W4>)u$Y}*)|L&3hhAsE#4ffHlMtueu?2%Pjog~W&x^9r_W_L&_RERWZj z={R_k8Z_|Ic>|=@ce+@SH(`GKqwDeH6~?k$RjC;meU}UML#$z}I!?#Wc>=ifO%MtJ z>L#ec1wAscS`WdT@klb(!;4{D@NRv^x=X8}8N39ryDp9v4hvdXi-YJH4HJd`H@MNo z#Ef_xB{B9-qd!4lp8qXDGWdfSj~OpyGPFGLE7E?$o=(OoM(i>~p9 gb3!O&5dS8A1NJhS_yw}W>i_@%07*qoM6N<$g1G~*A^-pY diff --git a/graphics/trainers/front_pics/factory_head_noland_front_pic.png b/graphics/trainers/front_pics/factory_head_noland_front_pic.png deleted file mode 100644 index df420adf3481fda887bf9ace9ebc70e471357c8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmV<60w4W}P)2ncS zdmarzr;-eMojeE%O3m{wI2gbntz@a=c^tg!yd=8GmlU>5~jYABBkoPcXm&&R`EDrj50|NT5nr(LjG0-SKaWQBD z`3?<%)#h(u>N+q)2(&Xx_YGpKAaExFD=|1$V_*^!1TCtnl!LZuTHp*Vz65=xN1#bW zz#_!w0NltOoo|FCNg;r8ejs>s837ai_GE*EiJSoXVK)apyoPW1TVM%>;2`SuEel>E zFk^7a-h$wUJqsdu%f5kvKacN6xDMp$b9ejGm3FF=QwBi*JpBU~wOohQ S3Fg@V0000H0Cg@sSR&0wu9Nc*X5GZ zeER*7_kFJbB(6Kjul~7o-8lX@w$FcVm5!UAYg{0d%kP>;euEoe>_N#p@~`oCmjHxU3-eP0N&tfPTuN65MZi1h`&Gh?5r%mCz+BOFP7F~~Ht_o6yDPfE z1}#ldHr5}>6CnrWRYg%NKc-S4d$~k~f*tSY99%nLhM*v?`nCG<+@u>aGblL!tm)Tf zIN_0(3{b#Z+D^mw$?~L^f02AXit(IBr-|c>dUYw zNpH>lxYNyICo%)EZ^4Hr((}`1K*u5H7f++J}QeYw5<^oy*uKX8dvdF@$Y3OFiRWg_88)md| z15~;#DEQ6;c@1x)tc{*>fS{^>0rN%BovUd%bZVm~Cc6z9K|Mr)jWQgNrxDIjaEUT5 zyUzlRP|1Kxgj{x&qORo*vY^8S@o!NUjPilwAoK-@2$@^#-Hnjr1VD70jKd5dIyOQ< z>^J~~ZyYCfj>7@h-NQ>PaZVtid~)l~1z?X0dM|jd!~;R^US`jvu-5}0N**(Y;dN68 y)}iOImNW9IJ=wM_7HC`Vd!I!1c`q{m?fw9{Pwgvi diff --git a/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png b/graphics/trainers/front_pics/leader_wallace_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png rename to graphics/trainers/front_pics/leader_wallace_front_pic.png diff --git a/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png b/graphics/trainers/front_pics/magma_admin_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png rename to graphics/trainers/front_pics/magma_admin_f_front_pic.png diff --git a/graphics/trainers/front_pics/magma_admin_front_pic.png b/graphics/trainers/front_pics/magma_admin_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/magma_admin_front_pic.png rename to graphics/trainers/front_pics/magma_admin_m_front_pic.png diff --git a/graphics/trainers/front_pics/may_front_pic.png b/graphics/trainers/front_pics/may_front_pic.png deleted file mode 100644 index 47ebca40fb9ed02618aa32754fa395ebea95ae88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmV;i0#5yjP)K)IW&RP#g#FhZjq?@Y(~Xf|s1&;GrfFx*Sc)_HGfn$f+#re5c*$#RLy;ons@qxtrX#8hlB6qEjV{O{qZyH8q^}|x>pBX$FwwX zfLFt=S!|gEY~j4DSfXvWRj5VwwPjtlowfynN^4yxN{vMbaHe+V8$Q%bXo$)w=loZ^ zdKLt>spK&hiYD}+c57{cf|dp2UDi=mOYXBfKaL)Vuo(;l1mF~5q?2h)|v2y;7_kpf*Y1iw0VRo2C zFA$o@vG211Zy2#8pfKKDO*V`mg^wVH(SEs(`^*#pG==tVjCfHc@ynX*B;&sDdf~J=M zx>J0>z6D>`8*vna4}mguJ&0=T?!Q4Z4b0{B;A9#&f%7O+n}@+gJdfruz5s$UUQB@c zFMxJmNC7K3nw4{>p_~(B3M3Kiz=;Z7LzzI}KrGRfCs!a4-MTab?6W|tsoza5QxHUY zkPfCg`U^OIkI`))=SQDV>X7{OelkPoZUf(tN8aq?@xvzo2*=$d;bZ3idzPe}=al*d XF6qp(ho0W700000NkvXXu0mjf_zOqw diff --git a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png deleted file mode 100644 index 0b33649a22f7c9aa44c77d255603640c07d10514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmV+-1Ks?IP)ZTi8|57iUu=>79o;tF8%?6hl)=90Uf)<62cG>yW3nI6SnLSh|PPWF7$ol zxp&a-_&)Q#@0VYW`~R9GouAo{L@}J0(eFF=Rum&{Tw{S#1cYfA%+=W$oJMm9dyl+8 zI77mn=bH?$_#Gkqih`G048X@RS~R7Y3qCV|B%_Et0ox3)Oy&@!An=K`3JPKr1h*^( zxGsjn((7yV-7Eu~?x3)=ZeCTK*#9mI!3CVm%28aZIYank3*b z77AF8$94Quu^pg&1mKwibiIQQ%1x*WUwxDg@|wqnRpO zp)4HXOa<@jdciEU2IcfGEdv%&T`8Cj*e!9PE0Wj(1NiP|j&Qzh7M(7?Bq|Vy*1&W? zl^kO>wgEuk0oRD<+iisae+B|H&owH#ep{{6M<%eJn)+_dJ;o9M(Ts5KsMArmZTbkV zBrjRQ9nCcDmNy9GMi|>IHwQ@JfJ#omcy#Onun&BUtK_P9UmXMR$4V}7RR zzpy5W(DG#pG!NiIQ5P8Y(6Cs`VYB5k!=l>k^K`Tlg4Y`~3fP|!DSa%_-Y`z_OE zd4SZ~_}c>rWz7vVm3+biBA=~~Q>B?8SZuf{LKn3<3k>EW?r)*y+!71eTFaV7ED#z^ gFBy%3V3O?i7jRKdMk+6@4*&oF07*qoM6N<$f|JT*5&!@I diff --git a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png deleted file mode 100644 index e57260e28fa49bddf08b8e2ba10df9eb85ca1fd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$KfuP)|jChbA=5Rw%1BADbNc!*YzTzcH- zEeG4J2ogb>JtkU^0hKxT>dBjwTnhdJ6$W}K=%w~wSWHNUnDU(ckyJDLwmPt|v+uLt z_kBA%Zy5XE;mYue_*~@?FrO=Rk^^XoN`1|dz_}6!IXOV7<9#h82^a&fxfVzQ@0H;E z8q$C|e#3c_2HX?wKTOW2_v__Ofov%;v z`6)Jxgw9ySS?H>-mgtcyJ z%KDts?!Crv81_2J)ZWJMGzRvbq*HrAe!aVKblB|erc)cxVkkyf@Io5ULdb%jL|hv% z(FpJcIe^*Q z_C@cje+59(K>Q~I-6yXGk_zcE^a7wvqyUmUEM`2YX_ diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/pokefan_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/winstrate_f_front_pic.png rename to graphics/trainers/front_pics/pokefan_f_front_pic.png diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/pokefan_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/winstrate_m_front_pic.png rename to graphics/trainers/front_pics/pokefan_m_front_pic.png diff --git a/graphics/trainers/front_pics/pokemon_breeder_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/pokemon_breeder_front_pic.png rename to graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png rename to graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png diff --git a/graphics/trainers/front_pics/oak_front_pic.png b/graphics/trainers/front_pics/professor_oak_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/oak_front_pic.png rename to graphics/trainers/front_pics/professor_oak_front_pic.png diff --git a/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png b/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png deleted file mode 100644 index 2f936092ad4fcae2104a382b2a5f4926847e5b0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmV;?0xtcDP)b_CJ|u#FnxkJJg?yi;~1Y2Yn)U?o%NQFV++Aye8uP043O zP*^)2+sO&gd%gvi*4h(t74Xt|u}LtNZs2+SupcUw@`a;*6e5smY92X36h%0q_~-yK zjFUtH2v>p*02jb1qqI;50q!zxH4NS0+&chd zlE47ZhZ{sOmNwue-2oE7_oR#`tZ)EO_@eoEC|n@bIH0eU9*|%JYV;2Pqxq&qrf5(e z?cU`TMv%Ze%JU7dHh1jipU?CC{Sys-kLUaQkgWUfzuYG|0KeQPy`}$b7v{wdPQ-*d zdH#g&K32XlA|U4Q+rd8BE`*_gG54Q4-;#&hl1KJ0G2|AOTn9aQ00000NkvXXu0mjf Du6|FG diff --git a/graphics/trainers/front_pics/blue_1_front_pic.png b/graphics/trainers/front_pics/rival_1_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/blue_1_front_pic.png rename to graphics/trainers/front_pics/rival_1_front_pic.png diff --git a/graphics/trainers/front_pics/blue_2_front_pic.png b/graphics/trainers/front_pics/rival_2_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/blue_2_front_pic.png rename to graphics/trainers/front_pics/rival_2_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png b/graphics/trainers/front_pics/rs_aroma_lady_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png rename to graphics/trainers/front_pics/rs_aroma_lady_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_beauty_front_pic.png b/graphics/trainers/front_pics/rs_beauty_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_beauty_front_pic.png rename to graphics/trainers/front_pics/rs_beauty_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png b/graphics/trainers/front_pics/rs_bird_keeper_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png rename to graphics/trainers/front_pics/rs_bird_keeper_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_black_belt_front_pic.png b/graphics/trainers/front_pics/rs_black_belt_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_black_belt_front_pic.png rename to graphics/trainers/front_pics/rs_black_belt_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png b/graphics/trainers/front_pics/rs_bug_catcher_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png rename to graphics/trainers/front_pics/rs_bug_catcher_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_camper_front_pic.png b/graphics/trainers/front_pics/rs_camper_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_camper_front_pic.png rename to graphics/trainers/front_pics/rs_camper_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png rename to graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png rename to graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_fisherman_front_pic.png b/graphics/trainers/front_pics/rs_fisherman_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_fisherman_front_pic.png rename to graphics/trainers/front_pics/rs_fisherman_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_gentleman_front_pic.png b/graphics/trainers/front_pics/rs_gentleman_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_gentleman_front_pic.png rename to graphics/trainers/front_pics/rs_gentleman_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_hiker_front_pic.png b/graphics/trainers/front_pics/rs_hiker_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_hiker_front_pic.png rename to graphics/trainers/front_pics/rs_hiker_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_lady_front_pic.png b/graphics/trainers/front_pics/rs_lady_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_lady_front_pic.png rename to graphics/trainers/front_pics/rs_lady_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_lass_front_pic.png b/graphics/trainers/front_pics/rs_lass_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_lass_front_pic.png rename to graphics/trainers/front_pics/rs_lass_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_picnicker_front_pic.png b/graphics/trainers/front_pics/rs_picnicker_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_picnicker_front_pic.png rename to graphics/trainers/front_pics/rs_picnicker_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png b/graphics/trainers/front_pics/rs_pokemaniac_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png rename to graphics/trainers/front_pics/rs_pokemaniac_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png rename to graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png rename to graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png rename to graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png b/graphics/trainers/front_pics/rs_psychic_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_psychic_f_front_pic.png rename to graphics/trainers/front_pics/rs_psychic_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png b/graphics/trainers/front_pics/rs_psychic_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_psychic_m_front_pic.png rename to graphics/trainers/front_pics/rs_psychic_m_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png b/graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png rename to graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_sailor_front_pic.png b/graphics/trainers/front_pics/rs_sailor_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_sailor_front_pic.png rename to graphics/trainers/front_pics/rs_sailor_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png b/graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png rename to graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png rename to graphics/trainers/front_pics/rs_swimmer_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_m_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png rename to graphics/trainers/front_pics/rs_swimmer_m_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png b/graphics/trainers/front_pics/rs_tuber_f_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_tuber_f_front_pic.png rename to graphics/trainers/front_pics/rs_tuber_f_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_twins_front_pic.png b/graphics/trainers/front_pics/rs_twins_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_twins_front_pic.png rename to graphics/trainers/front_pics/rs_twins_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_young_couple_front_pic.png b/graphics/trainers/front_pics/rs_young_couple_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_young_couple_front_pic.png rename to graphics/trainers/front_pics/rs_young_couple_front_pic.png diff --git a/graphics/trainers/front_pics/emerald_youngster_front_pic.png b/graphics/trainers/front_pics/rs_youngster_front_pic.png similarity index 100% rename from graphics/trainers/front_pics/emerald_youngster_front_pic.png rename to graphics/trainers/front_pics/rs_youngster_front_pic.png diff --git a/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png b/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png deleted file mode 100644 index 28fedca384ff86e7ecb409558402742003422a84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 667 zcmV;M0%ZM(P)>W0_d2^|J#j^1K z&3kX&%>I{<{~yYGTGKqnwyrxnX;HTSeWE-eXy06^Z?qC%M7F^eD zcrgwvx+`w$@gWY7?%n3bq2)O9FW%Z8i@sD8?;ho!EETe1?Lqzl*B$=STmOcqa72$c zzCwuWtjBK&V6j<`1mlX|WFdQM)FopqQv5!TMbD(y1k*R^-~_hI#8jiRE;#Ix(dqlV ztTBFBUT_%`mFWT@_14PZHAP-j^t=GrJ_&XtqnC)V5vwGIY z=jTO9YMdE2q7UoyusADq6Tl4{(J?v+qL2C{61Hsy-pT-;>n^Dpw(gmLH$e(7G(c## zdBX%Kh!h-GZ_C#=&A>AUrr(uOuK)@*3%UYO5(%*#P+;*WxC%gRKxLv-qPO}VVA)1A z4@fH@vI6mx!a~WN3h3JbC2_l-3`xldt)cX{qbG#}d8JT=_CSlt()te!$POk3xKtn| zmLZ$~^$Y{DsYCt(%t