thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-07 06:01:00 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

SURPRISE EVOLOTTO

Browse source 
This took like 10 minutes okay now I'm going to rest for at least a day
This commit is contained in:
Misty 2025-09-14 11:26:54 -06:00
parent 308701db03
commit 5347a46208
32 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -423,6 +423,7 @@ DEF JOHTO_POKEMON EQU const_value
const RUDDERNAUT const RUDDERNAUT
const PIXYTOP const PIXYTOP
const MAWTLE const MAWTLE
const EVOLOTTO
const XYLODON const XYLODON
const XYLOFIN const XYLOFIN
const DOKUROAR const DOKUROAR

1
data/pokemon/base_stats.asm
View file

@ -428,6 +428,7 @@ INCLUDE "data/pokemon/base_stats/inoshika.asm"
INCLUDE "data/pokemon/base_stats/ruddernaut.asm" INCLUDE "data/pokemon/base_stats/ruddernaut.asm"
INCLUDE "data/pokemon/base_stats/pixytop.asm" INCLUDE "data/pokemon/base_stats/pixytop.asm"
INCLUDE "data/pokemon/base_stats/mawtle.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/xylodon.asm"
INCLUDE "data/pokemon/base_stats/xylofin.asm" INCLUDE "data/pokemon/base_stats/xylofin.asm"
INCLUDE "data/pokemon/base_stats/dokuroar.asm" INCLUDE "data/pokemon/base_stats/dokuroar.asm"

1
data/pokemon/cries.asm
View file

@ -407,6 +407,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT
mon_cry CRY_NIDORAN_M, 0, 0 ; PIXYTOP (incomplete) 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 ; 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 ; XYLODON
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN
mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR

2
data/pokemon/dex_entries.asm
View file

@ -441,4 +441,4 @@ MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm"
MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm"
GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm"
BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm" BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm"
EvolottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/evolotto.asm"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -402,6 +402,7 @@ PokedexDataPointerTable:
dba RuddernautPokedexEntry dba RuddernautPokedexEntry
dba PixytopPokedexEntry dba PixytopPokedexEntry
dba MawtlePokedexEntry dba MawtlePokedexEntry
dba EvolottoPokedexEntry
dba XylodonPokedexEntry dba XylodonPokedexEntry
dba XylofinPokedexEntry dba XylofinPokedexEntry
dba DokuroarPokedexEntry dba DokuroarPokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -103,6 +103,7 @@ AlphabeticalPokedexOrder:
dw ENTEI dw ENTEI
dw ESPEON dw ESPEON
dw EUCALA dw EUCALA
dw EVOLOTTO
dw EXEGGCUTE dw EXEGGCUTE
dw EXEGGUTOR dw EXEGGUTOR
dw FARFETCH_D dw FARFETCH_D

1
data/pokemon/dex_order_new.asm
View file

@ -368,6 +368,7 @@ NewPokedexOrder:
dw RUDDERNAUT dw RUDDERNAUT
dw PIXYTOP dw PIXYTOP
dw MAWTLE dw MAWTLE
dw EVOLOTTO
dw XYLODON dw XYLODON
dw XYLOFIN dw XYLOFIN
dw DOKUROAR dw DOKUROAR

1
data/pokemon/egg_moves_johto.asm
View file

@ -177,6 +177,7 @@ EggMovePointers2::
dw RuddernautEggMoves dw RuddernautEggMoves
dw PixytopEggMoves dw PixytopEggMoves
dw MawtleEggMoves dw MawtleEggMoves
dw NoEggMoves2 ; Evolotto
dw XylodonEggMoves dw XylodonEggMoves
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 ; Dokuroar dw NoEggMoves2 ; Dokuroar

1
data/pokemon/evolution_moves.asm
View file

@ -400,6 +400,7 @@ EvolutionMoves::
dw NO_MOVE ;RUDDERNAUT dw NO_MOVE ;RUDDERNAUT
dw NO_MOVE ;PIXYTOP dw NO_MOVE ;PIXYTOP
dw NO_MOVE ;MAWTLE dw NO_MOVE ;MAWTLE
dw NO_MOVE ;EVOLOTTO
dw NO_MOVE ;XYLODON dw NO_MOVE ;XYLODON
dw NO_MOVE ;XYLOFIN dw NO_MOVE ;XYLOFIN
dw NO_MOVE ;DOKUROAR dw NO_MOVE ;DOKUROAR

7
data/pokemon/evos_attacks_johto.asm
View file

