Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Misty 2023-10-29 18:08:50 -04:00
commit 5d1bf81944
154 changed files with 1200 additions and 184 deletions

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"
@ -16,6 +16,13 @@ INCBIN "gfx/footprints/butterfree.1bpp"
INCBIN "gfx/footprints/weedle.1bpp"
INCBIN "gfx/footprints/kakuna.1bpp"
INCBIN "gfx/footprints/beedrill.1bpp"
INCBIN "gfx/footprints/gentlarva.1bpp"
INCBIN "gfx/footprints/pupal.1bpp"
INCBIN "gfx/footprints/carapthor.1bpp"
INCBIN "gfx/footprints/kotora.1bpp"
INCBIN "gfx/footprints/gaotora.1bpp"
INCBIN "gfx/footprints/gorotora.1bpp"
INCBIN "gfx/footprints/raitora.1bpp"
INCBIN "gfx/footprints/pidgey.1bpp"
INCBIN "gfx/footprints/pidgeotto.1bpp"
INCBIN "gfx/footprints/pidgeot.1bpp"
@ -39,27 +46,34 @@ INCBIN "gfx/footprints/nidoking.1bpp"
INCBIN "gfx/footprints/nidoreign.1bpp"
INCBIN "gfx/footprints/clefairy.1bpp"
INCBIN "gfx/footprints/clefable.1bpp"
INCBIN "gfx/footprints/vulpiii.1bpp"
INCBIN "gfx/footprints/vulpix.1bpp"
INCBIN "gfx/footprints/ninetales.1bpp"
INCBIN "gfx/footprints/jigglypuff.1bpp"
INCBIN "gfx/footprints/wigglytuff.1bpp"
INCBIN "gfx/footprints/bittybat.1bpp"
INCBIN "gfx/footprints/zubat.1bpp"
INCBIN "gfx/footprints/golbat.1bpp"
INCBIN "gfx/footprints/oddish.1bpp"
INCBIN "gfx/footprints/gloom.1bpp"
INCBIN "gfx/footprints/vileplume.1bpp"
INCBIN "gfx/footprints/paraspor.1bpp"
INCBIN "gfx/footprints/paras.1bpp"
INCBIN "gfx/footprints/parasect.1bpp"
INCBIN "gfx/footprints/venonat.1bpp"
INCBIN "gfx/footprints/venomoth.1bpp"
INCBIN "gfx/footprints/diglett.1bpp"
INCBIN "gfx/footprints/dugtrio.1bpp"
INCBIN "gfx/footprints/coinpur.1bpp"
INCBIN "gfx/footprints/meowth.1bpp"
INCBIN "gfx/footprints/persian.1bpp"
INCBIN "gfx/footprints/perrserker.1bpp"
INCBIN "gfx/footprints/psyduck.1bpp"
INCBIN "gfx/footprints/golduck.1bpp"
INCBIN "gfx/footprints/mankey.1bpp"
INCBIN "gfx/footprints/primeape.1bpp"
INCBIN "gfx/footprints/annihilape.1bpp"
INCBIN "gfx/footprints/pupperon.1bpp"
INCBIN "gfx/footprints/growlithe.1bpp"
INCBIN "gfx/footprints/arcanine.1bpp"
INCBIN "gfx/footprints/poliwag.1bpp"
@ -211,6 +225,9 @@ INCBIN "gfx/footprints/wooper.1bpp"
INCBIN "gfx/footprints/quagsire.1bpp"
INCBIN "gfx/footprints/espeon.1bpp"
INCBIN "gfx/footprints/umbreon.1bpp"
INCBIN "gfx/footprints/leafeon.1bpp"
INCBIN "gfx/footprints/glaceon.1bpp"
INCBIN "gfx/footprints/sylveon.1bpp"
INCBIN "gfx/footprints/murkrow.1bpp"
INCBIN "gfx/footprints/slowking.1bpp"
INCBIN "gfx/footprints/misdreavus.1bpp"
@ -273,4 +290,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp"
assert_table_length $10F ; don't forget to update this
assert_table_length NUM_POKEMON + 5 ; The +5 accounts for the 5 glitch footprints

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 B

BIN
gfx/footprints/bittybat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 B

BIN
gfx/footprints/coinpur.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 B

BIN
gfx/footprints/gaotora.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 B

BIN
gfx/footprints/glaceon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

BIN
gfx/footprints/gorotora.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

BIN
gfx/footprints/kotora.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

BIN
gfx/footprints/leafeon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

BIN
gfx/footprints/paraspor.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 B

BIN
gfx/footprints/pupal.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

BIN
gfx/footprints/pupperon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 B

BIN
gfx/footprints/raitora.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

BIN
gfx/footprints/sylveon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

