thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 • committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gfx/footprints.asm
View file

@ -1,6 +1,6 @@
Footprints:
table_width LEN_1BPP_TILE * 4, Footprints
; don't forget to update assert_table_length
INCBIN "gfx/footprints/bulbasaur.1bpp"
INCBIN "gfx/footprints/ivysaur.1bpp"
INCBIN "gfx/footprints/venusaur.1bpp"
@ -27,6 +27,7 @@ INCBIN "gfx/footprints/ekans.1bpp"
INCBIN "gfx/footprints/arbok.1bpp"
INCBIN "gfx/footprints/pikachu.1bpp"
INCBIN "gfx/footprints/raichu.1bpp"
INCBIN "gfx/footprints/gorochu.1bpp"
INCBIN "gfx/footprints/sandshrew.1bpp"
INCBIN "gfx/footprints/sandslash.1bpp"
INCBIN "gfx/footprints/nidoran_f.1bpp"
@ -267,4 +268,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp"
assert_table_length $109 ; don't forget to update this
assert_table_length $110 ; don't forget to update this

BIN
gfx/footprints/gorochu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 B

5
gfx/pics.asm
View file

@ -777,3 +777,8 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
SECTION "Pics 20", ROMX
GorochuFrontpic: INCBIN "gfx/pokemon/gorochu/front.animated.2bpp.lz"
GorochuBackpic: INCBIN "gfx/pokemon/gorochu/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -26,6 +26,7 @@ AnimationPointers:
dw ArbokAnimation
dw PikachuAnimation
dw RaichuAnimation
dw GorochuAnimation
dw SandshrewAnimation
dw SandslashAnimation
dw NidoranFAnimation

1
gfx/pokemon/anims.asm
View file

@ -24,6 +24,7 @@ EkansAnimation: INCLUDE "gfx/pokemon/ekans/anim.asm"
ArbokAnimation: INCLUDE "gfx/pokemon/arbok/anim.asm"
PikachuAnimation: INCLUDE "gfx/pokemon/pikachu/anim.asm"
RaichuAnimation: INCLUDE "gfx/pokemon/raichu/anim.asm"
GorochuAnimation: INCLUDE "gfx/pokemon/gorochu/anim.asm"
SandshrewAnimation: INCLUDE "gfx/pokemon/sandshrew/anim.asm"
SandslashAnimation: INCLUDE "gfx/pokemon/sandslash/anim.asm"
NidoranFAnimation: INCLUDE "gfx/pokemon/nidoran_f/anim.asm"

BIN
gfx/pokemon/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -26,6 +26,7 @@ BitmasksPointers:
dw ArbokBitmasks
dw PikachuBitmasks
dw RaichuBitmasks
dw GorochuBitmasks
dw SandshrewBitmasks
dw SandslashBitmasks
dw NidoranFBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -24,6 +24,7 @@ EkansBitmasks: INCLUDE "gfx/pokemon/ekans/bitmask.asm"
ArbokBitmasks: INCLUDE "gfx/pokemon/arbok/bitmask.asm"
PikachuBitmasks: INCLUDE "gfx/pokemon/pikachu/bitmask.asm"
RaichuBitmasks: INCLUDE "gfx/pokemon/raichu/bitmask.asm"
GorochuBitmasks: INCLUDE "gfx/pokemon/gorochu/bitmask.asm"
SandshrewBitmasks: INCLUDE "gfx/pokemon/sandshrew/bitmask.asm"
SandslashBitmasks: INCLUDE "gfx/pokemon/sandslash/bitmask.asm"
NidoranFBitmasks: INCLUDE "gfx/pokemon/nidoran_f/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -26,6 +26,7 @@ FramesPointers:
dba ArbokFrames
dba PikachuFrames
dba RaichuFrames
dba GorochuFrames
dba SandshrewFrames
dba SandslashFrames
dba NidoranFFrames

BIN
gfx/pokemon/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

1
gfx/pokemon/gorochu/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/gorochu/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/gorochu/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/gorochu/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/gorochu/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

1
gfx/pokemon/idle_pointers.asm
View file

@ -26,6 +26,7 @@ AnimationIdlePointers:
dw ArbokAnimationIdle
dw PikachuAnimationIdle
dw RaichuAnimationIdle
dw GorochuAnimationIdle
dw SandshrewAnimationIdle
dw SandslashAnimationIdle
dw NidoranFAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -24,6 +24,7 @@ EkansAnimationIdle: INCLUDE "gfx/pokemon/ekans/anim_idle.asm"
ArbokAnimationIdle: INCLUDE "gfx/pokemon/arbok/anim_idle.asm"
PikachuAnimationIdle: INCLUDE "gfx/pokemon/pikachu/anim_idle.asm"
RaichuAnimationIdle: INCLUDE "gfx/pokemon/raichu/anim_idle.asm"
GorochuAnimationIdle: INCLUDE "gfx/pokemon/gorochu/anim_idle.asm"
SandshrewAnimationIdle: INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm"
SandslashAnimationIdle: INCLUDE "gfx/pokemon/sandslash/anim_idle.asm"
NidoranFAnimationIdle: INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -26,6 +26,7 @@ EkansFrames: INCLUDE "gfx/pokemon/ekans/frames.asm"
ArbokFrames: INCLUDE "gfx/pokemon/arbok/frames.asm"
PikachuFrames: INCLUDE "gfx/pokemon/pikachu/frames.asm"
RaichuFrames: INCLUDE "gfx/pokemon/raichu/frames.asm"
GorochuFrames: INCLUDE "gfx/pokemon/gorochu/frames.asm"
SandshrewFrames: INCLUDE "gfx/pokemon/sandshrew/frames.asm"
SandslashFrames: INCLUDE "gfx/pokemon/sandslash/frames.asm"
NidoranFFrames: INCLUDE "gfx/pokemon/nidoran_f/frames.asm"