@ -176,6 +176,7 @@ EvosAttacksPointers2::
dw RuddernautEvosAttacks dw RuddernautEvosAttacks
dw PixytopEvosAttacks dw PixytopEvosAttacks
dw MawtleEvosAttacks dw MawtleEvosAttacks
dw EvolottoEvosAttacks
dw XylodonEvosAttacks dw XylodonEvosAttacks
dw XylofinEvosAttacks dw XylofinEvosAttacks
dw DokuroarEvosAttacks dw DokuroarEvosAttacks
@ -3030,6 +3031,12 @@ MawtleEvosAttacks:
dbw 60, SKULL_BASH dbw 60, SKULL_BASH
db 0 ; no more level-up moves 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: XylodonEvosAttacks:
dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions
db 0 db 0

1
data/pokemon/first_stages.asm
View file

@ -402,6 +402,7 @@ FirstEvoStages::
dw RUDDERNAUT dw RUDDERNAUT
dw PIXYTOP dw PIXYTOP
dw MAWTLE dw MAWTLE
dw EVOLOTTO
dw XYLODON dw XYLODON
dw XYLODON dw XYLODON
dw DOKUROAR dw DOKUROAR

1
data/pokemon/menu_icons.asm
View file

@ -403,6 +403,7 @@ MonMenuIcons:
db ICON_LAPRAS ; RUDDERNAUT db ICON_LAPRAS ; RUDDERNAUT
db ICON_CLEFAIRY ; PIXYTOP db ICON_CLEFAIRY ; PIXYTOP
db ICON_SQUIRTLE ; MAWTLE db ICON_SQUIRTLE ; MAWTLE
db ICON_BLOB ; EVOLOTTO
db ICON_MONSTER ; XYLODON db ICON_MONSTER ; XYLODON
db ICON_MONSTER ; XYLOFIN db ICON_MONSTER ; XYLOFIN
db ICON_MONSTER ; DOKUROAR db ICON_MONSTER ; DOKUROAR

1
data/pokemon/names.asm
View file

@ -406,6 +406,7 @@ PokemonNames::
db "RUDDERNAUT" db "RUDDERNAUT"
db "PIXYTOP@@@" db "PIXYTOP@@@"
db "MAWTLE@@@@" db "MAWTLE@@@@"
db "EVOLOTTO@@"
db "XYLODON@@@" db "XYLODON@@@"
db "XYLOFIN@@@" db "XYLOFIN@@@"
db "DOKUROAR@@" db "DOKUROAR@@"

2
data/pokemon/palettes.asm
View file

@ -836,6 +836,8 @@ INCBIN "gfx/pokemon/pixytop/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pixytop/shiny.pal" INCLUDE "gfx/pokemon/pixytop/shiny.pal"
INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mawtle/shiny.pal" 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 INCBIN "gfx/pokemon/xylodon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/xylodon/shiny.pal" INCLUDE "gfx/pokemon/xylodon/shiny.pal"
INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -818,6 +818,8 @@ PokemonPicPointers::
dba PixytopBackpic dba PixytopBackpic
dba MawtleFrontpic dba MawtleFrontpic
dba MawtleBackpic dba MawtleBackpic
dba EvolottoFrontpic
dba EvolottoBackpic
dba XylodonFrontpic dba XylodonFrontpic
dba XylodonBackpic dba XylodonBackpic
dba XylofinFrontpic dba XylofinFrontpic

BIN
gfx/footprints/evolotto.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

1
gfx/footprints_johto.asm
View file

@ -176,6 +176,7 @@ INCBIN "gfx/footprints/inoshika.1bpp"
INCBIN "gfx/footprints/ruddernaut.1bpp" INCBIN "gfx/footprints/ruddernaut.1bpp"
INCBIN "gfx/footprints/pixytop.1bpp" INCBIN "gfx/footprints/pixytop.1bpp"
INCBIN "gfx/footprints/mawtle.1bpp" INCBIN "gfx/footprints/mawtle.1bpp"
INCBIN "gfx/footprints/evolotto.1bpp"
INCBIN "gfx/footprints/xylodon.1bpp" INCBIN "gfx/footprints/xylodon.1bpp"
INCBIN "gfx/footprints/xylofin.1bpp" INCBIN "gfx/footprints/xylofin.1bpp"
INCBIN "gfx/footprints/dokuroar.1bpp" INCBIN "gfx/footprints/dokuroar.1bpp"

