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

2026-02-06 16:15:24 +13:00 · 2023-10-26 15:26:09 -04:00 · 2023-10-26 15:26:09 -04:00 · a8a942cefb
commit a8a942cefb
parent 7f7ff6dc0b a4854f63ba
57 changed files with 501 additions and 34 deletions
--- a/gfx/footprints.asm
+++ b/gfx/footprints.asm
@ -72,6 +72,7 @@ INCBIN "gfx/footprints/machamp.1bpp"
 INCBIN "gfx/footprints/bellsprout.1bpp"
 INCBIN "gfx/footprints/weepinbell.1bpp"
 INCBIN "gfx/footprints/victreebel.1bpp"
+;INCBIN "gfx/footprints/bellignan.1bpp"
 INCBIN "gfx/footprints/tentacool.1bpp"
 INCBIN "gfx/footprints/tentacruel.1bpp"
 INCBIN "gfx/footprints/geodude.1bpp"
--- a/gfx/footprints/bellignan.png
+++ b/gfx/footprints/bellignan.png
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@ -717,6 +717,8 @@ TotartleFrontpic:    INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
 TotartleBackpic:     INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
 BlastykeFrontpic:    INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
 BlastykeBackpic:     INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
+BellignanFrontpic:	 INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
+BellignanBackpic:	 INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
 INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
 INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
 INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
--- a/gfx/pokemon/anim_pointers.asm
+++ b/gfx/pokemon/anim_pointers.asm
@ -71,6 +71,7 @@ AnimationPointers:
 	dw BellsproutAnimation
 	dw WeepinbellAnimation
 	dw VictreebelAnimation
+	dw BellignanAnimation
 	dw TentacoolAnimation
 	dw TentacruelAnimation
 	dw GeodudeAnimation
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@ -69,6 +69,7 @@ MachampAnimation:    INCLUDE "gfx/pokemon/machamp/anim.asm"
 BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm"
 WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm"
 VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm"
+BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm"
 TentacoolAnimation:  INCLUDE "gfx/pokemon/tentacool/anim.asm"
 TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm"
 GeodudeAnimation:    INCLUDE "gfx/pokemon/geodude/anim.asm"
--- a/gfx/pokemon/bellignan/anim.asm
+++ b/gfx/pokemon/bellignan/anim.asm
@ -0,0 +1,19 @@
+	frame  0, 06
+	frame  1, 06
+	frame  2, 04
+	frame  3, 04
+	frame  4, 08
+	frame  5, 08
+	frame  6, 08
+	frame  7, 08
+	frame  1, 06
+	frame  2, 10
+	frame  8, 08
+	frame  9, 08
+	frame 10, 08
+	frame 11, 08
+	frame  9, 08
+	frame 11, 08
+	frame  9, 08
+	frame 11, 08
+	endanim
--- a/gfx/pokemon/bellignan/anim_idle.asm
+++ b/gfx/pokemon/bellignan/anim_idle.asm
@ -0,0 +1 @@
+	endanim
--- a/gfx/pokemon/bellignan/back.png
+++ b/gfx/pokemon/bellignan/back.png
--- a/gfx/pokemon/bellignan/front.png
+++ b/gfx/pokemon/bellignan/front.png
--- a/gfx/pokemon/bellignan/readme.txt
+++ b/gfx/pokemon/bellignan/readme.txt
@ -0,0 +1,2 @@
+This spritework is taken from Pokemon October, which finished Game Freak's design.
+https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx/pokemon/bellignan
--- a/gfx/pokemon/bellignan/shiny.pal
+++ b/gfx/pokemon/bellignan/shiny.pal
@ -0,0 +1,2 @@
+	RGB 20, 23, 03
+	RGB 14, 12, 31
--- a/gfx/pokemon/bitmask_pointers.asm
+++ b/gfx/pokemon/bitmask_pointers.asm
@ -71,6 +71,7 @@ BitmasksPointers:
 	dw BellsproutBitmasks
 	dw WeepinbellBitmasks
 	dw VictreebelBitmasks
+	dw BellignanBitmasks
 	dw TentacoolBitmasks
 	dw TentacruelBitmasks
 	dw GeodudeBitmasks
--- a/gfx/pokemon/bitmasks.asm
+++ b/gfx/pokemon/bitmasks.asm
@ -69,6 +69,7 @@ MachampBitmasks:    INCLUDE "gfx/pokemon/machamp/bitmask.asm"
 BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm"
 WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm"
 VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm"
+BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm"
 TentacoolBitmasks:  INCLUDE "gfx/pokemon/tentacool/bitmask.asm"
 TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm"
 GeodudeBitmasks:    INCLUDE "gfx/pokemon/geodude/bitmask.asm"
--- a/gfx/pokemon/blastyke/back.png
+++ b/gfx/pokemon/blastyke/back.png
--- a/gfx/pokemon/blastyke/front.png
+++ b/gfx/pokemon/blastyke/front.png
--- a/gfx/pokemon/frame_pointers.asm
+++ b/gfx/pokemon/frame_pointers.asm
@ -71,6 +71,7 @@ FramesPointers:
 	dba BellsproutFrames
 	dba WeepinbellFrames
 	dba VictreebelFrames
+	dba BellignanFrames
 	dba TentacoolFrames
 	dba TentacruelFrames
 	dba GeodudeFrames
--- a/gfx/pokemon/idle_pointers.asm
+++ b/gfx/pokemon/idle_pointers.asm
@ -71,6 +71,7 @@ AnimationIdlePointers:
 	dw BellsproutAnimationIdle
 	dw WeepinbellAnimationIdle
 	dw VictreebelAnimationIdle
+	dw BellignanAnimationIdle
 	dw TentacoolAnimationIdle
 	dw TentacruelAnimationIdle
 	dw GeodudeAnimationIdle
--- a/gfx/pokemon/idles.asm
+++ b/gfx/pokemon/idles.asm
@ -69,6 +69,7 @@ MachampAnimationIdle:    INCLUDE "gfx/pokemon/machamp/anim_idle.asm"
 BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm"
 WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm"
 VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
+BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
 TentacoolAnimationIdle:  INCLUDE "gfx/pokemon/tentacool/anim_idle.asm"
 TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm"
 GeodudeAnimationIdle:    INCLUDE "gfx/pokemon/geodude/anim_idle.asm"
--- a/gfx/pokemon/kanto_frames.asm
+++ b/gfx/pokemon/kanto_frames.asm
@ -71,6 +71,7 @@ MachampFrames:    INCLUDE "gfx/pokemon/machamp/frames.asm"
 BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm"
 WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm"
 VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm"
+BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm"
 TentacoolFrames:  INCLUDE "gfx/pokemon/tentacool/frames.asm"
 TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm"
 GeodudeFrames:    INCLUDE "gfx/pokemon/geodude/frames.asm"
--- a/gfx/pokemon/totartle/back.png
+++ b/gfx/pokemon/totartle/back.png
--- a/gfx/pokemon/totartle/front.png
+++ b/gfx/pokemon/totartle/front.png