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

@ -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"