2
gfx/pics.asm
View file

@ -1123,6 +1123,8 @@ PixytopFrontpic: INCBIN "gfx/pokemon/pixytop/front.animated.2bpp.lz"
PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz" PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz"
MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz" MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz"
MawtleBackpic: INCBIN "gfx/pokemon/mawtle/back.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" AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz"
AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -402,6 +402,7 @@ AnimationPointers:
dw RuddernautAnimation dw RuddernautAnimation
dw PixytopAnimation dw PixytopAnimation
dw MawtleAnimation dw MawtleAnimation
dw EvolottoAnimation
dw XylodonAnimation dw XylodonAnimation
dw XylofinAnimation dw XylofinAnimation
dw DokuroarAnimation dw DokuroarAnimation

1
gfx/pokemon/anims.asm
View file

@ -400,6 +400,7 @@ InoshikaAnimation: INCLUDE "gfx/pokemon/inoshika/anim.asm"
RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm" RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm"
PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm" PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm"
MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm" MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm"
EvolottoAnimation: INCLUDE "gfx/pokemon/evolotto/anim.asm"
XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm" XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm"
XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm" XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm"
DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm" DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -402,6 +402,7 @@ BitmasksPointers:
dw RuddernautBitmasks dw RuddernautBitmasks
dw PixytopBitmasks dw PixytopBitmasks
dw MawtleBitmasks dw MawtleBitmasks
dw EvolottoBitmasks
dw XylodonBitmasks dw XylodonBitmasks
dw XylofinBitmasks dw XylofinBitmasks
dw DokuroarBitmasks dw DokuroarBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -400,6 +400,7 @@ InoshikaBitmasks: INCLUDE "gfx/pokemon/inoshika/bitmask.asm"
RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm" RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm"
PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm" PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm"
MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm" MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm"
EvolottoBitmasks: INCLUDE "gfx/pokemon/evolotto/bitmask.asm"
XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm" XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm"
XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm" XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm"
DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm" DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm"

1
gfx/pokemon/evolotto/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/evolotto/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/evolotto/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/evolotto/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/evolotto/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

1
gfx/pokemon/frame_pointers.asm
View file

@ -402,6 +402,7 @@ FramesPointers:
dba RuddernautFrames dba RuddernautFrames
dba PixytopFrames dba PixytopFrames
dba MawtleFrames dba MawtleFrames
dba EvolottoFrames
dba XylodonFrames dba XylodonFrames
dba XylofinFrames dba XylofinFrames
dba DokuroarFrames dba DokuroarFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -402,6 +402,7 @@ AnimationIdlePointers:
dw RuddernautAnimationIdle dw RuddernautAnimationIdle
dw PixytopAnimationIdle dw PixytopAnimationIdle
dw MawtleAnimationIdle dw MawtleAnimationIdle
dw EvolottoAnimationIdle
dw XylodonAnimationIdle dw XylodonAnimationIdle
dw XylofinAnimationIdle dw XylofinAnimationIdle
dw DokuroarAnimationIdle dw DokuroarAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -400,6 +400,7 @@ InoshikaAnimationIdle: INCLUDE "gfx/pokemon/inoshika/anim_idle.asm"
RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm" RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm"
PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm" PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm"
MawtleAnimationIdle: INCLUDE "gfx/pokemon/mawtle/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" XylodonAnimationIdle: INCLUDE "gfx/pokemon/xylodon/anim_idle.asm"
XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm" XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm"
DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm" DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm"

1
gfx/pokemon/johto_frames.asm
View file

@ -176,6 +176,7 @@ InoshikaFrames: INCLUDE "gfx/pokemon/inoshika/frames.asm"
RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm" RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm"
PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm" PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm"
MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm" MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm"
EvolottoFrames: INCLUDE "gfx/pokemon/evolotto/frames.asm"
XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm" XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm"
XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm" XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm"
DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm" DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm"

4
maps/DebugRoom.asm
View file

@ -19,12 +19,12 @@ DebugPokemon1Script:
DebugPokemon2Script: DebugPokemon2Script:
opentext opentext
getmonname STRING_BUFFER_3, FOLAGE getmonname STRING_BUFFER_3, EVOLOTTO
writetext ReceivedDebugPokemonText writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON
waitsfx waitsfx
promptbutton promptbutton
givepoke FOLAGE, 31, RARE_CANDY givepoke EVOLOTTO, 31, RARE_CANDY
closetext closetext
end end