Merge branch 'master' of https://github.com/ZetaNull/jep-hack

2026-02-06 16:15:24 +13:00 · 2024-07-24 23:36:05 -04:00 · 2024-07-24 23:36:05 -04:00 · 0161dc096d
commit 0161dc096d
parent 56554e2558 37980e84d0
33 changed files with 392 additions and 123 deletions
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@ -1036,8 +1036,12 @@ TogekissBackpic:	 INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"
 WalkerPic: INCBIN "gfx/trainers/walker.2bpp.lz"
 LoreleiPic: INCBIN "gfx/trainers/lorelei.2bpp.lz"
 SouthGuyPic: INCBIN "gfx/trainers/southguy.2bpp.lz"
-ImposterOakPic: INCBIN "gfx/trainers/imposteroak.2bpp.lz"
+ImposterOakPic: INCBIN "gfx/trainers/imposter_oak.2bpp.lz"
 AgathaPic: INCBIN "gfx/trainers/agatha.2bpp.lz"
+Giovanni1Pic: 	INCBIN "gfx/trainers/giovanni_coat.2bpp.lz"
 Giovanni3Pic: INCBIN "gfx/trainers/giovanni3.2bpp.lz"
 GreenPic: INCBIN "gfx/trainers/green.2bpp.lz"
 KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"
+ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz"
+ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz"
+ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz"
--- a/gfx/player/chris.gbcpal
+++ b/gfx/player/chris.gbcpal
--- a/gfx/player/chris.png
+++ b/gfx/player/chris.png
--- a/gfx/trainers/archer.png
+++ b/gfx/trainers/archer.png
--- a/gfx/trainers/ariana.png
+++ b/gfx/trainers/ariana.png
--- a/gfx/trainers/blue_professor.png
+++ b/gfx/trainers/blue_professor.png
--- a/gfx/trainers/cal.png
+++ b/gfx/trainers/cal.png
--- a/gfx/trainers/giovanni.png
+++ b/gfx/trainers/giovanni.png
--- a/gfx/trainers/giovanni3.png
+++ b/gfx/trainers/giovanni3.png
--- a/gfx/trainers/giovanni_coat.png
+++ b/gfx/trainers/giovanni_coat.png
--- a/gfx/trainers/green.png
+++ b/gfx/trainers/green.png
--- a/gfx/trainers/imposter_oak.png
+++ b/gfx/trainers/imposter_oak.png
--- a/gfx/trainers/imposteroak.png
+++ b/gfx/trainers/imposteroak.png
--- a/gfx/trainers/impostor_oak.png
+++ b/gfx/trainers/impostor_oak.png