BIN
gfx/footprints/vulpiii.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

View file

@ -746,3 +746,37 @@ SECTION "Pics 20", ROMX
GorochuFrontpic: INCBIN "gfx/pokemon/gorochu/front.animated.2bpp.lz"
GorochuBackpic: INCBIN "gfx/pokemon/gorochu/back.2bpp.lz"
LeafeonFrontpic: INCBIN "gfx/pokemon/leafeon/front.animated.2bpp.lz"
LeafeonBackpic: INCBIN "gfx/pokemon/leafeon/back.2bpp.lz"
GlaceonFrontpic: INCBIN "gfx/pokemon/glaceon/front.animated.2bpp.lz"
GlaceonBackpic: INCBIN "gfx/pokemon/glaceon/back.2bpp.lz"
SylveonFrontpic: INCBIN "gfx/pokemon/sylveon/front.animated.2bpp.lz"
SylveonBackpic: INCBIN "gfx/pokemon/sylveon/back.2bpp.lz"
CoinpurFrontpic: INCBIN "gfx/pokemon/coinpur/front.animated.2bpp.lz"
CoinpurBackpic: INCBIN "gfx/pokemon/coinpur/back.2bpp.lz"
PerrserkerFrontpic: INCBIN "gfx/pokemon/perrserker/front.animated.2bpp.lz"
PerrserkerBackpic: INCBIN "gfx/pokemon/perrserker/back.2bpp.lz"
GentlarvaFrontpic: INCBIN "gfx/pokemon/gentlarva/front.animated.2bpp.lz"
GentlarvaBackpic: INCBIN "gfx/pokemon/gentlarva/back.2bpp.lz"
PupalFrontpic: INCBIN "gfx/pokemon/pupal/front.animated.2bpp.lz"
PupalBackpic: INCBIN "gfx/pokemon/pupal/back.2bpp.lz"
CarapthorFrontpic: INCBIN "gfx/pokemon/carapthor/front.animated.2bpp.lz"
CarapthorBackpic: INCBIN "gfx/pokemon/carapthor/back.2bpp.lz"
KotoraFrontpic: INCBIN "gfx/pokemon/kotora/front.animated.2bpp.lz"
KotoraBackpic: INCBIN "gfx/pokemon/kotora/back.2bpp.lz"
GaotoraFrontpic: INCBIN "gfx/pokemon/gaotora/front.animated.2bpp.lz"
GaotoraBackpic: INCBIN "gfx/pokemon/gaotora/back.2bpp.lz"
GorotoraFrontpic: INCBIN "gfx/pokemon/gorotora/front.animated.2bpp.lz"
GorotoraBackpic: INCBIN "gfx/pokemon/gorotora/back.2bpp.lz"
RaitoraFrontpic: INCBIN "gfx/pokemon/raitora/front.animated.2bpp.lz"
RaitoraBackpic: INCBIN "gfx/pokemon/raitora/back.2bpp.lz"
BittybatFrontpic: INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz"
BittybatBackpic: INCBIN "gfx/pokemon/bittybat/back.2bpp.lz"
ParasporFrontpic: INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz"
ParasporBackpic: INCBIN "gfx/pokemon/paraspor/back.2bpp.lz"
VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz"
VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz"
AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz"
AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz"
PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz"
PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz"

View file

@ -15,6 +15,13 @@ AnimationPointers:
dw WeedleAnimation
dw KakunaAnimation
dw BeedrillAnimation
dw GentlarvaAnimation
dw PupalAnimation
dw CarapthorAnimation
dw KotoraAnimation
dw GaotoraAnimation
dw GorotoraAnimation
dw RaitoraAnimation
dw PidgeyAnimation
dw PidgeottoAnimation
dw PidgeotAnimation
@ -38,27 +45,34 @@ AnimationPointers:
dw NidoreignAnimation
dw ClefairyAnimation
dw ClefableAnimation
dw VulpiiiAnimation
dw VulpixAnimation
dw NinetalesAnimation
dw JigglypuffAnimation
dw WigglytuffAnimation
dw BittybatAnimation
dw ZubatAnimation
dw GolbatAnimation
dw OddishAnimation
dw GloomAnimation
dw VileplumeAnimation
dw ParasporAnimation
dw ParasAnimation
dw ParasectAnimation
dw VenonatAnimation
dw VenomothAnimation
dw DiglettAnimation
dw DugtrioAnimation
dw CoinpurAnimation
dw MeowthAnimation
dw PersianAnimation
dw PerrserkerAnimation
dw PsyduckAnimation
dw GolduckAnimation
dw MankeyAnimation
dw PrimeapeAnimation
dw AnnihilapeAnimation
dw PupperonAnimation
dw GrowlitheAnimation
dw ArcanineAnimation
dw PoliwagAnimation
@ -210,6 +224,9 @@ AnimationPointers:
dw QuagsireAnimation
dw EspeonAnimation
dw UmbreonAnimation
dw LeafeonAnimation
dw GlaceonAnimation
dw SylveonAnimation
dw MurkrowAnimation
dw SlowkingAnimation
dw MisdreavusAnimation

