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

gfx/pics.asm

@@ -1032,4 +1032,12 @@ IronThornsBackpic:	 INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
 OrfryFrontpic:	 INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
 OrfryBackpic:	 INCBIN "gfx/pokemon/orfry/back.2bpp.lz"
 TogekissFrontpic:	 INCBIN "gfx/pokemon/togekiss/front.animated.2bpp.lz"
-TogekissBackpic:	 INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"
+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"
+AgathaPic: INCBIN "gfx/trainers/agatha.2bpp.lz"
+Giovanni3Pic: INCBIN "gfx/trainers/giovanni3.2bpp.lz"
+GreenPic: INCBIN "gfx/trainers/green.2bpp.lz"
+KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"

gfx/pokemon/geodudealola/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/geodudealola/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/geodudealola/shiny.pal

@@ -0,0 +1,3 @@
+
+	RGB 255, 157, 61
+	RGB 165, 60, 24

gfx/sprites.asm

@@ -114,4 +114,38 @@ EnbySpriteGFX::                INCBIN "gfx/sprites/enby.2bpp"
 EnbyBikeSpriteGFX::            INCBIN "gfx/sprites/enby_bike.2bpp"
 ChrisRunSpriteGFX::            INCBIN "gfx/sprites/chris_run.2bpp"
 KrisRunSpriteGFX::             INCBIN "gfx/sprites/kris_run.2bpp"
-TopazRunSpriteGFX::             INCBIN "gfx/sprites/topaz_run.2bpp"
+TopazRunSpriteGFX::             INCBIN "gfx/sprites/topaz_run.2bpp"
+
+; SW97 Imports
+TsukushiGFX::             INCBIN "gfx/sprites/tsukushi.2bpp"
+MikanGFX::             INCBIN "gfx/sprites/mikan.2bpp"
+MediumSpriteGFX::             INCBIN "gfx/sprites/medium.2bpp"
+AgathaGFX::             INCBIN "gfx/sprites/agatha.2bpp"
+HelmetBikerGFX::             INCBIN "gfx/sprites/helmet.2bpp"
+WalkerGFX::             INCBIN "gfx/sprites/hayato.2bpp"
+SpaceworldGirlGFX::             INCBIN "gfx/sprites/girl.2bpp"
+BanchomanGFX::             INCBIN "gfx/sprites/frowning_man.2bpp"
+EnokiGFX::             INCBIN "gfx/sprites/enoki.2bpp"
+ImposterOakGFX::             INCBIN "gfx/sprites/evil_okido.2bpp"
+GoldSkateboardGFX::             INCBIN "gfx/sprites/gold_skateboard.2bpp"
+SilverSisterGFX::             INCBIN "gfx/sprites/silvers_sister.2bpp"
+
+SECTION "Sprites 4", ROMX ; KEP Imports go in this bank.
+VoltorbGFX::             INCBIN "gfx/sprites/voltorb.2bpp"
+SmallBirdGFX::             INCBIN "gfx/sprites/smallbird.2bpp"
+OfficerJennyGFX::             INCBIN "gfx/sprites/officer_jenny.2bpp"
+KoffingGFX::             INCBIN "gfx/sprites/koffing.2bpp"
+JessieGFX::             INCBIN "gfx/sprites/jessie.2bpp"
+JamesGFX::             INCBIN "gfx/sprites/james.2bpp"
+GengarGFX::             INCBIN "gfx/sprites/gengar.2bpp"
+GreenGFX::             INCBIN "gfx/sprites/green.2bpp"
+DiglettGFX::             INCBIN "gfx/sprites/diglett.2bpp"
+CatGFX::             INCBIN "gfx/sprites/cat.2bpp"
+ArbokGFX::             INCBIN "gfx/sprites/arbok.2bpp"
+BaobaGFX::             INCBIN "gfx/sprites/warden.2bpp"
+SilphChiefGFX::             INCBIN "gfx/sprites/silph_president.2bpp"
+SafariZoneWorkerGFX::             INCBIN "gfx/sprites/safari_zone_worker.2bpp"
+LoreleiGFX::             INCBIN "gfx/sprites/lorelei.2bpp"
+GiovanniGFX::             INCBIN "gfx/sprites/giovanni.2bpp"
+ChannelerGFX::             INCBIN "gfx/sprites/channeler.2bpp"
+BaldingGuyGFX::             INCBIN "gfx/sprites/balding_guy.2bpp"