diff --git a/battle-e/Makefile b/battle-e/Makefile index ad6446a..0afcbe7 100644 --- a/battle-e/Makefile +++ b/battle-e/Makefile @@ -20,6 +20,14 @@ include trainer_cards.mk # Include the card id to berry definition mapping include berry_cards.mk +# Capture all the pngs and label them to be converted to 4bpp +GFX=$(addprefix build/, $(addsuffix .4bpp, $(basename $(wildcard sprites/trainers/*.png)))) + +# Convert png and convert them +build/sprites/trainers/%.4bpp: sprites/trainers/%.png + ../bin/pret/gbagfx $< $@ +.PRECIOUS: build/sprites/trainers/%.4bpp + build/prologue-%.tx: prologue.asm python3 ../scripts/regionalize.py $< $@ $* $* build/prologue-%.o: build/prologue-%.tx @@ -69,7 +77,7 @@ build/trainers/%.mev: build/trainers/%.bin build/card-%-EN.tx: card-%.asm python3 ../scripts/ereadertext.py $< $@ EN -build/card-%.o: build/card-%.tx build/prologue-EN.tx build/battletrainer-EN.tx build/enigmaberry-EN.tx +build/card-%.o: build/card-%.tx build/prologue-EN.tx build/battletrainer-EN.tx build/enigmaberry-EN.tx $(GFX) ../bin/rgbds/v0.9.1/rgbasm -I build -M $@.d -o $@ $< build/card-%.gbc: build/card-%.o ../bin/rgbds/v0.9.1/rgblink -o $@ $< @@ -85,7 +93,7 @@ build/card-%.300.bmp: build/card-%-01.raw .PRECIOUS: build/card-%-EN.tx build/card-%.o build/card-%.gbc build/card-%.z80 build/card-%.vpk build/card-%-01.raw build/card-%.300.bmp # Automatically create build dirs if missing -BUILD_DIRS=build build/trainers build/berries +BUILD_DIRS=build build/trainers build/berries build/sprites/trainers $(info $(shell mkdir -p $(BUILD_DIRS))) .PHONY: clean diff --git a/battle-e/battletrainer.asm b/battle-e/battletrainer.asm index c90c158..3403822 100644 --- a/battle-e/battletrainer.asm +++ b/battle-e/battletrainer.asm @@ -13,7 +13,7 @@ BackdropPalettes: ; A04 INCLUDE "sprites/battletrainer3.pal" INCLUDE "sprites/battletrainer4.pal" TrainerPalette: ; A6C - INCLUDE "sprites/battletrainer5.pal" + INCLUDE "sprites/trainersilhouette.pal" DoorPalette: ; A74 INCLUDE "sprites/trainerdoor.pal" diff --git a/battle-e/sprites/trainers/aroma_lady.4bpp b/battle-e/sprites/trainers/aroma_lady.4bpp deleted file mode 100755 index 6cd8d77..0000000 Binary files a/battle-e/sprites/trainers/aroma_lady.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/aroma_lady.png b/battle-e/sprites/trainers/aroma_lady.png new file mode 100644 index 0000000..4506abd Binary files /dev/null and b/battle-e/sprites/trainers/aroma_lady.png differ diff --git a/battle-e/sprites/trainers/battle_girl.4bpp b/battle-e/sprites/trainers/battle_girl.4bpp deleted file mode 100755 index 2f2a54f..0000000 Binary files a/battle-e/sprites/trainers/battle_girl.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/battle_girl.png b/battle-e/sprites/trainers/battle_girl.png new file mode 100644 index 0000000..47586ff Binary files /dev/null and b/battle-e/sprites/trainers/battle_girl.png differ diff --git a/battle-e/sprites/trainers/beauty.4bpp b/battle-e/sprites/trainers/beauty.4bpp deleted file mode 100755 index a0657a1..0000000 Binary files a/battle-e/sprites/trainers/beauty.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/beauty.png b/battle-e/sprites/trainers/beauty.png new file mode 100644 index 0000000..d49232e Binary files /dev/null and b/battle-e/sprites/trainers/beauty.png differ diff --git a/battle-e/sprites/trainers/bird_keeper.4bpp b/battle-e/sprites/trainers/bird_keeper.4bpp deleted file mode 100644 index fddfd5f..0000000 Binary files a/battle-e/sprites/trainers/bird_keeper.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/bird_keeper.png b/battle-e/sprites/trainers/bird_keeper.png new file mode 100644 index 0000000..78f844a Binary files /dev/null and b/battle-e/sprites/trainers/bird_keeper.png differ diff --git a/battle-e/sprites/trainers/black_belt.4bpp b/battle-e/sprites/trainers/black_belt.4bpp deleted file mode 100755 index ac71f18..0000000 Binary files a/battle-e/sprites/trainers/black_belt.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/black_belt.png b/battle-e/sprites/trainers/black_belt.png new file mode 100644 index 0000000..95591f8 Binary files /dev/null and b/battle-e/sprites/trainers/black_belt.png differ diff --git a/battle-e/sprites/trainers/bug_catcher.4bpp b/battle-e/sprites/trainers/bug_catcher.4bpp deleted file mode 100644 index 4768a18..0000000 Binary files a/battle-e/sprites/trainers/bug_catcher.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/bug_catcher.png b/battle-e/sprites/trainers/bug_catcher.png new file mode 100644 index 0000000..fd49679 Binary files /dev/null and b/battle-e/sprites/trainers/bug_catcher.png differ diff --git a/battle-e/sprites/trainers/bug_maniac.4bpp b/battle-e/sprites/trainers/bug_maniac.4bpp deleted file mode 100755 index ae44d5a..0000000 Binary files a/battle-e/sprites/trainers/bug_maniac.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/bug_maniac.png b/battle-e/sprites/trainers/bug_maniac.png new file mode 100644 index 0000000..a275ee4 Binary files /dev/null and b/battle-e/sprites/trainers/bug_maniac.png differ diff --git a/battle-e/sprites/trainers/camper.4bpp b/battle-e/sprites/trainers/camper.4bpp deleted file mode 100755 index c046dfe..0000000 Binary files a/battle-e/sprites/trainers/camper.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/camper.png b/battle-e/sprites/trainers/camper.png new file mode 100644 index 0000000..077c5dd Binary files /dev/null and b/battle-e/sprites/trainers/camper.png differ diff --git a/battle-e/sprites/trainers/collector.4bpp b/battle-e/sprites/trainers/collector.4bpp deleted file mode 100755 index 1326731..0000000 Binary files a/battle-e/sprites/trainers/collector.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/collector.png b/battle-e/sprites/trainers/collector.png new file mode 100644 index 0000000..2be7ab8 Binary files /dev/null and b/battle-e/sprites/trainers/collector.png differ diff --git a/battle-e/sprites/trainers/cooltrainer_f.4bpp b/battle-e/sprites/trainers/cooltrainer_f.4bpp deleted file mode 100755 index 4f90942..0000000 Binary files a/battle-e/sprites/trainers/cooltrainer_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/cooltrainer_f.png b/battle-e/sprites/trainers/cooltrainer_f.png new file mode 100644 index 0000000..dc11e02 Binary files /dev/null and b/battle-e/sprites/trainers/cooltrainer_f.png differ diff --git a/battle-e/sprites/trainers/cooltrainer_m.4bpp b/battle-e/sprites/trainers/cooltrainer_m.4bpp deleted file mode 100755 index 837284a..0000000 Binary files a/battle-e/sprites/trainers/cooltrainer_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/cooltrainer_m.png b/battle-e/sprites/trainers/cooltrainer_m.png new file mode 100644 index 0000000..23ddb65 Binary files /dev/null and b/battle-e/sprites/trainers/cooltrainer_m.png differ diff --git a/battle-e/sprites/trainers/dragon_tamer.4bpp b/battle-e/sprites/trainers/dragon_tamer.4bpp deleted file mode 100644 index a0657a1..0000000 Binary files a/battle-e/sprites/trainers/dragon_tamer.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/dragon_tamer.png b/battle-e/sprites/trainers/dragon_tamer.png new file mode 100644 index 0000000..d49232e Binary files /dev/null and b/battle-e/sprites/trainers/dragon_tamer.png differ diff --git a/battle-e/sprites/trainers/expert_f.4bpp b/battle-e/sprites/trainers/expert_f.4bpp deleted file mode 100755 index 6e5e935..0000000 Binary files a/battle-e/sprites/trainers/expert_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/expert_f.png b/battle-e/sprites/trainers/expert_f.png new file mode 100644 index 0000000..442d908 Binary files /dev/null and b/battle-e/sprites/trainers/expert_f.png differ diff --git a/battle-e/sprites/trainers/expert_m.4bpp b/battle-e/sprites/trainers/expert_m.4bpp deleted file mode 100755 index 7d04f7d..0000000 Binary files a/battle-e/sprites/trainers/expert_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/expert_m.png b/battle-e/sprites/trainers/expert_m.png new file mode 100644 index 0000000..d82ae54 Binary files /dev/null and b/battle-e/sprites/trainers/expert_m.png differ diff --git a/battle-e/sprites/trainers/fisherman.4bpp b/battle-e/sprites/trainers/fisherman.4bpp deleted file mode 100755 index 4577f9d..0000000 Binary files a/battle-e/sprites/trainers/fisherman.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/fisherman.png b/battle-e/sprites/trainers/fisherman.png new file mode 100644 index 0000000..896aae1 Binary files /dev/null and b/battle-e/sprites/trainers/fisherman.png differ diff --git a/battle-e/sprites/trainers/gentleman.4bpp b/battle-e/sprites/trainers/gentleman.4bpp deleted file mode 100755 index de2abf5..0000000 Binary files a/battle-e/sprites/trainers/gentleman.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/gentleman.png b/battle-e/sprites/trainers/gentleman.png new file mode 100644 index 0000000..312f87a Binary files /dev/null and b/battle-e/sprites/trainers/gentleman.png differ diff --git a/battle-e/sprites/trainers/guitarist.4bpp b/battle-e/sprites/trainers/guitarist.4bpp deleted file mode 100755 index d03fb04..0000000 Binary files a/battle-e/sprites/trainers/guitarist.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/guitarist.png b/battle-e/sprites/trainers/guitarist.png new file mode 100644 index 0000000..5173e0e Binary files /dev/null and b/battle-e/sprites/trainers/guitarist.png differ diff --git a/battle-e/sprites/trainers/hex_maniac.4bpp b/battle-e/sprites/trainers/hex_maniac.4bpp deleted file mode 100755 index 99e338e..0000000 Binary files a/battle-e/sprites/trainers/hex_maniac.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/hex_maniac.png b/battle-e/sprites/trainers/hex_maniac.png new file mode 100644 index 0000000..b5fa851 Binary files /dev/null and b/battle-e/sprites/trainers/hex_maniac.png differ diff --git a/battle-e/sprites/trainers/hiker.4bpp b/battle-e/sprites/trainers/hiker.4bpp deleted file mode 100755 index b511cb9..0000000 Binary files a/battle-e/sprites/trainers/hiker.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/hiker.png b/battle-e/sprites/trainers/hiker.png new file mode 100644 index 0000000..2c2ab5e Binary files /dev/null and b/battle-e/sprites/trainers/hiker.png differ diff --git a/battle-e/sprites/trainers/kindler.4bpp b/battle-e/sprites/trainers/kindler.4bpp deleted file mode 100644 index 694caba..0000000 Binary files a/battle-e/sprites/trainers/kindler.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/kindler.png b/battle-e/sprites/trainers/kindler.png new file mode 100644 index 0000000..f00687d Binary files /dev/null and b/battle-e/sprites/trainers/kindler.png differ diff --git a/battle-e/sprites/trainers/lady.4bpp b/battle-e/sprites/trainers/lady.4bpp deleted file mode 100755 index 96dd4a9..0000000 Binary files a/battle-e/sprites/trainers/lady.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/lady.png b/battle-e/sprites/trainers/lady.png new file mode 100644 index 0000000..cd9f2a4 Binary files /dev/null and b/battle-e/sprites/trainers/lady.png differ diff --git a/battle-e/sprites/trainers/lass.4bpp b/battle-e/sprites/trainers/lass.4bpp deleted file mode 100644 index 02d3745..0000000 Binary files a/battle-e/sprites/trainers/lass.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/lass.png b/battle-e/sprites/trainers/lass.png new file mode 100644 index 0000000..4856843 Binary files /dev/null and b/battle-e/sprites/trainers/lass.png differ diff --git a/battle-e/sprites/trainers/ninja_boy.4bpp b/battle-e/sprites/trainers/ninja_boy.4bpp deleted file mode 100755 index cde7561..0000000 Binary files a/battle-e/sprites/trainers/ninja_boy.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/ninja_boy.png b/battle-e/sprites/trainers/ninja_boy.png new file mode 100644 index 0000000..2506966 Binary files /dev/null and b/battle-e/sprites/trainers/ninja_boy.png differ diff --git a/battle-e/sprites/trainers/parasol_lady.4bpp b/battle-e/sprites/trainers/parasol_lady.4bpp deleted file mode 100755 index 1922c08..0000000 Binary files a/battle-e/sprites/trainers/parasol_lady.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/parasol_lady.png b/battle-e/sprites/trainers/parasol_lady.png new file mode 100644 index 0000000..da76d43 Binary files /dev/null and b/battle-e/sprites/trainers/parasol_lady.png differ diff --git a/battle-e/sprites/trainers/picnicker.4bpp b/battle-e/sprites/trainers/picnicker.4bpp deleted file mode 100755 index a9859d2..0000000 Binary files a/battle-e/sprites/trainers/picnicker.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/picnicker.png b/battle-e/sprites/trainers/picnicker.png new file mode 100644 index 0000000..e8fb79b Binary files /dev/null and b/battle-e/sprites/trainers/picnicker.png differ diff --git a/battle-e/sprites/trainers/pkmn_breeder_f.4bpp b/battle-e/sprites/trainers/pkmn_breeder_f.4bpp deleted file mode 100755 index 6e4a05a..0000000 Binary files a/battle-e/sprites/trainers/pkmn_breeder_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pkmn_breeder_f.png b/battle-e/sprites/trainers/pkmn_breeder_f.png new file mode 100644 index 0000000..6e9e0a4 Binary files /dev/null and b/battle-e/sprites/trainers/pkmn_breeder_f.png differ diff --git a/battle-e/sprites/trainers/pkmn_breeder_m.4bpp b/battle-e/sprites/trainers/pkmn_breeder_m.4bpp deleted file mode 100755 index ad66402..0000000 Binary files a/battle-e/sprites/trainers/pkmn_breeder_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pkmn_breeder_m.png b/battle-e/sprites/trainers/pkmn_breeder_m.png new file mode 100644 index 0000000..de95a9c Binary files /dev/null and b/battle-e/sprites/trainers/pkmn_breeder_m.png differ diff --git a/battle-e/sprites/trainers/pkmn_ranger_f.4bpp b/battle-e/sprites/trainers/pkmn_ranger_f.4bpp deleted file mode 100755 index a8b83a1..0000000 Binary files a/battle-e/sprites/trainers/pkmn_ranger_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pkmn_ranger_f.png b/battle-e/sprites/trainers/pkmn_ranger_f.png new file mode 100644 index 0000000..c329465 Binary files /dev/null and b/battle-e/sprites/trainers/pkmn_ranger_f.png differ diff --git a/battle-e/sprites/trainers/pkmn_ranger_m.4bpp b/battle-e/sprites/trainers/pkmn_ranger_m.4bpp deleted file mode 100755 index 946cf15..0000000 Binary files a/battle-e/sprites/trainers/pkmn_ranger_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pkmn_ranger_m.png b/battle-e/sprites/trainers/pkmn_ranger_m.png new file mode 100644 index 0000000..863cc3e Binary files /dev/null and b/battle-e/sprites/trainers/pkmn_ranger_m.png differ diff --git a/battle-e/sprites/trainers/pokefan_f.4bpp b/battle-e/sprites/trainers/pokefan_f.4bpp deleted file mode 100755 index 5b45c14..0000000 Binary files a/battle-e/sprites/trainers/pokefan_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pokefan_f.png b/battle-e/sprites/trainers/pokefan_f.png new file mode 100644 index 0000000..967905e Binary files /dev/null and b/battle-e/sprites/trainers/pokefan_f.png differ diff --git a/battle-e/sprites/trainers/pokefan_m.4bpp b/battle-e/sprites/trainers/pokefan_m.4bpp deleted file mode 100755 index 9a28f30..0000000 Binary files a/battle-e/sprites/trainers/pokefan_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pokefan_m.png b/battle-e/sprites/trainers/pokefan_m.png new file mode 100644 index 0000000..d4e4563 Binary files /dev/null and b/battle-e/sprites/trainers/pokefan_m.png differ diff --git a/battle-e/sprites/trainers/pokemaniac.4bpp b/battle-e/sprites/trainers/pokemaniac.4bpp deleted file mode 100755 index b9b2ec3..0000000 Binary files a/battle-e/sprites/trainers/pokemaniac.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/pokemaniac.png b/battle-e/sprites/trainers/pokemaniac.png new file mode 100644 index 0000000..9300ba6 Binary files /dev/null and b/battle-e/sprites/trainers/pokemaniac.png differ diff --git a/battle-e/sprites/trainers/psychic_f.4bpp b/battle-e/sprites/trainers/psychic_f.4bpp deleted file mode 100755 index d2530ac..0000000 Binary files a/battle-e/sprites/trainers/psychic_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/psychic_f.png b/battle-e/sprites/trainers/psychic_f.png new file mode 100644 index 0000000..857afab Binary files /dev/null and b/battle-e/sprites/trainers/psychic_f.png differ diff --git a/battle-e/sprites/trainers/psychic_m.4bpp b/battle-e/sprites/trainers/psychic_m.4bpp deleted file mode 100755 index d64d4ce..0000000 Binary files a/battle-e/sprites/trainers/psychic_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/psychic_m.png b/battle-e/sprites/trainers/psychic_m.png new file mode 100644 index 0000000..767ed4c Binary files /dev/null and b/battle-e/sprites/trainers/psychic_m.png differ diff --git a/battle-e/sprites/trainers/rich_boy.4bpp b/battle-e/sprites/trainers/rich_boy.4bpp deleted file mode 100644 index aad74c0..0000000 Binary files a/battle-e/sprites/trainers/rich_boy.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/rich_boy.png b/battle-e/sprites/trainers/rich_boy.png new file mode 100644 index 0000000..396a3bc Binary files /dev/null and b/battle-e/sprites/trainers/rich_boy.png differ diff --git a/battle-e/sprites/trainers/ruin_maniac.4bpp b/battle-e/sprites/trainers/ruin_maniac.4bpp deleted file mode 100755 index f45d23e..0000000 Binary files a/battle-e/sprites/trainers/ruin_maniac.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/ruin_maniac.png b/battle-e/sprites/trainers/ruin_maniac.png new file mode 100644 index 0000000..f77dbe4 Binary files /dev/null and b/battle-e/sprites/trainers/ruin_maniac.png differ diff --git a/battle-e/sprites/trainers/sailor.4bpp b/battle-e/sprites/trainers/sailor.4bpp deleted file mode 100755 index 53e3999..0000000 Binary files a/battle-e/sprites/trainers/sailor.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/sailor.png b/battle-e/sprites/trainers/sailor.png new file mode 100644 index 0000000..bc7a8f0 Binary files /dev/null and b/battle-e/sprites/trainers/sailor.png differ diff --git a/battle-e/sprites/trainers/school_kid_f.4bpp b/battle-e/sprites/trainers/school_kid_f.4bpp deleted file mode 100755 index b2b28e9..0000000 Binary files a/battle-e/sprites/trainers/school_kid_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/school_kid_f.png b/battle-e/sprites/trainers/school_kid_f.png new file mode 100644 index 0000000..4ef6320 Binary files /dev/null and b/battle-e/sprites/trainers/school_kid_f.png differ diff --git a/battle-e/sprites/trainers/school_kid_m.4bpp b/battle-e/sprites/trainers/school_kid_m.4bpp deleted file mode 100644 index 6b28739..0000000 Binary files a/battle-e/sprites/trainers/school_kid_m.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/school_kid_m.png b/battle-e/sprites/trainers/school_kid_m.png new file mode 100644 index 0000000..8b6cbb6 Binary files /dev/null and b/battle-e/sprites/trainers/school_kid_m.png differ diff --git a/battle-e/sprites/trainers/swimmer_f.4bpp b/battle-e/sprites/trainers/swimmer_f.4bpp deleted file mode 100755 index 478725c..0000000 Binary files a/battle-e/sprites/trainers/swimmer_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/swimmer_f.png b/battle-e/sprites/trainers/swimmer_f.png new file mode 100644 index 0000000..5d6f84b Binary files /dev/null and b/battle-e/sprites/trainers/swimmer_f.png differ diff --git a/battle-e/sprites/trainers/triathlete_f_swim.4bpp b/battle-e/sprites/trainers/triathlete_f_swim.4bpp deleted file mode 100644 index e90e2b9..0000000 Binary files a/battle-e/sprites/trainers/triathlete_f_swim.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/triathlete_f_swim.png b/battle-e/sprites/trainers/triathlete_f_swim.png new file mode 100644 index 0000000..6ad688f Binary files /dev/null and b/battle-e/sprites/trainers/triathlete_f_swim.png differ diff --git a/battle-e/sprites/trainers/triathlete_m_bike.4bpp b/battle-e/sprites/trainers/triathlete_m_bike.4bpp deleted file mode 100644 index 29597d3..0000000 Binary files a/battle-e/sprites/trainers/triathlete_m_bike.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/triathlete_m_bike.png b/battle-e/sprites/trainers/triathlete_m_bike.png new file mode 100644 index 0000000..a5fff32 Binary files /dev/null and b/battle-e/sprites/trainers/triathlete_m_bike.png differ diff --git a/battle-e/sprites/trainers/triathlete_m_run.4bpp b/battle-e/sprites/trainers/triathlete_m_run.4bpp deleted file mode 100644 index 8778504..0000000 Binary files a/battle-e/sprites/trainers/triathlete_m_run.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/triathlete_m_run.png b/battle-e/sprites/trainers/triathlete_m_run.png new file mode 100644 index 0000000..6ab1803 Binary files /dev/null and b/battle-e/sprites/trainers/triathlete_m_run.png differ diff --git a/battle-e/sprites/trainers/triathlete_m_swim.4bpp b/battle-e/sprites/trainers/triathlete_m_swim.4bpp deleted file mode 100755 index 8778504..0000000 Binary files a/battle-e/sprites/trainers/triathlete_m_swim.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/triathlete_m_swim.png b/battle-e/sprites/trainers/triathlete_m_swim.png new file mode 100644 index 0000000..6ab1803 Binary files /dev/null and b/battle-e/sprites/trainers/triathlete_m_swim.png differ diff --git a/battle-e/sprites/trainers/tuber_f.4bpp b/battle-e/sprites/trainers/tuber_f.4bpp deleted file mode 100755 index 51dda21..0000000 Binary files a/battle-e/sprites/trainers/tuber_f.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/tuber_f.png b/battle-e/sprites/trainers/tuber_f.png new file mode 100644 index 0000000..a387ca6 Binary files /dev/null and b/battle-e/sprites/trainers/tuber_f.png differ diff --git a/battle-e/sprites/trainers/youngster.4bpp b/battle-e/sprites/trainers/youngster.4bpp deleted file mode 100755 index 241a415..0000000 Binary files a/battle-e/sprites/trainers/youngster.4bpp and /dev/null differ diff --git a/battle-e/sprites/trainers/youngster.png b/battle-e/sprites/trainers/youngster.png new file mode 100644 index 0000000..8848e33 Binary files /dev/null and b/battle-e/sprites/trainers/youngster.png differ diff --git a/battle-e/sprites/battletrainer5.pal b/battle-e/sprites/trainersilhouette.pal similarity index 100% rename from battle-e/sprites/battletrainer5.pal rename to battle-e/sprites/trainersilhouette.pal diff --git a/bin/pret/gbagfx b/bin/pret/gbagfx new file mode 100755 index 0000000..316ec7a Binary files /dev/null and b/bin/pret/gbagfx differ