View file

@ -13,6 +13,13 @@ ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm"
WeedleAnimation: INCLUDE "gfx/pokemon/weedle/anim.asm"
KakunaAnimation: INCLUDE "gfx/pokemon/kakuna/anim.asm"
BeedrillAnimation: INCLUDE "gfx/pokemon/beedrill/anim.asm"
GentlarvaAnimation: INCLUDE "gfx/pokemon/gentlarva/anim.asm"
PupalAnimation: INCLUDE "gfx/pokemon/pupal/anim.asm"
CarapthorAnimation: INCLUDE "gfx/pokemon/carapthor/anim.asm"
KotoraAnimation: INCLUDE "gfx/pokemon/kotora/anim.asm"
GaotoraAnimation: INCLUDE "gfx/pokemon/gaotora/anim.asm"
GorotoraAnimation: INCLUDE "gfx/pokemon/gorotora/anim.asm"
RaitoraAnimation: INCLUDE "gfx/pokemon/raitora/anim.asm"
PidgeyAnimation: INCLUDE "gfx/pokemon/pidgey/anim.asm"
PidgeottoAnimation: INCLUDE "gfx/pokemon/pidgeotto/anim.asm"
PidgeotAnimation: INCLUDE "gfx/pokemon/pidgeot/anim.asm"
@ -36,27 +43,34 @@ NidokingAnimation: INCLUDE "gfx/pokemon/nidoking/anim.asm"
NidoreignAnimation: INCLUDE "gfx/pokemon/nidoreign/anim.asm"
ClefairyAnimation: INCLUDE "gfx/pokemon/clefairy/anim.asm"
ClefableAnimation: INCLUDE "gfx/pokemon/clefable/anim.asm"
VulpiiiAnimation: INCLUDE "gfx/pokemon/vulpiii/anim.asm"
VulpixAnimation: INCLUDE "gfx/pokemon/vulpix/anim.asm"
NinetalesAnimation: INCLUDE "gfx/pokemon/ninetales/anim.asm"
JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim.asm"
WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim.asm"
BittybatAnimation: INCLUDE "gfx/pokemon/bittybat/anim.asm"
ZubatAnimation: INCLUDE "gfx/pokemon/zubat/anim.asm"
GolbatAnimation: INCLUDE "gfx/pokemon/golbat/anim.asm"
OddishAnimation: INCLUDE "gfx/pokemon/oddish/anim.asm"
GloomAnimation: INCLUDE "gfx/pokemon/gloom/anim.asm"
VileplumeAnimation: INCLUDE "gfx/pokemon/vileplume/anim.asm"
ParasporAnimation: INCLUDE "gfx/pokemon/paraspor/anim.asm"
ParasAnimation: INCLUDE "gfx/pokemon/paras/anim.asm"
ParasectAnimation: INCLUDE "gfx/pokemon/parasect/anim.asm"
VenonatAnimation: INCLUDE "gfx/pokemon/venonat/anim.asm"
VenomothAnimation: INCLUDE "gfx/pokemon/venomoth/anim.asm"
DiglettAnimation: INCLUDE "gfx/pokemon/diglett/anim.asm"
DugtrioAnimation: INCLUDE "gfx/pokemon/dugtrio/anim.asm"
CoinpurAnimation: INCLUDE "gfx/pokemon/coinpur/anim.asm"
MeowthAnimation: INCLUDE "gfx/pokemon/meowth/anim.asm"
PersianAnimation: INCLUDE "gfx/pokemon/persian/anim.asm"
PerrserkerAnimation: INCLUDE "gfx/pokemon/perrserker/anim.asm"
PsyduckAnimation: INCLUDE "gfx/pokemon/psyduck/anim.asm"
GolduckAnimation: INCLUDE "gfx/pokemon/golduck/anim.asm"
MankeyAnimation: INCLUDE "gfx/pokemon/mankey/anim.asm"
PrimeapeAnimation: INCLUDE "gfx/pokemon/primeape/anim.asm"
AnnihilapeAnimation: INCLUDE "gfx/pokemon/annihilape/anim.asm"
PupperonAnimation: INCLUDE "gfx/pokemon/pupperon/anim.asm"
GrowlitheAnimation: INCLUDE "gfx/pokemon/growlithe/anim.asm"
ArcanineAnimation: INCLUDE "gfx/pokemon/arcanine/anim.asm"
PoliwagAnimation: INCLUDE "gfx/pokemon/poliwag/anim.asm"
@ -208,6 +222,9 @@ WooperAnimation: INCLUDE "gfx/pokemon/wooper/anim.asm"
QuagsireAnimation: INCLUDE "gfx/pokemon/quagsire/anim.asm"
EspeonAnimation: INCLUDE "gfx/pokemon/espeon/anim.asm"
UmbreonAnimation: INCLUDE "gfx/pokemon/umbreon/anim.asm"
LeafeonAnimation: INCLUDE "gfx/pokemon/leafeon/anim.asm"
GlaceonAnimation: INCLUDE "gfx/pokemon/glaceon/anim.asm"
SylveonAnimation: INCLUDE "gfx/pokemon/sylveon/anim.asm"
MurkrowAnimation: INCLUDE "gfx/pokemon/murkrow/anim.asm"
SlowkingAnimation: INCLUDE "gfx/pokemon/slowking/anim.asm"
MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm"

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

