diff --git a/README.md b/README.md index d7ce2fe..4326e6a 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,8 @@ Additionally, there have been many wild encounter tweaks. View this document for # Sprite Credits - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, - Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops -- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer +- zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix +- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back) - Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly - Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj - SoupPotato et al - Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazeppelin (Numbpuff), Disturban (Turban), Angore (Anchorage) - SCMidna: Munchlax diff --git a/gfx/pokemon/vulpixalola/anim.asm b/gfx/pokemon/vulpixalola/anim.asm new file mode 100644 index 0000000..1877a76 --- /dev/null +++ b/gfx/pokemon/vulpixalola/anim.asm @@ -0,0 +1,11 @@ + frame 0, 08 + frame 1, 10 + frame 2, 04 + frame 3, 04 + frame 2, 04 + frame 3, 04 + frame 2, 04 + frame 3, 04 + frame 2, 05 + frame 0, 16 + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpixalola/anim_idle.asm b/gfx/pokemon/vulpixalola/anim_idle.asm new file mode 100644 index 0000000..9561dd4 --- /dev/null +++ b/gfx/pokemon/vulpixalola/anim_idle.asm @@ -0,0 +1,10 @@ + frame 4, 02 + frame 5, 02 + frame 4, 02 + frame 5, 02 + frame 4, 02 + frame 5, 02 + frame 4, 02 + frame 5, 02 + frame 0, 16 + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpixalola/back.png b/gfx/pokemon/vulpixalola/back.png new file mode 100644 index 0000000..c58987f Binary files /dev/null and b/gfx/pokemon/vulpixalola/back.png differ diff --git a/gfx/pokemon/vulpixalola/front.png b/gfx/pokemon/vulpixalola/front.png new file mode 100644 index 0000000..ec40dbd Binary files /dev/null and b/gfx/pokemon/vulpixalola/front.png differ diff --git a/gfx/pokemon/vulpixalola/shiny.pal b/gfx/pokemon/vulpixalola/shiny.pal new file mode 100644 index 0000000..9a4ad0d --- /dev/null +++ b/gfx/pokemon/vulpixalola/shiny.pal @@ -0,0 +1,2 @@ + RGB 25, 23, 29 + RGB 16, 10, 21 \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 583029a..d58f39c 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -57,11 +57,11 @@ DebugPokemon4Script: faceplayer opentext writetext DebugTextB - cry DOKUROAR + cry NIDORAN_M pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_NORMAL - loadwildmon DOKUROAR, 60 + loadwildmon BIPULLA, 60 startbattle reloadmapafterbattle end