Merge branch 'master' into master

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

View file

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

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

View file

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

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"

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

View file

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

View file

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

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"

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"