@ -15,6 +15,13 @@ BitmasksPointers:
dw WeedleBitmasks
dw KakunaBitmasks
dw BeedrillBitmasks
dw GentlarvaBitmasks
dw PupalBitmasks
dw CarapthorBitmasks
dw KotoraBitmasks
dw GaotoraBitmasks
dw GorotoraBitmasks
dw RaitoraBitmasks
dw PidgeyBitmasks
dw PidgeottoBitmasks
dw PidgeotBitmasks
@ -38,27 +45,34 @@ BitmasksPointers:
dw NidoreignBitmasks
dw ClefairyBitmasks
dw ClefableBitmasks
dw VulpiiiBitmasks
dw VulpixBitmasks
dw NinetalesBitmasks
dw JigglypuffBitmasks
dw WigglytuffBitmasks
dw BittybatBitmasks
dw ZubatBitmasks
dw GolbatBitmasks
dw OddishBitmasks
dw GloomBitmasks
dw VileplumeBitmasks
dw ParasporBitmasks
dw ParasBitmasks
dw ParasectBitmasks
dw VenonatBitmasks
dw VenomothBitmasks
dw DiglettBitmasks
dw DugtrioBitmasks
dw CoinpurBitmasks
dw MeowthBitmasks
dw PersianBitmasks
dw PerrserkerBitmasks
dw PsyduckBitmasks
dw GolduckBitmasks
dw MankeyBitmasks
dw PrimeapeBitmasks
dw AnnihilapeBitmasks
dw PupperonBitmasks
dw GrowlitheBitmasks
dw ArcanineBitmasks
dw PoliwagBitmasks
@ -210,6 +224,9 @@ BitmasksPointers:
dw QuagsireBitmasks
dw EspeonBitmasks
dw UmbreonBitmasks
dw LeafeonBitmasks
dw GlaceonBitmasks
dw SylveonBitmasks
dw MurkrowBitmasks
dw SlowkingBitmasks
dw MisdreavusBitmasks

View file

