mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-06 16:15:24 +13:00
Merge branch 'master' of https://github.com/ZetaNull/jep-hack
This commit is contained in:
commit
05e2cdc3d2
46 changed files with 215 additions and 60 deletions
|
|
@ -9,7 +9,7 @@ INCBIN "gfx/footprints/charmeleon.1bpp"
|
|||
INCBIN "gfx/footprints/charizard.1bpp"
|
||||
INCBIN "gfx/footprints/squirtle.1bpp"
|
||||
INCBIN "gfx/footprints/wartortle.1bpp"
|
||||
INCBIN "gfx/footprints/blastoise.1bpp"
|
||||
INCBIN "gfx/footprints/totartle.1bpp"
|
||||
INCBIN "gfx/footprints/caterpie.1bpp"
|
||||
INCBIN "gfx/footprints/metapod.1bpp"
|
||||
INCBIN "gfx/footprints/butterfree.1bpp"
|
||||
|
|
@ -118,6 +118,8 @@ INCBIN "gfx/footprints/tangela.1bpp"
|
|||
INCBIN "gfx/footprints/kangaskhan.1bpp"
|
||||
INCBIN "gfx/footprints/horsea.1bpp"
|
||||
INCBIN "gfx/footprints/seadra.1bpp"
|
||||
INCBIN "gfx/footprints/blastyke.1bpp"
|
||||
INCBIN "gfx/footprints/blastoise.1bpp"
|
||||
INCBIN "gfx/footprints/goldeen.1bpp"
|
||||
INCBIN "gfx/footprints/seaking.1bpp"
|
||||
INCBIN "gfx/footprints/staryu.1bpp"
|
||||
|
|
@ -258,4 +260,4 @@ INCBIN "gfx/footprints/254.1bpp"
|
|||
INCBIN "gfx/footprints/255.1bpp"
|
||||
INCBIN "gfx/footprints/256.1bpp"
|
||||
|
||||
assert_table_length $100
|
||||
assert_table_length $102
|
||||
|
|
|
|||
BIN
gfx/footprints/blastyke.png
Normal file
BIN
gfx/footprints/blastyke.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 108 B |
BIN
gfx/footprints/totartle.png
Normal file
BIN
gfx/footprints/totartle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 100 B |
|
|
@ -713,10 +713,10 @@ SECTION "Pics 19", ROMX
|
|||
|
||||
; Seems to be an accidental copy of the previous bank
|
||||
|
||||
INCBIN "gfx/pokemon/spinarak/back.2bpp.lz"
|
||||
INCBIN "gfx/pokemon/raikou/back.2bpp.lz"
|
||||
INCBIN "gfx/pokemon/unown_k/front.animated.2bpp.lz"
|
||||
INCBIN "gfx/pokemon/houndour/back.2bpp.lz"
|
||||
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"
|
||||
INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
|
||||
INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
|
||||
INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ AnimationPointers:
|
|||
dw CharizardAnimation
|
||||
dw SquirtleAnimation
|
||||
dw WartortleAnimation
|
||||
dw BlastoiseAnimation
|
||||
dw TotartleAnimation
|
||||
dw CaterpieAnimation
|
||||
dw MetapodAnimation
|
||||
dw ButterfreeAnimation
|
||||
|
|
@ -117,6 +117,8 @@ AnimationPointers:
|
|||
dw KangaskhanAnimation
|
||||
dw HorseaAnimation
|
||||
dw SeadraAnimation
|
||||
dw BlastykeAnimation
|
||||
dw BlastoiseAnimation
|
||||
dw GoldeenAnimation
|
||||
dw SeakingAnimation
|
||||
dw StaryuAnimation
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm"
|
|||
CharizardAnimation: INCLUDE "gfx/pokemon/charizard/anim.asm"
|
||||
SquirtleAnimation: INCLUDE "gfx/pokemon/squirtle/anim.asm"
|
||||
WartortleAnimation: INCLUDE "gfx/pokemon/wartortle/anim.asm"
|
||||
BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm"
|
||||
TotartleAnimation: INCLUDE "gfx/pokemon/totartle/anim.asm"
|
||||
CaterpieAnimation: INCLUDE "gfx/pokemon/caterpie/anim.asm"
|
||||
MetapodAnimation: INCLUDE "gfx/pokemon/metapod/anim.asm"
|
||||
ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm"
|
||||
|
|
@ -115,6 +115,8 @@ TangelaAnimation: INCLUDE "gfx/pokemon/tangela/anim.asm"
|
|||
KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm"
|
||||
HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm"
|
||||
SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm"
|
||||
BlastykeAnimation: INCLUDE "gfx/pokemon/blastyke/anim.asm"
|
||||
BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm"
|
||||
GoldeenAnimation: INCLUDE "gfx/pokemon/goldeen/anim.asm"
|
||||
SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm"
|
||||
StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ BitmasksPointers:
|
|||
dw CharizardBitmasks
|
||||
dw SquirtleBitmasks
|
||||
dw WartortleBitmasks
|
||||
dw BlastoiseBitmasks
|
||||
dw TotartleBitmasks
|
||||
dw CaterpieBitmasks
|
||||
dw MetapodBitmasks
|
||||
dw ButterfreeBitmasks
|
||||
|
|
@ -117,6 +117,8 @@ BitmasksPointers:
|
|||
dw KangaskhanBitmasks
|
||||
dw HorseaBitmasks
|
||||
dw SeadraBitmasks
|
||||
dw BlastykeBitmasks
|
||||
dw BlastoiseBitmasks
|
||||
dw GoldeenBitmasks
|
||||
dw SeakingBitmasks
|
||||
dw StaryuBitmasks
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm"
|
|||
CharizardBitmasks: INCLUDE "gfx/pokemon/charizard/bitmask.asm"
|
||||
SquirtleBitmasks: INCLUDE "gfx/pokemon/squirtle/bitmask.asm"
|
||||
WartortleBitmasks: INCLUDE "gfx/pokemon/wartortle/bitmask.asm"
|
||||
BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm"
|
||||
TotartleBitmasks: INCLUDE "gfx/pokemon/totartle/bitmask.asm"
|
||||
CaterpieBitmasks: INCLUDE "gfx/pokemon/caterpie/bitmask.asm"
|
||||
MetapodBitmasks: INCLUDE "gfx/pokemon/metapod/bitmask.asm"
|
||||
ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm"
|
||||
|
|
@ -115,6 +115,8 @@ TangelaBitmasks: INCLUDE "gfx/pokemon/tangela/bitmask.asm"
|
|||
KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm"
|
||||
HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm"
|
||||
SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm"
|
||||
BlastykeBitmasks: INCLUDE "gfx/pokemon/blastyke/bitmask.asm"
|
||||
BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm"
|
||||
GoldeenBitmasks: INCLUDE "gfx/pokemon/goldeen/bitmask.asm"
|
||||
SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm"
|
||||
StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm"
|
||||
|
|
|
|||
1
gfx/pokemon/blastyke/anim.asm
Normal file
1
gfx/pokemon/blastyke/anim.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
1
gfx/pokemon/blastyke/anim_idle.asm
Normal file
1
gfx/pokemon/blastyke/anim_idle.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
BIN
gfx/pokemon/blastyke/back.png
Normal file
BIN
gfx/pokemon/blastyke/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
BIN
gfx/pokemon/blastyke/front.png
Normal file
BIN
gfx/pokemon/blastyke/front.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
0
gfx/pokemon/blastyke/pallete.txt
Normal file
0
gfx/pokemon/blastyke/pallete.txt
Normal file
4
gfx/pokemon/blastyke/shiny.pal
Normal file
4
gfx/pokemon/blastyke/shiny.pal
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
|
||||
RGB 14, 21, 07
|
||||
RGB 16, 16, 20
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ FramesPointers:
|
|||
dba CharizardFrames
|
||||
dba SquirtleFrames
|
||||
dba WartortleFrames
|
||||
dba BlastoiseFrames
|
||||
dba TotartleFrames
|
||||
dba CaterpieFrames
|
||||
dba MetapodFrames
|
||||
dba ButterfreeFrames
|
||||
|
|
@ -117,6 +117,8 @@ FramesPointers:
|
|||
dba KangaskhanFrames
|
||||
dba HorseaFrames
|
||||
dba SeadraFrames
|
||||
dba BlastykeFrames
|
||||
dba BlastoiseFrames
|
||||
dba GoldeenFrames
|
||||
dba SeakingFrames
|
||||
dba StaryuFrames
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ AnimationIdlePointers:
|
|||
dw CharizardAnimationIdle
|
||||
dw SquirtleAnimationIdle
|
||||
dw WartortleAnimationIdle
|
||||
dw BlastoiseAnimationIdle
|
||||
dw TotartleAnimationIdle
|
||||
dw CaterpieAnimationIdle
|
||||
dw MetapodAnimationIdle
|
||||
dw ButterfreeAnimationIdle
|
||||
|
|
@ -117,6 +117,8 @@ AnimationIdlePointers:
|
|||
dw KangaskhanAnimationIdle
|
||||
dw HorseaAnimationIdle
|
||||
dw SeadraAnimationIdle
|
||||
dw BlastykeAnimationIdle
|
||||
dw BlastoiseAnimationIdle
|
||||
dw GoldeenAnimationIdle
|
||||
dw SeakingAnimationIdle
|
||||
dw StaryuAnimationIdle
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm"
|
|||
CharizardAnimationIdle: INCLUDE "gfx/pokemon/charizard/anim_idle.asm"
|
||||
SquirtleAnimationIdle: INCLUDE "gfx/pokemon/squirtle/anim_idle.asm"
|
||||
WartortleAnimationIdle: INCLUDE "gfx/pokemon/wartortle/anim_idle.asm"
|
||||
BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm"
|
||||
TotartleAnimationIdle: INCLUDE "gfx/pokemon/totartle/anim_idle.asm"
|
||||
CaterpieAnimationIdle: INCLUDE "gfx/pokemon/caterpie/anim_idle.asm"
|
||||
MetapodAnimationIdle: INCLUDE "gfx/pokemon/metapod/anim_idle.asm"
|
||||
ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm"
|
||||
|
|
@ -115,6 +115,8 @@ TangelaAnimationIdle: INCLUDE "gfx/pokemon/tangela/anim_idle.asm"
|
|||
KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm"
|
||||
HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm"
|
||||
SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/anim_idle.asm"
|
||||
BlastykeAnimationIdle: INCLUDE "gfx/pokemon/blastyke/anim_idle.asm"
|
||||
BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm"
|
||||
GoldeenAnimationIdle: INCLUDE "gfx/pokemon/goldeen/anim_idle.asm"
|
||||
SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm"
|
||||
StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm"
|
|||
CharizardFrames: INCLUDE "gfx/pokemon/charizard/frames.asm"
|
||||
SquirtleFrames: INCLUDE "gfx/pokemon/squirtle/frames.asm"
|
||||
WartortleFrames: INCLUDE "gfx/pokemon/wartortle/frames.asm"
|
||||
BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm"
|
||||
TotartleFrames: INCLUDE "gfx/pokemon/totartle/frames.asm"
|
||||
CaterpieFrames: INCLUDE "gfx/pokemon/caterpie/frames.asm"
|
||||
MetapodFrames: INCLUDE "gfx/pokemon/metapod/frames.asm"
|
||||
ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm"
|
||||
|
|
@ -117,6 +117,8 @@ TangelaFrames: INCLUDE "gfx/pokemon/tangela/frames.asm"
|
|||
KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm"
|
||||
HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm"
|
||||
SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm"
|
||||
BlastykeFrames: INCLUDE "gfx/pokemon/blastyke/frames.asm"
|
||||
BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm"
|
||||
GoldeenFrames: INCLUDE "gfx/pokemon/goldeen/frames.asm"
|
||||
SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm"
|
||||
StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm"
|
||||
|
|
|
|||
1
gfx/pokemon/totartle/anim.asm
Normal file
1
gfx/pokemon/totartle/anim.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
1
gfx/pokemon/totartle/anim_idle.asm
Normal file
1
gfx/pokemon/totartle/anim_idle.asm
Normal file
|
|
@ -0,0 +1 @@
|
|||
endanim
|
||||
BIN
gfx/pokemon/totartle/back.png
Normal file
BIN
gfx/pokemon/totartle/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
BIN
gfx/pokemon/totartle/front.png
Normal file
BIN
gfx/pokemon/totartle/front.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 870 B |
2
gfx/pokemon/totartle/shiny.pal
Normal file
2
gfx/pokemon/totartle/shiny.pal
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
RGB 16, 25, 8
|
||||
RGB 24, 17, 31
|
||||
Loading…
Add table
Add a link
Reference in a new issue