summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics/berries/graphics.inc172
-rw-r--r--data/graphics/trainers/graphics.inc338
2 files changed, 255 insertions, 255 deletions
diff --git a/data/graphics/berries/graphics.inc b/data/graphics/berries/graphics.inc
index 19207ee32..e8edf9a3b 100644
--- a/data/graphics/berries/graphics.inc
+++ b/data/graphics/berries/graphics.inc
@@ -1,343 +1,343 @@
.align 2
gBerryPic_Cheri:: @ 8E78D00
- .incbin "graphics/berries/cheri/pic.4bpp.lz"
+ .incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8E78E54
- .incbin "graphics/berries/oran/pic.4bpp.lz"
+ .incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8E78FC8
- .incbin "graphics/berries/pecha/pic.4bpp.lz"
+ .incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8E7913C
- .incbin "graphics/berries/rawst/pic.4bpp.lz"
+ .incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8E792D4
- .incbin "graphics/berries/aspear/pic.4bpp.lz"
+ .incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8E7947C
- .incbin "graphics/berries/leppa/pic.4bpp.lz"
+ .incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8E795EC
- .incbin "graphics/berries/chesto/pic.4bpp.lz"
+ .incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8E797D0
- .incbin "graphics/berries/persim/pic.4bpp.lz"
+ .incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8E79920
- .incbin "graphics/berries/lum/pic.4bpp.lz"
+ .incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8E79A3C
- .incbin "graphics/berries/sitrus/pic.4bpp.lz"
+ .incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8E79BE0
- .incbin "graphics/berries/figy/pic.4bpp.lz"
+ .incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8E79D8C
- .incbin "graphics/berries/wiki/pic.4bpp.lz"
+ .incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8E79F80
- .incbin "graphics/berries/mago/pic.4bpp.lz"
+ .incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8E7A134
- .incbin "graphics/berries/aguav/pic.4bpp.lz"
+ .incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8E7A2A8
- .incbin "graphics/berries/iapapa/pic.4bpp.lz"
+ .incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8E7A560
- .incbin "graphics/berries/razz/pic.4bpp.lz"
+ .incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8E7A790
- .incbin "graphics/berries/bluk/pic.4bpp.lz"
+ .incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8E7A978
- .incbin "graphics/berries/nanab/pic.4bpp.lz"
+ .incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8E7AAEC
- .incbin "graphics/berries/wepear/pic.4bpp.lz"
+ .incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8E7ACB4
- .incbin "graphics/berries/pinap/pic.4bpp.lz"
+ .incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8E7AEC8
- .incbin "graphics/berries/pomeg/pic.4bpp.lz"
+ .incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8E7B070
- .incbin "graphics/berries/kelpsy/pic.4bpp.lz"
+ .incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8E7B218
- .incbin "graphics/berries/qualot/pic.4bpp.lz"
+ .incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8E7B3E4
- .incbin "graphics/berries/hondew/pic.4bpp.lz"
+ .incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8E7B63C
- .incbin "graphics/berries/grepa/pic.4bpp.lz"
+ .incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8E7B7CC
- .incbin "graphics/berries/tamato/pic.4bpp.lz"
+ .incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8E7BA90
- .incbin "graphics/berries/cornn/pic.4bpp.lz"
+ .incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8E7BC94
- .incbin "graphics/berries/magost/pic.4bpp.lz"
+ .incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8E7BE38
- .incbin "graphics/berries/rabuta/pic.4bpp.lz"
+ .incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8E7C12C
- .incbin "graphics/berries/nomel/pic.4bpp.lz"
+ .incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8E7C308
- .incbin "graphics/berries/spelon/pic.4bpp.lz"
+ .incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8E7C4F8
- .incbin "graphics/berries/pamtre/pic.4bpp.lz"
+ .incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8E7C748
- .incbin "graphics/berries/watmel/pic.4bpp.lz"
+ .incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8E7CA2C
- .incbin "graphics/berries/durin/pic.4bpp.lz"
+ .incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8E7CDF8
- .incbin "graphics/berries/belue/pic.4bpp.lz"
+ .incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8E7D0D0
- .incbin "graphics/berries/liechi/pic.4bpp.lz"
+ .incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8E7D328
- .incbin "graphics/berries/ganlon/pic.4bpp.lz"
+ .incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8E7D4C0
- .incbin "graphics/berries/salac/pic.4bpp.lz"
+ .incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8E7D704
- .incbin "graphics/berries/petaya/pic.4bpp.lz"
+ .incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8E7D9AC
- .incbin "graphics/berries/apicot/pic.4bpp.lz"
+ .incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8E7DB3C
- .incbin "graphics/berries/lansat/pic.4bpp.lz"
+ .incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8E7DD30
- .incbin "graphics/berries/starf/pic.4bpp.lz"
+ .incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8E7DF00
- .incbin "graphics/berries/enigma/pic.4bpp.lz"
+ .incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8E7E118
- .incbin "graphics/berries/cheri/palette.gbapal.lz"
+ .incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8E7E140
- .incbin "graphics/berries/oran/palette.gbapal.lz"
+ .incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8E7E168
- .incbin "graphics/berries/pecha/palette.gbapal.lz"
+ .incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8E7E190
- .incbin "graphics/berries/rawst/palette.gbapal.lz"
+ .incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8E7E1B8
- .incbin "graphics/berries/aspear/palette.gbapal.lz"
+ .incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8E7E1E0
- .incbin "graphics/berries/leppa/palette.gbapal.lz"
+ .incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8E7E208
- .incbin "graphics/berries/chesto/palette.gbapal.lz"
+ .incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8E7E230
- .incbin "graphics/berries/persim/palette.gbapal.lz"
+ .incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8E7E258
- .incbin "graphics/berries/lum/palette.gbapal.lz"
+ .incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8E7E280
- .incbin "graphics/berries/sitrus/palette.gbapal.lz"
+ .incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8E7E2A8
- .incbin "graphics/berries/figy/palette.gbapal.lz"
+ .incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8E7E2D0
- .incbin "graphics/berries/wiki/palette.gbapal.lz"
+ .incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8E7E2F8
- .incbin "graphics/berries/mago/palette.gbapal.lz"
+ .incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8E7E320
- .incbin "graphics/berries/aguav/palette.gbapal.lz"
+ .incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8E7E348
- .incbin "graphics/berries/iapapa/palette.gbapal.lz"
+ .incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8E7E370
- .incbin "graphics/berries/razz/palette.gbapal.lz"
+ .incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8E7E398
- .incbin "graphics/berries/bluk/palette.gbapal.lz"
+ .incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8E7E3C0
- .incbin "graphics/berries/nanab/palette.gbapal.lz"
+ .incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8E7E3E8
- .incbin "graphics/berries/wepear/palette.gbapal.lz"
+ .incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8E7E410
- .incbin "graphics/berries/pinap/palette.gbapal.lz"
+ .incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8E7E438
- .incbin "graphics/berries/pomeg/palette.gbapal.lz"
+ .incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8E7E460
- .incbin "graphics/berries/kelpsy/palette.gbapal.lz"
+ .incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8E7E488
- .incbin "graphics/berries/qualot/palette.gbapal.lz"
+ .incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8E7E4B0
- .incbin "graphics/berries/hondew/palette.gbapal.lz"
+ .incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8E7E4D8
- .incbin "graphics/berries/grepa/palette.gbapal.lz"
+ .incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8E7E500
- .incbin "graphics/berries/tamato/palette.gbapal.lz"
+ .incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8E7E528
- .incbin "graphics/berries/cornn/palette.gbapal.lz"
+ .incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8E7E550
- .incbin "graphics/berries/magost/palette.gbapal.lz"
+ .incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8E7E578
- .incbin "graphics/berries/rabuta/palette.gbapal.lz"
+ .incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8E7E5A0
- .incbin "graphics/berries/nomel/palette.gbapal.lz"
+ .incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8E7E5C8
- .incbin "graphics/berries/spelon/palette.gbapal.lz"
+ .incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8E7E5F0
- .incbin "graphics/berries/pamtre/palette.gbapal.lz"
+ .incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8E7E618
- .incbin "graphics/berries/watmel/palette.gbapal.lz"
+ .incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8E7E640
- .incbin "graphics/berries/durin/palette.gbapal.lz"
+ .incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8E7E668
- .incbin "graphics/berries/belue/palette.gbapal.lz"
+ .incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8E7E690
- .incbin "graphics/berries/liechi/palette.gbapal.lz"
+ .incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8E7E6B8
- .incbin "graphics/berries/ganlon/palette.gbapal.lz"
+ .incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8E7E6E0
- .incbin "graphics/berries/salac/palette.gbapal.lz"
+ .incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8E7E708
- .incbin "graphics/berries/petaya/palette.gbapal.lz"
+ .incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8E7E730
- .incbin "graphics/berries/apicot/palette.gbapal.lz"
+ .incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8E7E758
- .incbin "graphics/berries/lansat/palette.gbapal.lz"
+ .incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8E7E780
- .incbin "graphics/berries/starf/palette.gbapal.lz"
+ .incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8E7E7A8
- .incbin "graphics/berries/enigma/palette.gbapal.lz"
+ .incbin "graphics/berries/enigma.gbapal.lz"
diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc
index 09f34ca31..3a2be8723 100644
--- a/data/graphics/trainers/graphics.inc
+++ b/data/graphics/trainers/graphics.inc
@@ -1,675 +1,675 @@
.align 2
gTrainerFrontPic_Lass:: @ 8E48D38
- .incbin "graphics/trainers/lass/front.4bpp.lz"
+ .incbin "graphics/trainers/lass.4bpp.lz"
.align 2
gTrainerFrontPic_Youngster:: @ 8E49010
- .incbin "graphics/trainers/youngster/front.4bpp.lz"
+ .incbin "graphics/trainers/youngster.4bpp.lz"
.align 2
gTrainerFrontPic_Brendan:: @ 8E492B8
- .incbin "graphics/trainers/brendan/front.4bpp.lz"
+ .incbin "graphics/trainers/brendan.4bpp.lz"
.align 2
gTrainerFrontPic_May:: @ 8E495CC
- .incbin "graphics/trainers/may/front.4bpp.lz"
+ .incbin "graphics/trainers/may.4bpp.lz"
.align 2
gTrainerFrontPic_Hiker:: @ 8E498CC
- .incbin "graphics/trainers/hiker/front.4bpp.lz"
+ .incbin "graphics/trainers/hiker.4bpp.lz"
.align 2
gTrainerFrontPic_Beauty:: @ 8E49D4C
- .incbin "graphics/trainers/beauty/front.4bpp.lz"
+ .incbin "graphics/trainers/beauty.4bpp.lz"
.align 2
gTrainerFrontPic_Fisherman:: @ 8E4A034
- .incbin "graphics/trainers/fisherman/front.4bpp.lz"
+ .incbin "graphics/trainers/fisherman.4bpp.lz"
.align 2
gTrainerFrontPic_Lady:: @ 8E4A418
- .incbin "graphics/trainers/lady/front.4bpp.lz"
+ .incbin "graphics/trainers/lady.4bpp.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteM:: @ 8E4A7CC
- .incbin "graphics/trainers/cycling_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/cycling_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_AquaGruntM:: @ 8E4ABDC
- .incbin "graphics/trainers/aqua_grunt_m/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_grunt_m.4bpp.lz"
.align 2
gTrainerFrontPic_Twins:: @ 8E4AF3C
- .incbin "graphics/trainers/twins/front.4bpp.lz"
+ .incbin "graphics/trainers/twins.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmerF:: @ 8E4B300
- .incbin "graphics/trainers/swimmer_f/front.4bpp.lz"
+ .incbin "graphics/trainers/swimmer_f.4bpp.lz"
.align 2
gTrainerFrontPic_BugCatcher:: @ 8E4B5D0
- .incbin "graphics/trainers/bug_catcher/front.4bpp.lz"
+ .incbin "graphics/trainers/bug_catcher.4bpp.lz"
.align 2
gTrainerFrontPic_SchoolKidM:: @ 8E4B8FC
- .incbin "graphics/trainers/school_kid_m/front.4bpp.lz"
+ .incbin "graphics/trainers/school_kid_m.4bpp.lz"
.align 2
gTrainerFrontPic_RichBoy:: @ 8E4BBBC
- .incbin "graphics/trainers/rich_boy/front.4bpp.lz"
+ .incbin "graphics/trainers/rich_boy.4bpp.lz"
.align 2
gTrainerFrontPic_SrAndJr:: @ 8E4BE70
- .incbin "graphics/trainers/sr_and_jr/front.4bpp.lz"
+ .incbin "graphics/trainers/sr_and_jr.4bpp.lz"
.align 2
gTrainerFrontPic_BlackBelt:: @ 8E4C2E0
- .incbin "graphics/trainers/black_belt/front.4bpp.lz"
+ .incbin "graphics/trainers/black_belt.4bpp.lz"
.align 2
gTrainerFrontPic_Wally:: @ 8E4C644
- .incbin "graphics/trainers/wally/front.4bpp.lz"
+ .incbin "graphics/trainers/wally.4bpp.lz"
.align 2
gTrainerFrontPic_AquaGruntF:: @ 8E4C914
- .incbin "graphics/trainers/aqua_grunt_f/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_grunt_f.4bpp.lz"
.align 2
gTrainerFrontPic_TuberF:: @ 8E4CC50
- .incbin "graphics/trainers/tuber_f/front.4bpp.lz"
+ .incbin "graphics/trainers/tuber_f.4bpp.lz"
.align 2
gTrainerFrontPic_HexManiac:: @ 8E4CEF4
- .incbin "graphics/trainers/hex_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/hex_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonBreederF:: @ 8E4D260
- .incbin "graphics/trainers/pokemon_breeder_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_breeder_f.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaGruntM:: @ 8E4D594
- .incbin "graphics/trainers/magma_grunt_m/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_grunt_m.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaGruntF:: @ 8E4D914
- .incbin "graphics/trainers/magma_grunt_f/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_grunt_f.4bpp.lz"
.align 2
gTrainerFrontPic_Interviewer:: @ 8E4DCA0
- .incbin "graphics/trainers/interviewer/front.4bpp.lz"
+ .incbin "graphics/trainers/interviewer.4bpp.lz"
.align 2
gTrainerFrontPic_TuberM:: @ 8E4E144
- .incbin "graphics/trainers/tuber_m/front.4bpp.lz"
+ .incbin "graphics/trainers/tuber_m.4bpp.lz"
.align 2
gTrainerFrontPic_YoungCouple:: @ 8E4E3D0
- .incbin "graphics/trainers/young_couple/front.4bpp.lz"
+ .incbin "graphics/trainers/young_couple.4bpp.lz"
.align 2
gTrainerFrontPic_Guitarist:: @ 8E4E790
- .incbin "graphics/trainers/guitarist/front.4bpp.lz"
+ .incbin "graphics/trainers/guitarist.4bpp.lz"
.align 2
gTrainerFrontPic_Gentleman:: @ 8E4EB14
- .incbin "graphics/trainers/gentleman/front.4bpp.lz"
+ .incbin "graphics/trainers/gentleman.4bpp.lz"
.align 2
gTrainerFrontPic_Steven:: @ 8E4EE14
- .incbin "graphics/trainers/steven/front.4bpp.lz"
+ .incbin "graphics/trainers/steven.4bpp.lz"
.align 2
gTrainerFrontPic_Maxie:: @ 8E4F14C
- .incbin "graphics/trainers/maxie/front.4bpp.lz"
+ .incbin "graphics/trainers/maxie.4bpp.lz"
.align 2
gTrainerFrontPic_RunningTriathleteF:: @ 8E4F440
- .incbin "graphics/trainers/running_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/running_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_RunningTriathleteM:: @ 8E4F6E4
- .incbin "graphics/trainers/running_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/running_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_BattleGirl:: @ 8E4F99C
- .incbin "graphics/trainers/battle_girl/front.4bpp.lz"
+ .incbin "graphics/trainers/battle_girl.4bpp.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteF:: @ 8E4FCBC
- .incbin "graphics/trainers/cycling_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/cycling_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmerM:: @ 8E500C8
- .incbin "graphics/trainers/swimmer_m/front.4bpp.lz"
+ .incbin "graphics/trainers/swimmer_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokefanF:: @ 8E50388
- .incbin "graphics/trainers/pokefan_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokefan_f.4bpp.lz"
.align 2
gTrainerFrontPic_ExpertM:: @ 8E50754
- .incbin "graphics/trainers/expert_m/front.4bpp.lz"
+ .incbin "graphics/trainers/expert_m.4bpp.lz"
.align 2
gTrainerFrontPic_ExpertF:: @ 8E50A94
- .incbin "graphics/trainers/expert_f/front.4bpp.lz"
+ .incbin "graphics/trainers/expert_f.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteM:: @ 8E50DB0
- .incbin "graphics/trainers/swimming_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/swimming_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteF:: @ 8E510DC
- .incbin "graphics/trainers/swimming_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/swimming_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_DragonTamer:: @ 8E513B8
- .incbin "graphics/trainers/dragon_tamer/front.4bpp.lz"
+ .incbin "graphics/trainers/dragon_tamer.4bpp.lz"
.align 2
gTrainerFrontPic_BirdKeeper:: @ 8E5170C
- .incbin "graphics/trainers/bird_keeper/front.4bpp.lz"
+ .incbin "graphics/trainers/bird_keeper.4bpp.lz"
.align 2
gTrainerFrontPic_NinjaBoy:: @ 8E51A44
- .incbin "graphics/trainers/ninja_boy/front.4bpp.lz"
+ .incbin "graphics/trainers/ninja_boy.4bpp.lz"
.align 2
gTrainerFrontPic_ParasolLady:: @ 8E51D20
- .incbin "graphics/trainers/parasol_lady/front.4bpp.lz"
+ .incbin "graphics/trainers/parasol_lady.4bpp.lz"
.align 2
gTrainerFrontPic_BugManiac:: @ 8E52058
- .incbin "graphics/trainers/bug_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/bug_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_Sailor:: @ 8E524A8
- .incbin "graphics/trainers/sailor/front.4bpp.lz"
+ .incbin "graphics/trainers/sailor.4bpp.lz"
.align 2
gTrainerFrontPic_Collector:: @ 8E52858
- .incbin "graphics/trainers/collector/front.4bpp.lz"
+ .incbin "graphics/trainers/collector.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonBreederM:: @ 8E52C5C
- .incbin "graphics/trainers/pokemon_breeder_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_breeder_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonRangerM:: @ 8E52F8C
- .incbin "graphics/trainers/pokemon_ranger_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_ranger_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonRangerF:: @ 8E532D4
- .incbin "graphics/trainers/pokemon_ranger_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_ranger_f.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaAdminM:: @ 8E53608
- .incbin "graphics/trainers/magma_admin_m/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_admin_m.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaAdminF:: @ 8E539E0
- .incbin "graphics/trainers/magma_admin_f/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_admin_f.4bpp.lz"
.align 2
gTrainerFrontPic_AromaLady:: @ 8E53D90
- .incbin "graphics/trainers/aroma_lady/front.4bpp.lz"
+ .incbin "graphics/trainers/aroma_lady.4bpp.lz"
.align 2
gTrainerFrontPic_RuinManiac:: @ 8E54054
- .incbin "graphics/trainers/ruin_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/ruin_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_CoolTrainerM:: @ 8E543F0
- .incbin "graphics/trainers/cool_trainer_m/front.4bpp.lz"
+ .incbin "graphics/trainers/cool_trainer_m.4bpp.lz"
.align 2
gTrainerFrontPic_CoolTrainerF:: @ 8E546D8
- .incbin "graphics/trainers/cool_trainer_f/front.4bpp.lz"
+ .incbin "graphics/trainers/cool_trainer_f.4bpp.lz"
.align 2
gTrainerFrontPic_Pokemaniac:: @ 8E549EC
- .incbin "graphics/trainers/pokemaniac/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemaniac.4bpp.lz"
.align 2
gTrainerFrontPic_Kindler:: @ 8E54D5C
- .incbin "graphics/trainers/kindler/front.4bpp.lz"
+ .incbin "graphics/trainers/kindler.4bpp.lz"
.align 2
gTrainerFrontPic_Camper:: @ 8E550C8
- .incbin "graphics/trainers/camper/front.4bpp.lz"
+ .incbin "graphics/trainers/camper.4bpp.lz"
.align 2
gTrainerFrontPic_Picnicker:: @ 8E553B0
- .incbin "graphics/trainers/picnicker/front.4bpp.lz"
+ .incbin "graphics/trainers/picnicker.4bpp.lz"
.align 2
gTrainerFrontPic_PsychicM:: @ 8E55690
- .incbin "graphics/trainers/psychic_m/front.4bpp.lz"
+ .incbin "graphics/trainers/psychic_m.4bpp.lz"
.align 2
gTrainerFrontPic_PsychicF:: @ 8E559BC
- .incbin "graphics/trainers/psychic_f/front.4bpp.lz"
+ .incbin "graphics/trainers/psychic_f.4bpp.lz"
.align 2
gTrainerFrontPic_SchoolKidF:: @ 8E55CE4
- .incbin "graphics/trainers/school_kid_f/front.4bpp.lz"
+ .incbin "graphics/trainers/school_kid_f.4bpp.lz"
.align 2
gTrainerFrontPic_PokefanM:: @ 8E55F80
- .incbin "graphics/trainers/pokefan_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokefan_m.4bpp.lz"
.align 2
gTrainerFrontPic_SisAndBro:: @ 8E5633C
- .incbin "graphics/trainers/sis_and_bro/front.4bpp.lz"
+ .incbin "graphics/trainers/sis_and_bro.4bpp.lz"
.align 2
gTrainerFrontPic_OldCouple:: @ 8E56788
- .incbin "graphics/trainers/old_couple/front.4bpp.lz"
+ .incbin "graphics/trainers/old_couple.4bpp.lz"
.align 2
gTrainerFrontPic_AquaAdminM:: @ 8E56C98
- .incbin "graphics/trainers/aqua_admin_m/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_admin_m.4bpp.lz"
.align 2
gTrainerFrontPic_AquaAdminF:: @ 8E5704C
- .incbin "graphics/trainers/aqua_admin_f/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_admin_f.4bpp.lz"
.align 2
gTrainerFrontPic_UnusedAqua:: @ 8E57410
- .incbin "graphics/trainers/unused_aqua/front.4bpp.lz"
+ .incbin "graphics/trainers/unused_aqua.4bpp.lz"
.align 2
gTrainerFrontPic_Archie:: @ 8E5778C
- .incbin "graphics/trainers/archie/front.4bpp.lz"
+ .incbin "graphics/trainers/archie.4bpp.lz"
.align 2
gTrainerBackPic_Brendan:: @ 8E57AC8
- .incbin "graphics/trainers/brendan/back.4bpp.lz"
+ .incbin "graphics/trainers/brendan_back.4bpp.lz"
.align 2
gTrainerBackPic_May:: @ 8E5889C
- .incbin "graphics/trainers/may/back.4bpp.lz"
+ .incbin "graphics/trainers/may_back.4bpp.lz"
.align 2
gTrainerBackPic_Wally:: @ 8E59588
- .incbin "graphics/trainers/wally/back.4bpp.lz"
+ .incbin "graphics/trainers/wally_back.4bpp.lz"
.align 2
gTrainerPalette_Lass:: @ 8E59FD8
- .incbin "graphics/trainers/lass/palette.gbapal.lz"
+ .incbin "graphics/trainers/lass.gbapal.lz"
.align 2
gTrainerPalette_Youngster:: @ 8E5A000
- .incbin "graphics/trainers/youngster/palette.gbapal.lz"
+ .incbin "graphics/trainers/youngster.gbapal.lz"
.align 2
gTrainerPalette_Brendan:: @ 8E5A028
- .incbin "graphics/trainers/brendan/palette.gbapal.lz"
+ .incbin "graphics/trainers/brendan.gbapal.lz"
.align 2
gTrainerPalette_May:: @ 8E5A050
- .incbin "graphics/trainers/may/palette.gbapal.lz"
+ .incbin "graphics/trainers/may.gbapal.lz"
.align 2
gTrainerPalette_Hiker:: @ 8E5A078
- .incbin "graphics/trainers/hiker/palette.gbapal.lz"
+ .incbin "graphics/trainers/hiker.gbapal.lz"
.align 2
gTrainerPalette_Beauty:: @ 8E5A0A0
- .incbin "graphics/trainers/beauty/palette.gbapal.lz"
+ .incbin "graphics/trainers/beauty.gbapal.lz"
.align 2
gTrainerPalette_Fisherman:: @ 8E5A0C8
- .incbin "graphics/trainers/fisherman/palette.gbapal.lz"
+ .incbin "graphics/trainers/fisherman.gbapal.lz"
.align 2
gTrainerPalette_Lady:: @ 8E5A0F0
- .incbin "graphics/trainers/lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/lady.gbapal.lz"
.align 2
gTrainerPalette_CyclingTriathleteM:: @ 8E5A118
- .incbin "graphics/trainers/cycling_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/cycling_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_AquaGruntM:: @ 8E5A140
- .incbin "graphics/trainers/aqua_grunt_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_grunt_m.gbapal.lz"
.align 2
gTrainerPalette_Twins:: @ 8E5A168
- .incbin "graphics/trainers/twins/palette.gbapal.lz"
+ .incbin "graphics/trainers/twins.gbapal.lz"
.align 2
gTrainerPalette_SwimmerF:: @ 8E5A190
- .incbin "graphics/trainers/swimmer_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimmer_f.gbapal.lz"
.align 2
gTrainerPalette_BugCatcher:: @ 8E5A1B8
- .incbin "graphics/trainers/bug_catcher/palette.gbapal.lz"
+ .incbin "graphics/trainers/bug_catcher.gbapal.lz"
.align 2
gTrainerPalette_SchoolKidM:: @ 8E5A1E0
- .incbin "graphics/trainers/school_kid_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/school_kid_m.gbapal.lz"
.align 2
gTrainerPalette_RichBoy:: @ 8E5A208
- .incbin "graphics/trainers/rich_boy/palette.gbapal.lz"
+ .incbin "graphics/trainers/rich_boy.gbapal.lz"
.align 2
gTrainerPalette_SrAndJr:: @ 8E5A230
- .incbin "graphics/trainers/sr_and_jr/palette.gbapal.lz"
+ .incbin "graphics/trainers/sr_and_jr.gbapal.lz"
.align 2
gTrainerPalette_BlackBelt:: @ 8E5A258
- .incbin "graphics/trainers/black_belt/palette.gbapal.lz"
+ .incbin "graphics/trainers/black_belt.gbapal.lz"
.align 2
gTrainerPalette_Wally:: @ 8E5A280
- .incbin "graphics/trainers/wally/palette.gbapal.lz"
+ .incbin "graphics/trainers/wally.gbapal.lz"
.align 2
gTrainerPalette_AquaGruntF:: @ 8E5A2A8
- .incbin "graphics/trainers/aqua_grunt_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_grunt_f.gbapal.lz"
.align 2
gTrainerPalette_TuberF:: @ 8E5A2D0
- .incbin "graphics/trainers/tuber_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/tuber_f.gbapal.lz"
.align 2
gTrainerPalette_HexManiac:: @ 8E5A2F8
- .incbin "graphics/trainers/hex_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/hex_maniac.gbapal.lz"
.align 2
gTrainerPalette_PokemonBreederF:: @ 8E5A320
- .incbin "graphics/trainers/pokemon_breeder_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_breeder_f.gbapal.lz"
.align 2
gTrainerPalette_MagmaGruntM:: @ 8E5A348
- .incbin "graphics/trainers/magma_grunt_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_grunt_m.gbapal.lz"
.align 2
gTrainerPalette_MagmaGruntF:: @ 8E5A370
- .incbin "graphics/trainers/magma_grunt_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_grunt_f.gbapal.lz"
.align 2
gTrainerPalette_Interviewer:: @ 8E5A398
- .incbin "graphics/trainers/interviewer/palette.gbapal.lz"
+ .incbin "graphics/trainers/interviewer.gbapal.lz"
.align 2
gTrainerPalette_TuberM:: @ 8E5A3C0
- .incbin "graphics/trainers/tuber_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/tuber_m.gbapal.lz"
.align 2
gTrainerPalette_YoungCouple:: @ 8E5A3E8
- .incbin "graphics/trainers/young_couple/palette.gbapal.lz"
+ .incbin "graphics/trainers/young_couple.gbapal.lz"
.align 2
gTrainerPalette_Guitarist:: @ 8E5A410
- .incbin "graphics/trainers/guitarist/palette.gbapal.lz"
+ .incbin "graphics/trainers/guitarist.gbapal.lz"
.align 2
gTrainerPalette_Gentleman:: @ 8E5A438
- .incbin "graphics/trainers/gentleman/palette.gbapal.lz"
+ .incbin "graphics/trainers/gentleman.gbapal.lz"
.align 2
gTrainerPalette_Steven:: @ 8E5A460
- .incbin "graphics/trainers/steven/palette.gbapal.lz"
+ .incbin "graphics/trainers/steven.gbapal.lz"
.align 2
gTrainerPalette_Maxie:: @ 8E5A488
- .incbin "graphics/trainers/maxie/palette.gbapal.lz"
+ .incbin "graphics/trainers/maxie.gbapal.lz"
.align 2
gTrainerPalette_RunningTriathleteF:: @ 8E5A4B0
- .incbin "graphics/trainers/running_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/running_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_RunningTriathleteM:: @ 8E5A4D8
- .incbin "graphics/trainers/running_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/running_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_BattleGirl:: @ 8E5A500
- .incbin "graphics/trainers/battle_girl/palette.gbapal.lz"
+ .incbin "graphics/trainers/battle_girl.gbapal.lz"
.align 2
gTrainerPalette_CyclingTriathleteF:: @ 8E5A528
- .incbin "graphics/trainers/cycling_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/cycling_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_SwimmerM:: @ 8E5A550
- .incbin "graphics/trainers/swimmer_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimmer_m.gbapal.lz"
.align 2
gTrainerPalette_PokefanF:: @ 8E5A578
- .incbin "graphics/trainers/pokefan_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokefan_f.gbapal.lz"
.align 2
gTrainerPalette_ExpertM:: @ 8E5A5A0
- .incbin "graphics/trainers/expert_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/expert_m.gbapal.lz"
.align 2
gTrainerPalette_ExpertF:: @ 8E5A5C8
- .incbin "graphics/trainers/expert_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/expert_f.gbapal.lz"
.align 2
gTrainerPalette_SwimmingTriathleteM:: @ 8E5A5F0
- .incbin "graphics/trainers/swimming_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimming_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_SwimmingTriathleteF:: @ 8E5A618
- .incbin "graphics/trainers/swimming_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimming_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_DragonTamer:: @ 8E5A640
- .incbin "graphics/trainers/dragon_tamer/palette.gbapal.lz"
+ .incbin "graphics/trainers/dragon_tamer.gbapal.lz"
.align 2
gTrainerPalette_BirdKeeper:: @ 8E5A668
- .incbin "graphics/trainers/bird_keeper/palette.gbapal.lz"
+ .incbin "graphics/trainers/bird_keeper.gbapal.lz"
.align 2
gTrainerPalette_NinjaBoy:: @ 8E5A690
- .incbin "graphics/trainers/ninja_boy/palette.gbapal.lz"
+ .incbin "graphics/trainers/ninja_boy.gbapal.lz"
.align 2
gTrainerPalette_ParasolLady:: @ 8E5A6B8
- .incbin "graphics/trainers/parasol_lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/parasol_lady.gbapal.lz"
.align 2
gTrainerPalette_BugManiac:: @ 8E5A6E0
- .incbin "graphics/trainers/bug_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/bug_maniac.gbapal.lz"
.align 2
gTrainerPalette_Sailor:: @ 8E5A708
- .incbin "graphics/trainers/sailor/palette.gbapal.lz"
+ .incbin "graphics/trainers/sailor.gbapal.lz"
.align 2
gTrainerPalette_Collector:: @ 8E5A730
- .incbin "graphics/trainers/collector/palette.gbapal.lz"
+ .incbin "graphics/trainers/collector.gbapal.lz"
.align 2
gTrainerPalette_PokemonBreederM:: @ 8E5A758
- .incbin "graphics/trainers/pokemon_breeder_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_breeder_m.gbapal.lz"
.align 2
gTrainerPalette_PokemonRangerM:: @ 8E5A780
- .incbin "graphics/trainers/pokemon_ranger_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_ranger_m.gbapal.lz"
.align 2
gTrainerPalette_PokemonRangerF:: @ 8E5A7A8
- .incbin "graphics/trainers/pokemon_ranger_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_ranger_f.gbapal.lz"
.align 2
gTrainerPalette_MagmaAdminM:: @ 8E5A7D0
- .incbin "graphics/trainers/magma_admin_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_admin_m.gbapal.lz"
.align 2
gTrainerPalette_MagmaAdminF:: @ 8E5A7F8
- .incbin "graphics/trainers/magma_admin_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_admin_f.gbapal.lz"
.align 2
gTrainerPalette_AromaLady:: @ 8E5A820
- .incbin "graphics/trainers/aroma_lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/aroma_lady.gbapal.lz"
.align 2
gTrainerPalette_RuinManiac:: @ 8E5A848
- .incbin "graphics/trainers/ruin_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/ruin_maniac.gbapal.lz"
.align 2
gTrainerPalette_CoolTrainerM:: @ 8E5A870
- .incbin "graphics/trainers/cool_trainer_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/cool_trainer_m.gbapal.lz"
.align 2
gTrainerPalette_CoolTrainerF:: @ 8E5A898
- .incbin "graphics/trainers/cool_trainer_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/cool_trainer_f.gbapal.lz"
.align 2
gTrainerPalette_Pokemaniac:: @ 8E5A8C0
- .incbin "graphics/trainers/pokemaniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemaniac.gbapal.lz"
.align 2
gTrainerPalette_Kindler:: @ 8E5A8E8
- .incbin "graphics/trainers/kindler/palette.gbapal.lz"
+ .incbin "graphics/trainers/kindler.gbapal.lz"
.align 2
gTrainerPalette_Camper:: @ 8E5A910
- .incbin "graphics/trainers/camper/palette.gbapal.lz"
+ .incbin "graphics/trainers/camper.gbapal.lz"
.align 2
gTrainerPalette_Picnicker:: @ 8E5A938
- .incbin "graphics/trainers/picnicker/palette.gbapal.lz"
+ .incbin "graphics/trainers/picnicker.gbapal.lz"
.align 2
gTrainerPalette_PsychicM:: @ 8E5A960
- .incbin "graphics/trainers/psychic_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/psychic_m.gbapal.lz"
.align 2
gTrainerPalette_PsychicF:: @ 8E5A988
- .incbin "graphics/trainers/psychic_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/psychic_f.gbapal.lz"
.align 2
gTrainerPalette_SchoolKidF:: @ 8E5A9B0
- .incbin "graphics/trainers/school_kid_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/school_kid_f.gbapal.lz"
.align 2
gTrainerPalette_PokefanM:: @ 8E5A9D8
- .incbin "graphics/trainers/pokefan_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokefan_m.gbapal.lz"
.align 2
gTrainerPalette_SisAndBro:: @ 8E5AA00
- .incbin "graphics/trainers/sis_and_bro/palette.gbapal.lz"
+ .incbin "graphics/trainers/sis_and_bro.gbapal.lz"
.align 2
gTrainerPalette_OldCouple:: @ 8E5AA28
- .incbin "graphics/trainers/old_couple/palette.gbapal.lz"
+ .incbin "graphics/trainers/old_couple.gbapal.lz"
.align 2
gTrainerPalette_AquaAdminM:: @ 8E5AA50
- .incbin "graphics/trainers/aqua_admin_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_admin_m.gbapal.lz"
.align 2
gTrainerPalette_AquaAdminF:: @ 8E5AA78
- .incbin "graphics/trainers/aqua_admin_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_admin_f.gbapal.lz"
.align 2
gTrainerPalette_UnusedAqua:: @ 8E5AAA0
- .incbin "graphics/trainers/unused_aqua/palette.gbapal.lz"
+ .incbin "graphics/trainers/unused_aqua.gbapal.lz"
.align 2
gTrainerPalette_Archie:: @ 8E5AAC8
- .incbin "graphics/trainers/archie/palette.gbapal.lz"
+ .incbin "graphics/trainers/archie.gbapal.lz"
.align 2
gTrainerFrontPic_Roxanne:: @ 8E5AAF0
- .incbin "graphics/trainers/roxanne/front.4bpp.lz"
+ .incbin "graphics/trainers/roxanne.4bpp.lz"
.align 2
gTrainerFrontPic_Brawly:: @ 8E5ADDC
- .incbin "graphics/trainers/brawly/front.4bpp.lz"
+ .incbin "graphics/trainers/brawly.4bpp.lz"
.align 2
gTrainerFrontPic_Wattson:: @ 8E5B170
- .incbin "graphics/trainers/wattson/front.4bpp.lz"
+ .incbin "graphics/trainers/wattson.4bpp.lz"
.align 2
gTrainerFrontPic_Flannery:: @ 8E5B4B8
- .incbin "graphics/trainers/flannery/front.4bpp.lz"
+ .incbin "graphics/trainers/flannery.4bpp.lz"
.align 2
gTrainerFrontPic_Norman:: @ 8E5B838
- .incbin "graphics/trainers/norman/front.4bpp.lz"
+ .incbin "graphics/trainers/norman.4bpp.lz"
.align 2
gTrainerFrontPic_Winona:: @ 8E5BB74
- .incbin "graphics/trainers/winona/front.4bpp.lz"
+ .incbin "graphics/trainers/winona.4bpp.lz"
.align 2
gTrainerFrontPic_TateAndLiza:: @ 8E5BEF4
- .incbin "graphics/trainers/tate_and_liza/front.4bpp.lz"
+ .incbin "graphics/trainers/tate_and_liza.4bpp.lz"
.align 2
gTrainerFrontPic_Wallace:: @ 8E5C338
- .incbin "graphics/trainers/wallace/front.4bpp.lz"
+ .incbin "graphics/trainers/wallace.4bpp.lz"
.align 2
gTrainerFrontPic_Sidney:: @ 8E5C6B0
- .incbin "graphics/trainers/sidney/front.4bpp.lz"
+ .incbin "graphics/trainers/sidney.4bpp.lz"
.align 2
gTrainerFrontPic_Phoebe:: @ 8E5C9E4
- .incbin "graphics/trainers/phoebe/front.4bpp.lz"
+ .incbin "graphics/trainers/phoebe.4bpp.lz"
.align 2
gTrainerFrontPic_Glacia:: @ 8E5CCE4
- .incbin "graphics/trainers/glacia/front.4bpp.lz"
+ .incbin "graphics/trainers/glacia.4bpp.lz"
.align 2
gTrainerFrontPic_Drake:: @ 8E5D068
- .incbin "graphics/trainers/drake/front.4bpp.lz"
+ .incbin "graphics/trainers/drake.4bpp.lz"
.align 2
gTrainerPalette_Roxanne:: @ 8E5D410
- .incbin "graphics/trainers/roxanne/palette.gbapal.lz"
+ .incbin "graphics/trainers/roxanne.gbapal.lz"
.align 2
gTrainerPalette_Brawly:: @ 8E5D438
- .incbin "graphics/trainers/brawly/palette.gbapal.lz"
+ .incbin "graphics/trainers/brawly.gbapal.lz"
.align 2
gTrainerPalette_Wattson:: @ 8E5D460
- .incbin "graphics/trainers/wattson/palette.gbapal.lz"
+ .incbin "graphics/trainers/wattson.gbapal.lz"
.align 2
gTrainerPalette_Flannery:: @ 8E5D488
- .incbin "graphics/trainers/flannery/palette.gbapal.lz"
+ .incbin "graphics/trainers/flannery.gbapal.lz"
.align 2
gTrainerPalette_Norman:: @ 8E5D4B0
- .incbin "graphics/trainers/norman/palette.gbapal.lz"
+ .incbin "graphics/trainers/norman.gbapal.lz"
.align 2
gTrainerPalette_Winona:: @ 8E5D4D8
- .incbin "graphics/trainers/winona/palette.gbapal.lz"
+ .incbin "graphics/trainers/winona.gbapal.lz"
.align 2
gTrainerPalette_TateAndLiza:: @ 8E5D500
- .incbin "graphics/trainers/tate_and_liza/palette.gbapal.lz"
+ .incbin "graphics/trainers/tate_and_liza.gbapal.lz"
.align 2
gTrainerPalette_Wallace:: @ 8E5D528
- .incbin "graphics/trainers/wallace/palette.gbapal.lz"
+ .incbin "graphics/trainers/wallace.gbapal.lz"
.align 2
gTrainerPalette_Sidney:: @ 8E5D550
- .incbin "graphics/trainers/sidney/palette.gbapal.lz"
+ .incbin "graphics/trainers/sidney.gbapal.lz"
.align 2
gTrainerPalette_Phoebe:: @ 8E5D578
- .incbin "graphics/trainers/phoebe/palette.gbapal.lz"
+ .incbin "graphics/trainers/phoebe.gbapal.lz"
.align 2
gTrainerPalette_Glacia:: @ 8E5D5A0
- .incbin "graphics/trainers/glacia/palette.gbapal.lz"
+ .incbin "graphics/trainers/glacia.gbapal.lz"
.align 2
gTrainerPalette_Drake:: @ 8E5D5C8
- .incbin "graphics/trainers/drake/palette.gbapal.lz"
+ .incbin "graphics/trainers/drake.gbapal.lz"