@ -13,6 +13,13 @@ ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm"
WeedleBitmasks: INCLUDE "gfx/pokemon/weedle/bitmask.asm"
KakunaBitmasks: INCLUDE "gfx/pokemon/kakuna/bitmask.asm"
BeedrillBitmasks: INCLUDE "gfx/pokemon/beedrill/bitmask.asm"
GentlarvaBitmasks: INCLUDE "gfx/pokemon/gentlarva/bitmask.asm"
PupalBitmasks: INCLUDE "gfx/pokemon/pupal/bitmask.asm"
CarapthorBitmasks: INCLUDE "gfx/pokemon/carapthor/bitmask.asm"
KotoraBitmasks: INCLUDE "gfx/pokemon/kotora/bitmask.asm"
GaotoraBitmasks: INCLUDE "gfx/pokemon/gaotora/bitmask.asm"
GorotoraBitmasks: INCLUDE "gfx/pokemon/gorotora/bitmask.asm"
RaitoraBitmasks: INCLUDE "gfx/pokemon/raitora/bitmask.asm"
PidgeyBitmasks: INCLUDE "gfx/pokemon/pidgey/bitmask.asm"
PidgeottoBitmasks: INCLUDE "gfx/pokemon/pidgeotto/bitmask.asm"
PidgeotBitmasks: INCLUDE "gfx/pokemon/pidgeot/bitmask.asm"
@ -36,27 +43,34 @@ NidokingBitmasks: INCLUDE "gfx/pokemon/nidoking/bitmask.asm"
NidoreignBitmasks: INCLUDE "gfx/pokemon/nidoreign/bitmask.asm"
ClefairyBitmasks: INCLUDE "gfx/pokemon/clefairy/bitmask.asm"
ClefableBitmasks: INCLUDE "gfx/pokemon/clefable/bitmask.asm"
VulpiiiBitmasks: INCLUDE "gfx/pokemon/vulpiii/bitmask.asm"
VulpixBitmasks: INCLUDE "gfx/pokemon/vulpix/bitmask.asm"
NinetalesBitmasks: INCLUDE "gfx/pokemon/ninetales/bitmask.asm"
JigglypuffBitmasks: INCLUDE "gfx/pokemon/jigglypuff/bitmask.asm"
WigglytuffBitmasks: INCLUDE "gfx/pokemon/wigglytuff/bitmask.asm"
BittybatBitmasks: INCLUDE "gfx/pokemon/bittybat/bitmask.asm"
ZubatBitmasks: INCLUDE "gfx/pokemon/zubat/bitmask.asm"
GolbatBitmasks: INCLUDE "gfx/pokemon/golbat/bitmask.asm"
OddishBitmasks: INCLUDE "gfx/pokemon/oddish/bitmask.asm"
GloomBitmasks: INCLUDE "gfx/pokemon/gloom/bitmask.asm"
VileplumeBitmasks: INCLUDE "gfx/pokemon/vileplume/bitmask.asm"
ParasporBitmasks: INCLUDE "gfx/pokemon/paraspor/bitmask.asm"
ParasBitmasks: INCLUDE "gfx/pokemon/paras/bitmask.asm"
ParasectBitmasks: INCLUDE "gfx/pokemon/parasect/bitmask.asm"
VenonatBitmasks: INCLUDE "gfx/pokemon/venonat/bitmask.asm"
VenomothBitmasks: INCLUDE "gfx/pokemon/venomoth/bitmask.asm"
DiglettBitmasks: INCLUDE "gfx/pokemon/diglett/bitmask.asm"
DugtrioBitmasks: INCLUDE "gfx/pokemon/dugtrio/bitmask.asm"
CoinpurBitmasks: INCLUDE "gfx/pokemon/coinpur/bitmask.asm"
MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm"
PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm"
PerrserkerBitmasks: INCLUDE "gfx/pokemon/perrserker/bitmask.asm"
PsyduckBitmasks: INCLUDE "gfx/pokemon/psyduck/bitmask.asm"
GolduckBitmasks: INCLUDE "gfx/pokemon/golduck/bitmask.asm"
MankeyBitmasks: INCLUDE "gfx/pokemon/mankey/bitmask.asm"
PrimeapeBitmasks: INCLUDE "gfx/pokemon/primeape/bitmask.asm"
AnnihilapeBitmasks: INCLUDE "gfx/pokemon/annihilape/bitmask.asm"
PupperonBitmasks: INCLUDE "gfx/pokemon/pupperon/bitmask.asm"
GrowlitheBitmasks: INCLUDE "gfx/pokemon/growlithe/bitmask.asm"
ArcanineBitmasks: INCLUDE "gfx/pokemon/arcanine/bitmask.asm"
PoliwagBitmasks: INCLUDE "gfx/pokemon/poliwag/bitmask.asm"
@ -208,6 +222,9 @@ WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm"
QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
EspeonBitmasks: INCLUDE "gfx/pokemon/espeon/bitmask.asm"
UmbreonBitmasks: INCLUDE "gfx/pokemon/umbreon/bitmask.asm"
LeafeonBitmasks: INCLUDE "gfx/pokemon/leafeon/bitmask.asm"
GlaceonBitmasks: INCLUDE "gfx/pokemon/glaceon/bitmask.asm"
SylveonBitmasks: INCLUDE "gfx/pokemon/sylveon/bitmask.asm"
MurkrowBitmasks: INCLUDE "gfx/pokemon/murkrow/bitmask.asm"
SlowkingBitmasks: INCLUDE "gfx/pokemon/slowking/bitmask.asm"
MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm"

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

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

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

