SURPRISE EVOLOTTO

This took like 10 minutes okay now I'm going to rest for at least a day
2026-02-20 22:48:43 +13:00 · 2025-09-14 11:26:54 -06:00 · 2025-09-14 11:26:54 -06:00 · 5347a46208
commit 5347a46208
parent 308701db03
32 changed files with 40 additions and 3 deletions
--- 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"
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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@@"
--- 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
--- 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