diff --git a/README.md b/README.md index 97f19b0..3eea69e 100644 --- a/README.md +++ b/README.md @@ -94,9 +94,9 @@ In general, there have been many wild encounter tweaks. View this document for d # Sprite Credits - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, -- Martha's Against Humanity: Shi-Shi +- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops - EyeDonutz: Walking Wake -- nuuk: (TBD) +- nuuk: (WIP) Azurill, Farigiraf, Glaceon, Leafeon, Magnezone, Sylveon, Togekiss - SCMidna: Munchlax - Pokemon October et al: Bellignan, Caretorker, Inoshika, Bipulla, Sonegg, Kolta, Coinpur, Dodaerie, Bundra, Kiwooked, Koalyptus, Trebir - Tom Wang: Gold/Chris running sprite diff --git a/gfx/pics.asm b/gfx/pics.asm index 5e53cd7..edd6eee 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -805,25 +805,6 @@ 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" -CubburnFrontpic: INCBIN "gfx/pokemon/cubburn/front.animated.2bpp.lz" -CubburnBackpic: INCBIN "gfx/pokemon/cubburn/back.2bpp.lz" -FlambearFrontpic: INCBIN "gfx/pokemon/flambear/front.animated.2bpp.lz" -FlambearBackpic: INCBIN "gfx/pokemon/flambear/back.2bpp.lz" -BruinousFrontpic: INCBIN "gfx/pokemon/bruinous/front.animated.2bpp.lz" -BruinousBackpic: INCBIN "gfx/pokemon/bruinous/back.2bpp.lz" - -PalssioFrontpic: INCBIN "gfx/pokemon/palssio/front.animated.2bpp.lz" -PalssioBackpic: INCBIN "gfx/pokemon/palssio/back.2bpp.lz" -PressioFrontpic: INCBIN "gfx/pokemon/pressio/front.animated.2bpp.lz" -PressioBackpic: INCBIN "gfx/pokemon/pressio/back.2bpp.lz" -DonmarinFrontpic: INCBIN "gfx/pokemon/donmarin/front.animated.2bpp.lz" -DonmarinBackpic: INCBIN "gfx/pokemon/donmarin/back.2bpp.lz" - -FolageFrontpic: INCBIN "gfx/pokemon/folage/front.animated.2bpp.lz" -FolageBackpic: INCBIN "gfx/pokemon/folage/back.2bpp.lz" -BarreauFrontpic: INCBIN "gfx/pokemon/barreau/front.animated.2bpp.lz" -BarreauBackpic: INCBIN "gfx/pokemon/barreau/back.2bpp.lz" - RagingBoltFrontpic: INCBIN "gfx/pokemon/raging_bolt/front.animated.2bpp.lz" RagingBoltBackpic: INCBIN "gfx/pokemon/raging_bolt/back.2bpp.lz" GougingFireFrontpic: INCBIN "gfx/pokemon/gouging_fire/front.animated.2bpp.lz" @@ -944,8 +925,8 @@ WeirduckFrontpic: INCBIN "gfx/pokemon/weirduck/front.animated.2bpp.lz" WeirduckBackpic: INCBIN "gfx/pokemon/weirduck/back.2bpp.lz" LuxwanFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz" LuxwanBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz" -CharmadaFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz" -CharmadaBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz" +CharmadaFrontpic: INCBIN "gfx/pokemon/charmada/front.animated.2bpp.lz" +CharmadaBackpic: INCBIN "gfx/pokemon/charmada/back.2bpp.lz" MagipreyFrontpic: INCBIN "gfx/pokemon/magiprey/front.animated.2bpp.lz" MagipreyBackpic: INCBIN "gfx/pokemon/magiprey/back.2bpp.lz" TerradosFrontpic: INCBIN "gfx/pokemon/terrados/front.animated.2bpp.lz" @@ -989,6 +970,24 @@ GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" SECTION "Pics 23", ROMX +CubburnFrontpic: INCBIN "gfx/pokemon/cubburn/front.animated.2bpp.lz" +CubburnBackpic: INCBIN "gfx/pokemon/cubburn/back.2bpp.lz" +FlambearFrontpic: INCBIN "gfx/pokemon/flambear/front.animated.2bpp.lz" +FlambearBackpic: INCBIN "gfx/pokemon/flambear/back.2bpp.lz" +BruinousFrontpic: INCBIN "gfx/pokemon/bruinous/front.animated.2bpp.lz" +BruinousBackpic: INCBIN "gfx/pokemon/bruinous/back.2bpp.lz" + +PalssioFrontpic: INCBIN "gfx/pokemon/palssio/front.animated.2bpp.lz" +PalssioBackpic: INCBIN "gfx/pokemon/palssio/back.2bpp.lz" +PressioFrontpic: INCBIN "gfx/pokemon/pressio/front.animated.2bpp.lz" +PressioBackpic: INCBIN "gfx/pokemon/pressio/back.2bpp.lz" +DonmarinFrontpic: INCBIN "gfx/pokemon/donmarin/front.animated.2bpp.lz" +DonmarinBackpic: INCBIN "gfx/pokemon/donmarin/back.2bpp.lz" + +FolageFrontpic: INCBIN "gfx/pokemon/folage/front.animated.2bpp.lz" +FolageBackpic: INCBIN "gfx/pokemon/folage/back.2bpp.lz" +BarreauFrontpic: INCBIN "gfx/pokemon/barreau/front.animated.2bpp.lz" +BarreauBackpic: INCBIN "gfx/pokemon/barreau/back.2bpp.lz" SmujjFrontpic: INCBIN "gfx/pokemon/smujj/front.animated.2bpp.lz" SmujjBackpic: INCBIN "gfx/pokemon/smujj/back.2bpp.lz" GuardiaFrontpic: INCBIN "gfx/pokemon/guardia/front.animated.2bpp.lz" diff --git a/gfx/pokemon/azurill/anim.asm b/gfx/pokemon/azurill/anim.asm index 875f7be..47fe4b6 100644 --- a/gfx/pokemon/azurill/anim.asm +++ b/gfx/pokemon/azurill/anim.asm @@ -1 +1,7 @@ + frame 0, 04 + frame 1, 24 + frame 2, 12 + frame 3, 12 + frame 2, 08 + frame 3, 08 endanim \ No newline at end of file diff --git a/gfx/pokemon/azurill/anim_idle.asm b/gfx/pokemon/azurill/anim_idle.asm index 875f7be..30759b8 100644 --- a/gfx/pokemon/azurill/anim_idle.asm +++ b/gfx/pokemon/azurill/anim_idle.asm @@ -1 +1,4 @@ + frame 4, 10 + frame 0, 10 + frame 4, 10 endanim \ No newline at end of file diff --git a/gfx/pokemon/azurill/back.png b/gfx/pokemon/azurill/back.png index c7216be..927a202 100644 Binary files a/gfx/pokemon/azurill/back.png and b/gfx/pokemon/azurill/back.png differ diff --git a/gfx/pokemon/azurill/front.png b/gfx/pokemon/azurill/front.png index e0a9da9..d786c9e 100644 Binary files a/gfx/pokemon/azurill/front.png and b/gfx/pokemon/azurill/front.png differ diff --git a/gfx/pokemon/azurill/shiny.pal b/gfx/pokemon/azurill/shiny.pal index 5c88669..9551451 100644 --- a/gfx/pokemon/azurill/shiny.pal +++ b/gfx/pokemon/azurill/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 26, 11, 13 + RGB 15, 27, 18 + diff --git a/gfx/pokemon/farigiraf/anim.asm b/gfx/pokemon/farigiraf/anim.asm index 875f7be..337a5a8 100644 --- a/gfx/pokemon/farigiraf/anim.asm +++ b/gfx/pokemon/farigiraf/anim.asm @@ -1 +1,11 @@ + frame 1, 06 + frame 2, 06 + frame 1, 06 + setrepeat 4 + frame 2, 07 + frame 3, 07 + dorepeat 4 + frame 4, 06 + frame 0, 06 + frame 4, 06 endanim \ No newline at end of file diff --git a/gfx/pokemon/farigiraf/anim_idle.asm b/gfx/pokemon/farigiraf/anim_idle.asm index 875f7be..6050b62 100644 --- a/gfx/pokemon/farigiraf/anim_idle.asm +++ b/gfx/pokemon/farigiraf/anim_idle.asm @@ -1 +1,6 @@ - endanim \ No newline at end of file + frame 4, 06 + setrepeat 2 + frame 0, 06 + frame 5, 06 + dorepeat 2 + endanim diff --git a/gfx/pokemon/farigiraf/back.png b/gfx/pokemon/farigiraf/back.png index c7216be..0e44be3 100644 Binary files a/gfx/pokemon/farigiraf/back.png and b/gfx/pokemon/farigiraf/back.png differ diff --git a/gfx/pokemon/farigiraf/front.png b/gfx/pokemon/farigiraf/front.png index e0a9da9..ba21f14 100644 Binary files a/gfx/pokemon/farigiraf/front.png and b/gfx/pokemon/farigiraf/front.png differ diff --git a/gfx/pokemon/farigiraf/shiny.pal b/gfx/pokemon/farigiraf/shiny.pal index 5c88669..bc2809f 100644 --- a/gfx/pokemon/farigiraf/shiny.pal +++ b/gfx/pokemon/farigiraf/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 29, 07, 05 + RGB 05, 04, 31 + diff --git a/gfx/pokemon/glaceon/anim.asm b/gfx/pokemon/glaceon/anim.asm index 875f7be..75c82a6 100644 --- a/gfx/pokemon/glaceon/anim.asm +++ b/gfx/pokemon/glaceon/anim.asm @@ -1 +1,11 @@ - endanim \ No newline at end of file + frame 2, 04 + setrepeat 3 + frame 1, 08 + frame 2, 08 + dorepeat 2 + frame 1, 24 + frame 2, 12 + frame 3, 08 + frame 0, 08 + frame 3, 08 + endanim diff --git a/gfx/pokemon/glaceon/anim_idle.asm b/gfx/pokemon/glaceon/anim_idle.asm index 875f7be..8040bde 100644 --- a/gfx/pokemon/glaceon/anim_idle.asm +++ b/gfx/pokemon/glaceon/anim_idle.asm @@ -1 +1,6 @@ - endanim \ No newline at end of file + setrepeat 2 + frame 4, 06 + frame 0, 06 + dorepeat 1 + frame 3, 08 + endanim diff --git a/gfx/pokemon/glaceon/back.png b/gfx/pokemon/glaceon/back.png index c7216be..eeb54e6 100644 Binary files a/gfx/pokemon/glaceon/back.png and b/gfx/pokemon/glaceon/back.png differ diff --git a/gfx/pokemon/glaceon/front.png b/gfx/pokemon/glaceon/front.png index e0a9da9..bb64a7b 100644 Binary files a/gfx/pokemon/glaceon/front.png and b/gfx/pokemon/glaceon/front.png differ diff --git a/gfx/pokemon/glaceon/shiny.pal b/gfx/pokemon/glaceon/shiny.pal index 5c88669..44a656f 100644 --- a/gfx/pokemon/glaceon/shiny.pal +++ b/gfx/pokemon/glaceon/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 19, 28, 27 + RGB 00, 14, 26 + diff --git a/gfx/pokemon/leafeon/anim.asm b/gfx/pokemon/leafeon/anim.asm index 875f7be..1de241b 100644 --- a/gfx/pokemon/leafeon/anim.asm +++ b/gfx/pokemon/leafeon/anim.asm @@ -1 +1,7 @@ - endanim \ No newline at end of file + setrepeat 4 + frame 1, 06 + frame 2, 06 + frame 3, 06 + dorepeat 1 + frame 1, 10 + endanim diff --git a/gfx/pokemon/leafeon/anim_idle.asm b/gfx/pokemon/leafeon/anim_idle.asm index 875f7be..b0a81a2 100644 --- a/gfx/pokemon/leafeon/anim_idle.asm +++ b/gfx/pokemon/leafeon/anim_idle.asm @@ -1 +1,5 @@ - endanim \ No newline at end of file + setrepeat 2 + frame 4, 10 + frame 0, 10 + dorepeat 1 + endanim diff --git a/gfx/pokemon/leafeon/back.png b/gfx/pokemon/leafeon/back.png index c7216be..b26c6e7 100644 Binary files a/gfx/pokemon/leafeon/back.png and b/gfx/pokemon/leafeon/back.png differ diff --git a/gfx/pokemon/leafeon/front.png b/gfx/pokemon/leafeon/front.png index e0a9da9..79a789d 100644 Binary files a/gfx/pokemon/leafeon/front.png and b/gfx/pokemon/leafeon/front.png differ diff --git a/gfx/pokemon/leafeon/shiny.pal b/gfx/pokemon/leafeon/shiny.pal index 5c88669..b7316e0 100644 --- a/gfx/pokemon/leafeon/shiny.pal +++ b/gfx/pokemon/leafeon/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 23, 11 + RGB 01, 15, 08 + diff --git a/gfx/pokemon/luxwan/front.png b/gfx/pokemon/luxwan/front.png index 186e68a..6e72db4 100644 Binary files a/gfx/pokemon/luxwan/front.png and b/gfx/pokemon/luxwan/front.png differ diff --git a/gfx/pokemon/magnezone/anim.asm b/gfx/pokemon/magnezone/anim.asm index 875f7be..4dfa591 100644 --- a/gfx/pokemon/magnezone/anim.asm +++ b/gfx/pokemon/magnezone/anim.asm @@ -1 +1,10 @@ - endanim \ No newline at end of file + setrepeat 7 + frame 1, 04 + frame 0, 04 + dorepeat 1 + frame 1, 04 + setrepeat 3 + frame 2, 05 + frame 3, 05 + dorepeat 6 + endanim diff --git a/gfx/pokemon/magnezone/anim_idle.asm b/gfx/pokemon/magnezone/anim_idle.asm index 875f7be..cea75b3 100644 --- a/gfx/pokemon/magnezone/anim_idle.asm +++ b/gfx/pokemon/magnezone/anim_idle.asm @@ -1 +1,5 @@ - endanim \ No newline at end of file + frame 0, 08 + frame 3, 08 + frame 0, 08 + frame 3, 08 + endanim diff --git a/gfx/pokemon/magnezone/back.png b/gfx/pokemon/magnezone/back.png index c7216be..78df45c 100644 Binary files a/gfx/pokemon/magnezone/back.png and b/gfx/pokemon/magnezone/back.png differ diff --git a/gfx/pokemon/magnezone/front.png b/gfx/pokemon/magnezone/front.png index e0a9da9..828908b 100644 Binary files a/gfx/pokemon/magnezone/front.png and b/gfx/pokemon/magnezone/front.png differ diff --git a/gfx/pokemon/magnezone/shiny.pal b/gfx/pokemon/magnezone/shiny.pal index 5c88669..af1423e 100644 --- a/gfx/pokemon/magnezone/shiny.pal +++ b/gfx/pokemon/magnezone/shiny.pal @@ -1,2 +1,3 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 01, 23, 27 + RGB 13, 16, 18 \ No newline at end of file diff --git a/gfx/pokemon/sylveon/anim.asm b/gfx/pokemon/sylveon/anim.asm index 875f7be..558cefd 100644 --- a/gfx/pokemon/sylveon/anim.asm +++ b/gfx/pokemon/sylveon/anim.asm @@ -1 +1,8 @@ - endanim \ No newline at end of file + frame 0, 04 + frame 1, 18 + frame 2, 08 + frame 3, 10 + frame 1, 12 + frame 2, 10 + frame 3, 12 + endanim diff --git a/gfx/pokemon/sylveon/anim_idle.asm b/gfx/pokemon/sylveon/anim_idle.asm index 875f7be..e9fecfc 100644 --- a/gfx/pokemon/sylveon/anim_idle.asm +++ b/gfx/pokemon/sylveon/anim_idle.asm @@ -1 +1,4 @@ - endanim \ No newline at end of file + frame 4, 06 + frame 0, 06 + frame 4, 06 + endanim diff --git a/gfx/pokemon/sylveon/back.png b/gfx/pokemon/sylveon/back.png index c7216be..d3e40d5 100644 Binary files a/gfx/pokemon/sylveon/back.png and b/gfx/pokemon/sylveon/back.png differ diff --git a/gfx/pokemon/sylveon/front.png b/gfx/pokemon/sylveon/front.png index e0a9da9..7037d44 100644 Binary files a/gfx/pokemon/sylveon/front.png and b/gfx/pokemon/sylveon/front.png differ diff --git a/gfx/pokemon/sylveon/shiny.pal b/gfx/pokemon/sylveon/shiny.pal index 5c88669..25305aa 100644 --- a/gfx/pokemon/sylveon/shiny.pal +++ b/gfx/pokemon/sylveon/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 30, 13, 15 + RGB 04, 17, 28 + diff --git a/gfx/pokemon/togekiss/anim.asm b/gfx/pokemon/togekiss/anim.asm index 875f7be..4593ef3 100644 --- a/gfx/pokemon/togekiss/anim.asm +++ b/gfx/pokemon/togekiss/anim.asm @@ -1 +1,7 @@ - endanim \ No newline at end of file + setrepeat 2 + frame 1, 12 + frame 2, 12 + frame 3, 12 + frame 2, 12 + dorepeat 1 + endanim diff --git a/gfx/pokemon/togekiss/anim_idle.asm b/gfx/pokemon/togekiss/anim_idle.asm index 875f7be..d7b1f5f 100644 --- a/gfx/pokemon/togekiss/anim_idle.asm +++ b/gfx/pokemon/togekiss/anim_idle.asm @@ -1 +1,4 @@ + frame 4, 06 + frame 0, 06 + frame 4, 06 endanim \ No newline at end of file diff --git a/gfx/pokemon/togekiss/back.png b/gfx/pokemon/togekiss/back.png index c7216be..9750bc2 100644 Binary files a/gfx/pokemon/togekiss/back.png and b/gfx/pokemon/togekiss/back.png differ diff --git a/gfx/pokemon/togekiss/front.png b/gfx/pokemon/togekiss/front.png index e0a9da9..899591e 100644 Binary files a/gfx/pokemon/togekiss/front.png and b/gfx/pokemon/togekiss/front.png differ diff --git a/gfx/pokemon/togekiss/shiny.pal b/gfx/pokemon/togekiss/shiny.pal index 5c88669..b2b8fd1 100644 --- a/gfx/pokemon/togekiss/shiny.pal +++ b/gfx/pokemon/togekiss/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 27, 11 + RGB 00, 15, 24 +