@ -15,6 +15,13 @@ FramesPointers:
dba WeedleFrames
dba KakunaFrames
dba BeedrillFrames
dba GentlarvaFrames
dba PupalFrames
dba CarapthorFrames
dba KotoraFrames
dba GaotoraFrames
dba GorotoraFrames
dba RaitoraFrames
dba PidgeyFrames
dba PidgeottoFrames
dba PidgeotFrames
@ -38,27 +45,34 @@ FramesPointers:
dba NidoreignFrames
dba ClefairyFrames
dba ClefableFrames
dba VulpiiiFrames
dba VulpixFrames
dba NinetalesFrames
dba JigglypuffFrames
dba WigglytuffFrames
dba BittybatFrames
dba ZubatFrames
dba GolbatFrames
dba OddishFrames
dba GloomFrames
dba VileplumeFrames
dba ParasporFrames
dba ParasFrames
dba ParasectFrames
dba VenonatFrames
dba VenomothFrames
dba DiglettFrames
dba DugtrioFrames
dba CoinpurFrames
dba MeowthFrames
dba PersianFrames
dba PerrserkerFrames
dba PsyduckFrames
dba GolduckFrames
dba MankeyFrames
dba PrimeapeFrames
dba AnnihilapeFrames
dba PupperonFrames
dba GrowlitheFrames
dba ArcanineFrames
dba PoliwagFrames
@ -210,6 +224,9 @@ FramesPointers:
dba QuagsireFrames
dba EspeonFrames
dba UmbreonFrames
dba LeafeonFrames
dba GlaceonFrames
dba SylveonFrames
dba MurkrowFrames
dba SlowkingFrames
dba MisdreavusFrames

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

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

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

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

@ -15,6 +15,13 @@ AnimationIdlePointers:
dw WeedleAnimationIdle
dw KakunaAnimationIdle
dw BeedrillAnimationIdle
dw GentlarvaAnimationIdle
dw PupalAnimationIdle
dw CarapthorAnimationIdle
dw KotoraAnimationIdle
dw GaotoraAnimationIdle
dw GorotoraAnimationIdle
dw RaitoraAnimationIdle
dw PidgeyAnimationIdle
dw PidgeottoAnimationIdle
dw PidgeotAnimationIdle
@ -38,27 +45,34 @@ AnimationIdlePointers:
dw NidoreignAnimationIdle
dw ClefairyAnimationIdle
dw ClefableAnimationIdle
dw VulpiiiAnimationIdle
dw VulpixAnimationIdle
dw NinetalesAnimationIdle
dw JigglypuffAnimationIdle
dw WigglytuffAnimationIdle
dw BittybatAnimationIdle
dw ZubatAnimationIdle
dw GolbatAnimationIdle
dw OddishAnimationIdle
dw GloomAnimationIdle
dw VileplumeAnimationIdle
dw ParasporAnimationIdle
dw ParasAnimationIdle
dw ParasectAnimationIdle
dw VenonatAnimationIdle
dw VenomothAnimationIdle
dw DiglettAnimationIdle
dw DugtrioAnimationIdle
dw CoinpurAnimationIdle
dw MeowthAnimationIdle
dw PersianAnimationIdle
dw PerrserkerAnimationIdle
dw PsyduckAnimationIdle
dw GolduckAnimationIdle
dw MankeyAnimationIdle
dw PrimeapeAnimationIdle
dw AnnihilapeAnimationIdle
dw PupperonAnimationIdle
dw GrowlitheAnimationIdle
dw ArcanineAnimationIdle
dw PoliwagAnimationIdle
@ -210,6 +224,9 @@ AnimationIdlePointers:
dw QuagsireAnimationIdle
dw EspeonAnimationIdle
dw UmbreonAnimationIdle
dw LeafeonAnimationIdle
dw GlaceonAnimationIdle
dw SylveonAnimationIdle
dw MurkrowAnimationIdle
dw SlowkingAnimationIdle
dw MisdreavusAnimationIdle

View file

