From 5347a46208a697b1bc212944e0a0b013d4a80127 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 14 Sep 2025 11:26:54 -0600 Subject: [PATCH] SURPRISE EVOLOTTO This took like 10 minutes okay now I'm going to rest for at least a day --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 2 +- data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_johto.asm | 1 + data/pokemon/evolution_moves.asm | 1 + data/pokemon/evos_attacks_johto.asm | 7 +++++++ data/pokemon/first_stages.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints/evolotto.png | Bin 0 -> 69 bytes gfx/footprints_johto.asm | 1 + gfx/pics.asm | 2 ++ gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/evolotto/anim.asm | 1 + gfx/pokemon/evolotto/anim_idle.asm | 1 + gfx/pokemon/evolotto/back.png | Bin 0 -> 304 bytes gfx/pokemon/evolotto/front.png | Bin 0 -> 315 bytes gfx/pokemon/evolotto/shiny.pal | 2 ++ gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/johto_frames.asm | 1 + maps/DebugRoom.asm | 4 ++-- 32 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 gfx/footprints/evolotto.png create mode 100644 gfx/pokemon/evolotto/anim.asm create mode 100644 gfx/pokemon/evolotto/anim_idle.asm create mode 100644 gfx/pokemon/evolotto/back.png create mode 100644 gfx/pokemon/evolotto/front.png create mode 100644 gfx/pokemon/evolotto/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 606aad8..be2a496 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -423,6 +423,7 @@ DEF JOHTO_POKEMON EQU const_value const RUDDERNAUT const PIXYTOP const MAWTLE + const EVOLOTTO const XYLODON const XYLOFIN const DOKUROAR diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index a40cb3f..011851f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -428,6 +428,7 @@ INCLUDE "data/pokemon/base_stats/inoshika.asm" INCLUDE "data/pokemon/base_stats/ruddernaut.asm" INCLUDE "data/pokemon/base_stats/pixytop.asm" INCLUDE "data/pokemon/base_stats/mawtle.asm" +INCLUDE "data/pokemon/base_stats/evolotto.asm" INCLUDE "data/pokemon/base_stats/xylodon.asm" INCLUDE "data/pokemon/base_stats/xylofin.asm" INCLUDE "data/pokemon/base_stats/dokuroar.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index f374f44..ea6bfbb 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -407,6 +407,7 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT mon_cry CRY_NIDORAN_M, 0, 0 ; PIXYTOP (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; MAWTLE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; EVOLOTTO (incomplete) mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 3f0da86..fa1372d 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -441,4 +441,4 @@ MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm" - +EvolottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/evolotto.asm" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index a9b24c6..173c585 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -402,6 +402,7 @@ PokedexDataPointerTable: dba RuddernautPokedexEntry dba PixytopPokedexEntry dba MawtlePokedexEntry + dba EvolottoPokedexEntry dba XylodonPokedexEntry dba XylofinPokedexEntry dba DokuroarPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 2201363..e990857 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -103,6 +103,7 @@ AlphabeticalPokedexOrder: dw ENTEI dw ESPEON dw EUCALA + dw EVOLOTTO dw EXEGGCUTE dw EXEGGUTOR dw FARFETCH_D diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 9815236..42f4d23 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -368,6 +368,7 @@ NewPokedexOrder: dw RUDDERNAUT dw PIXYTOP dw MAWTLE + dw EVOLOTTO dw XYLODON dw XYLOFIN dw DOKUROAR diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 96c9ef9..00a89a2 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -177,6 +177,7 @@ EggMovePointers2:: dw RuddernautEggMoves dw PixytopEggMoves dw MawtleEggMoves + dw NoEggMoves2 ; Evolotto dw XylodonEggMoves dw NoEggMoves2 dw NoEggMoves2 ; Dokuroar diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index acb6d1e..58b97fa 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -400,6 +400,7 @@ EvolutionMoves:: dw NO_MOVE ;RUDDERNAUT dw NO_MOVE ;PIXYTOP dw NO_MOVE ;MAWTLE + dw NO_MOVE ;EVOLOTTO dw NO_MOVE ;XYLODON dw NO_MOVE ;XYLOFIN dw NO_MOVE ;DOKUROAR diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index b93db08..a4db5df 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -176,6 +176,7 @@ EvosAttacksPointers2:: dw RuddernautEvosAttacks dw PixytopEvosAttacks dw MawtleEvosAttacks + dw EvolottoEvosAttacks dw XylodonEvosAttacks dw XylofinEvosAttacks dw DokuroarEvosAttacks @@ -3029,6 +3030,12 @@ MawtleEvosAttacks: dbw 54, CRUNCH dbw 60, SKULL_BASH db 0 ; no more level-up moves + +EvolottoEvosAttacks: + dbbw EVOLVE_LEVEL, 1, EEVEE ; PLACEHOLDER + db 0 ; no more evolutions + dbw 1, HIDDEN_POWER + db 0 ; no more level-up moves XylodonEvosAttacks: dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 5f21302..7b47235 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -402,6 +402,7 @@ FirstEvoStages:: dw RUDDERNAUT dw PIXYTOP dw MAWTLE + dw EVOLOTTO dw XYLODON dw XYLODON dw DOKUROAR diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index d94efa6..1f9ffa9 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -403,6 +403,7 @@ MonMenuIcons: db ICON_LAPRAS ; RUDDERNAUT db ICON_CLEFAIRY ; PIXYTOP db ICON_SQUIRTLE ; MAWTLE + db ICON_BLOB ; EVOLOTTO db ICON_MONSTER ; XYLODON db ICON_MONSTER ; XYLOFIN db ICON_MONSTER ; DOKUROAR diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index c915978..d57161d 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -406,6 +406,7 @@ PokemonNames:: db "RUDDERNAUT" db "PIXYTOP@@@" db "MAWTLE@@@@" + db "EVOLOTTO@@" db "XYLODON@@@" db "XYLOFIN@@@" db "DOKUROAR@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 4c9ee51..d9d59f4 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -836,6 +836,8 @@ INCBIN "gfx/pokemon/pixytop/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pixytop/shiny.pal" INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mawtle/shiny.pal" +INCBIN "gfx/pokemon/evolotto/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/evolotto/shiny.pal" INCBIN "gfx/pokemon/xylodon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/xylodon/shiny.pal" INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 361d17e..dd8e427 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -818,6 +818,8 @@ PokemonPicPointers:: dba PixytopBackpic dba MawtleFrontpic dba MawtleBackpic + dba EvolottoFrontpic + dba EvolottoBackpic dba XylodonFrontpic dba XylodonBackpic dba XylofinFrontpic diff --git a/gfx/footprints/evolotto.png b/gfx/footprints/evolotto.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index b87de9a..f72923f 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -176,6 +176,7 @@ INCBIN "gfx/footprints/inoshika.1bpp" INCBIN "gfx/footprints/ruddernaut.1bpp" INCBIN "gfx/footprints/pixytop.1bpp" INCBIN "gfx/footprints/mawtle.1bpp" +INCBIN "gfx/footprints/evolotto.1bpp" INCBIN "gfx/footprints/xylodon.1bpp" INCBIN "gfx/footprints/xylofin.1bpp" INCBIN "gfx/footprints/dokuroar.1bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index 4844a02..0ad3a43 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1123,6 +1123,8 @@ PixytopFrontpic: INCBIN "gfx/pokemon/pixytop/front.animated.2bpp.lz" PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz" MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz" MawtleBackpic: INCBIN "gfx/pokemon/mawtle/back.2bpp.lz" +EvolottoFrontpic: INCBIN "gfx/pokemon/evolotto/front.animated.2bpp.lz" +EvolottoBackpic: INCBIN "gfx/pokemon/evolotto/back.2bpp.lz" AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz" AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 297250e..15c819a 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -402,6 +402,7 @@ AnimationPointers: dw RuddernautAnimation dw PixytopAnimation dw MawtleAnimation + dw EvolottoAnimation dw XylodonAnimation dw XylofinAnimation dw DokuroarAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 3979f65..58abafa 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -400,6 +400,7 @@ InoshikaAnimation: INCLUDE "gfx/pokemon/inoshika/anim.asm" RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm" PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm" MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm" +EvolottoAnimation: INCLUDE "gfx/pokemon/evolotto/anim.asm" XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm" XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm" DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index d16cde3..be196b2 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -402,6 +402,7 @@ BitmasksPointers: dw RuddernautBitmasks dw PixytopBitmasks dw MawtleBitmasks + dw EvolottoBitmasks dw XylodonBitmasks dw XylofinBitmasks dw DokuroarBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 9d50afa..d3d8d06 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -400,6 +400,7 @@ InoshikaBitmasks: INCLUDE "gfx/pokemon/inoshika/bitmask.asm" RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm" PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm" MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm" +EvolottoBitmasks: INCLUDE "gfx/pokemon/evolotto/bitmask.asm" XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm" XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm" DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm" diff --git a/gfx/pokemon/evolotto/anim.asm b/gfx/pokemon/evolotto/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/evolotto/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/anim_idle.asm b/gfx/pokemon/evolotto/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/evolotto/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/back.png b/gfx/pokemon/evolotto/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/evolotto/shiny.pal b/gfx/pokemon/evolotto/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/evolotto/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index c8b4fd4..17d8a5e 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -402,6 +402,7 @@ FramesPointers: dba RuddernautFrames dba PixytopFrames dba MawtleFrames + dba EvolottoFrames dba XylodonFrames dba XylofinFrames dba DokuroarFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index f3ae200..bde4092 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -402,6 +402,7 @@ AnimationIdlePointers: dw RuddernautAnimationIdle dw PixytopAnimationIdle dw MawtleAnimationIdle + dw EvolottoAnimationIdle dw XylodonAnimationIdle dw XylofinAnimationIdle dw DokuroarAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 5f94472..cd88051 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -400,6 +400,7 @@ InoshikaAnimationIdle: INCLUDE "gfx/pokemon/inoshika/anim_idle.asm" RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm" PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm" MawtleAnimationIdle: INCLUDE "gfx/pokemon/mawtle/anim_idle.asm" +EvolottoAnimationIdle: INCLUDE "gfx/pokemon/evolotto/anim_idle.asm" XylodonAnimationIdle: INCLUDE "gfx/pokemon/xylodon/anim_idle.asm" XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm" DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index c48ab7d..a7a21b6 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -176,6 +176,7 @@ InoshikaFrames: INCLUDE "gfx/pokemon/inoshika/frames.asm" RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm" PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm" MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm" +EvolottoFrames: INCLUDE "gfx/pokemon/evolotto/frames.asm" XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm" XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm" DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm" diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 65edaa5..d8d026e 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -19,12 +19,12 @@ DebugPokemon1Script: DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, FOLAGE + getmonname STRING_BUFFER_3, EVOLOTTO writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke FOLAGE, 31, RARE_CANDY + givepoke EVOLOTTO, 31, RARE_CANDY closetext end