@ -13,6 +13,13 @@ ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm"
WeedleAnimationIdle: INCLUDE "gfx/pokemon/weedle/anim_idle.asm"
KakunaAnimationIdle: INCLUDE "gfx/pokemon/kakuna/anim_idle.asm"
BeedrillAnimationIdle: INCLUDE "gfx/pokemon/beedrill/anim_idle.asm"
GentlarvaAnimationIdle: INCLUDE "gfx/pokemon/gentlarva/anim_idle.asm"
PupalAnimationIdle: INCLUDE "gfx/pokemon/pupal/anim_idle.asm"
CarapthorAnimationIdle: INCLUDE "gfx/pokemon/carapthor/anim_idle.asm"
KotoraAnimationIdle: INCLUDE "gfx/pokemon/kotora/anim_idle.asm"
GaotoraAnimationIdle: INCLUDE "gfx/pokemon/gaotora/anim_idle.asm"
GorotoraAnimationIdle: INCLUDE "gfx/pokemon/gorotora/anim_idle.asm"
RaitoraAnimationIdle: INCLUDE "gfx/pokemon/raitora/anim_idle.asm"
PidgeyAnimationIdle: INCLUDE "gfx/pokemon/pidgey/anim_idle.asm"
PidgeottoAnimationIdle: INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm"
PidgeotAnimationIdle: INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm"
@ -36,27 +43,34 @@ NidokingAnimationIdle: INCLUDE "gfx/pokemon/nidoking/anim_idle.asm"
NidoreignAnimationIdle: INCLUDE "gfx/pokemon/nidoreign/anim_idle.asm"
ClefairyAnimationIdle: INCLUDE "gfx/pokemon/clefairy/anim_idle.asm"
ClefableAnimationIdle: INCLUDE "gfx/pokemon/clefable/anim_idle.asm"
VulpiiiAnimationIdle: INCLUDE "gfx/pokemon/vulpiii/anim_idle.asm"
VulpixAnimationIdle: INCLUDE "gfx/pokemon/vulpix/anim_idle.asm"
NinetalesAnimationIdle: INCLUDE "gfx/pokemon/ninetales/anim_idle.asm"
JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm"
WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm"
BittybatAnimationIdle: INCLUDE "gfx/pokemon/bittybat/anim_idle.asm"
ZubatAnimationIdle: INCLUDE "gfx/pokemon/zubat/anim_idle.asm"
GolbatAnimationIdle: INCLUDE "gfx/pokemon/golbat/anim_idle.asm"
OddishAnimationIdle: INCLUDE "gfx/pokemon/oddish/anim_idle.asm"
GloomAnimationIdle: INCLUDE "gfx/pokemon/gloom/anim_idle.asm"
VileplumeAnimationIdle: INCLUDE "gfx/pokemon/vileplume/anim_idle.asm"
ParasporAnimationIdle: INCLUDE "gfx/pokemon/paraspor/anim_idle.asm"
ParasAnimationIdle: INCLUDE "gfx/pokemon/paras/anim_idle.asm"
ParasectAnimationIdle: INCLUDE "gfx/pokemon/parasect/anim_idle.asm"
VenonatAnimationIdle: INCLUDE "gfx/pokemon/venonat/anim_idle.asm"
VenomothAnimationIdle: INCLUDE "gfx/pokemon/venomoth/anim_idle.asm"
DiglettAnimationIdle: INCLUDE "gfx/pokemon/diglett/anim_idle.asm"
DugtrioAnimationIdle: INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm"
CoinpurAnimationIdle: INCLUDE "gfx/pokemon/coinpur/anim_idle.asm"
MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm"
PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm"
PerrserkerAnimationIdle: INCLUDE "gfx/pokemon/perrserker/anim_idle.asm"
PsyduckAnimationIdle: INCLUDE "gfx/pokemon/psyduck/anim_idle.asm"
GolduckAnimationIdle: INCLUDE "gfx/pokemon/golduck/anim_idle.asm"
MankeyAnimationIdle: INCLUDE "gfx/pokemon/mankey/anim_idle.asm"
PrimeapeAnimationIdle: INCLUDE "gfx/pokemon/primeape/anim_idle.asm"
AnnihilapeAnimationIdle: INCLUDE "gfx/pokemon/annihilape/anim_idle.asm"
PupperonAnimationIdle: INCLUDE "gfx/pokemon/pupperon/anim_idle.asm"
GrowlitheAnimationIdle: INCLUDE "gfx/pokemon/growlithe/anim_idle.asm"
ArcanineAnimationIdle: INCLUDE "gfx/pokemon/arcanine/anim_idle.asm"
PoliwagAnimationIdle: INCLUDE "gfx/pokemon/poliwag/anim_idle.asm"
@ -208,6 +222,9 @@ WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
EspeonAnimationIdle: INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
UmbreonAnimationIdle: INCLUDE "gfx/pokemon/umbreon/anim_idle.asm"
LeafeonAnimationIdle: INCLUDE "gfx/pokemon/leafeon/anim_idle.asm"
GlaceonAnimationIdle: INCLUDE "gfx/pokemon/glaceon/anim_idle.asm"
SylveonAnimationIdle: INCLUDE "gfx/pokemon/sylveon/anim_idle.asm"
MurkrowAnimationIdle: INCLUDE "gfx/pokemon/murkrow/anim_idle.asm"
SlowkingAnimationIdle: INCLUDE "gfx/pokemon/slowking/anim_idle.asm"
MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm"

View file

@ -46,6 +46,9 @@ WooperFrames: INCLUDE "gfx/pokemon/wooper/frames.asm"
QuagsireFrames: INCLUDE "gfx/pokemon/quagsire/frames.asm"
EspeonFrames: INCLUDE "gfx/pokemon/espeon/frames.asm"
UmbreonFrames: INCLUDE "gfx/pokemon/umbreon/frames.asm"
LeafeonFrames: INCLUDE "gfx/pokemon/leafeon/frames.asm"
GlaceonFrames: INCLUDE "gfx/pokemon/glaceon/frames.asm"
SylveonFrames: INCLUDE "gfx/pokemon/sylveon/frames.asm"
MurkrowFrames: INCLUDE "gfx/pokemon/murkrow/frames.asm"
SlowkingFrames: INCLUDE "gfx/pokemon/slowking/frames.asm"
MisdreavusFrames: INCLUDE "gfx/pokemon/misdreavus/frames.asm"

View file

@ -15,6 +15,13 @@ ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm"
WeedleFrames: INCLUDE "gfx/pokemon/weedle/frames.asm"
KakunaFrames: INCLUDE "gfx/pokemon/kakuna/frames.asm"
BeedrillFrames: INCLUDE "gfx/pokemon/beedrill/frames.asm"
GentlarvaFrames: INCLUDE "gfx/pokemon/gentlarva/frames.asm"
PupalFrames: INCLUDE "gfx/pokemon/pupal/frames.asm"
CarapthorFrames: INCLUDE "gfx/pokemon/carapthor/frames.asm"
KotoraFrames: INCLUDE "gfx/pokemon/kotora/frames.asm"
GaotoraFrames: INCLUDE "gfx/pokemon/gaotora/frames.asm"
GorotoraFrames: INCLUDE "gfx/pokemon/gorotora/frames.asm"
RaitoraFrames: INCLUDE "gfx/pokemon/raitora/frames.asm"
PidgeyFrames: INCLUDE "gfx/pokemon/pidgey/frames.asm"
PidgeottoFrames: INCLUDE "gfx/pokemon/pidgeotto/frames.asm"
PidgeotFrames: INCLUDE "gfx/pokemon/pidgeot/frames.asm"
@ -38,27 +45,34 @@ NidokingFrames: INCLUDE "gfx/pokemon/nidoking/frames.asm"
NidoreignFrames: INCLUDE "gfx/pokemon/nidoreign/frames.asm"
ClefairyFrames: INCLUDE "gfx/pokemon/clefairy/frames.asm"
ClefableFrames: INCLUDE "gfx/pokemon/clefable/frames.asm"
VulpiiiFrames: INCLUDE "gfx/pokemon/vulpiii/frames.asm"
VulpixFrames: INCLUDE "gfx/pokemon/vulpix/frames.asm"
NinetalesFrames: INCLUDE "gfx/pokemon/ninetales/frames.asm"
JigglypuffFrames: INCLUDE "gfx/pokemon/jigglypuff/frames.asm"
WigglytuffFrames: INCLUDE "gfx/pokemon/wigglytuff/frames.asm"
BittybatFrames: INCLUDE "gfx/pokemon/bittybat/frames.asm"
ZubatFrames: INCLUDE "gfx/pokemon/zubat/frames.asm"
GolbatFrames: INCLUDE "gfx/pokemon/golbat/frames.asm"
OddishFrames: INCLUDE "gfx/pokemon/oddish/frames.asm"
GloomFrames: INCLUDE "gfx/pokemon/gloom/frames.asm"
VileplumeFrames: INCLUDE "gfx/pokemon/vileplume/frames.asm"
ParasporFrames: INCLUDE "gfx/pokemon/paraspor/frames.asm"
ParasFrames: INCLUDE "gfx/pokemon/paras/frames.asm"
ParasectFrames: INCLUDE "gfx/pokemon/parasect/frames.asm"
VenonatFrames: INCLUDE "gfx/pokemon/venonat/frames.asm"
VenomothFrames: INCLUDE "gfx/pokemon/venomoth/frames.asm"
DiglettFrames: INCLUDE "gfx/pokemon/diglett/frames.asm"
DugtrioFrames: INCLUDE "gfx/pokemon/dugtrio/frames.asm"
CoinpurFrames: INCLUDE "gfx/pokemon/coinpur/frames.asm"
MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm"
PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm"
PerrserkerFrames: INCLUDE "gfx/pokemon/perrserker/frames.asm"
PsyduckFrames: INCLUDE "gfx/pokemon/psyduck/frames.asm"
GolduckFrames: INCLUDE "gfx/pokemon/golduck/frames.asm"
MankeyFrames: INCLUDE "gfx/pokemon/mankey/frames.asm"
PrimeapeFrames: INCLUDE "gfx/pokemon/primeape/frames.asm"
AnnihilapeFrames: INCLUDE "gfx/pokemon/annihilape/frames.asm"
PupperonFrames: INCLUDE "gfx/pokemon/pupperon/frames.asm"
GrowlitheFrames: INCLUDE "gfx/pokemon/growlithe/frames.asm"
ArcanineFrames: INCLUDE "gfx/pokemon/arcanine/frames.asm"
PoliwagFrames: INCLUDE "gfx/pokemon/poliwag/frames.asm"

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

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

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

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

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

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

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

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

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

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

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

Some files were not shown because too many files have changed in this diff Show more