thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Walking Wake and the Guardian Beast!

Browse source 
- Added preliminary data for Walking Wake and the new Legendary Pokemon Shi-Shi.
- Changed Bellignan's dex entry to reference how Sprout Tower was constructed.
- Changed some dialogue in Sprout Tower to reflect this.

Wake sprite by EyeDonutz
Shi-Shi sprite by me, but still unfinished. Will definitely rework sometime.
This commit is contained in:
Martha Schilling 2023-10-26 16:16:00 +01:00
parent a4854f63ba
commit d4170f5fa8
45 changed files with 225 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/pokemon/base_stats.asm
View file

@ -275,10 +275,12 @@ INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/raikou.asm"
INCLUDE "data/pokemon/base_stats/entei.asm"
INCLUDE "data/pokemon/base_stats/suicune.asm"
INCLUDE "data/pokemon/base_stats/walking_wake.asm"
INCLUDE "data/pokemon/base_stats/larvitar.asm"
INCLUDE "data/pokemon/base_stats/pupitar.asm"
INCLUDE "data/pokemon/base_stats/tyranitar.asm"
INCLUDE "data/pokemon/base_stats/lugia.asm"
INCLUDE "data/pokemon/base_stats/ho_oh.asm"
INCLUDE "data/pokemon/base_stats/shi_shi.asm"
INCLUDE "data/pokemon/base_stats/celebi.asm"
.IndirectEnd::

21
data/pokemon/base_stats/shi_shi.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 106, 154, 90, 110, 130, 90
; hp atk def spd sat sdf
db ICE, FLYING ; type
db 3 ; catch rate
db 220 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 120 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/shi_shi/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, THIEF, NIGHTMARE, FLY, STRENGTH, FLASH, ICE_BEAM
; end

2
data/pokemon/base_stats/walkingwake.asm → data/pokemon/base_stats/walking_wake.asm
View file

@ -11,7 +11,7 @@
db 100 ; unknown 1
db 80 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/walkingwake/front.dimensions"
INCBIN "gfx/pokemon/walking_wake/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups

2
data/pokemon/cries.asm
View file

@ -254,10 +254,12 @@ PokemonCries::
mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU
mon_cry CRY_ENTEI, 0, 416 ; ENTEI
mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE
mon_cry CRY_MAGCARGO, 0, 384 ; WALKING_WAKE
mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR
mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR
mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR
mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA
mon_cry CRY_AIPOM, 0, 384 ; HO_OH
mon_cry CRY_NIDORAN_M, 0, 128 ; SHI_SHI (placeholder)
mon_cry CRY_ENTEI, 330, 273 ; CELEBI
assert_table_length NUM_POKEMON

2
data/pokemon/dex_entries.asm
View file

@ -260,9 +260,11 @@ BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm"
RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raikou.asm"
EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/entei.asm"
SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/suicune.asm"
WalkingWakePokedexEntry:: INCLUDE "data/pokemon/dex_entries/walking_wake.asm"
LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/larvitar.asm"
PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm"
TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm"
LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm"
HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm"
ShiShiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shi_shi.asm"
CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm"

12
data/pokemon/dex_entries/bellignan.asm
View file

@ -1,10 +1,10 @@
db "SPROUT@" ; species name
dw 403, 160 ; height, weight
db "It lives through"
next "absorbing nutrients"
next "in the ground with"
db "It digs its root-"
next "like feet into the"
next "ground to absorb"
page "its root-like"
next "feet. Revered"
next "by some faiths.@"
page "nutrients. It can"
next "grow to an immense"
next "size this way.@"

10
data/pokemon/dex_entries/shi_shi.asm Normal file
View file

@ -0,0 +1,10 @@
db "GUARDIAN@" ; species name
dw 1002, 6060 ; height, weight
db "Said to be the"
next "embodiment of the"
next "the north wind, it"
page "leads and protects"
next "those fleeing from"
next "persecution.@"

10
data/pokemon/dex_entries/walking_wake.asm Normal file
View file

@ -0,0 +1,10 @@
db "PARADOX@" ; species name
dw 1106, 6170 ; height, weight
db "Ecology under"
next "research."
next ""
page "Ecology under"
next "research."
next "@"

2
data/pokemon/dex_entry_pointers.asm
View file

@ -249,10 +249,12 @@ PokedexDataPointerTable:
dba RaikouPokedexEntry
dba EnteiPokedexEntry
dba SuicunePokedexEntry
dba WalkingWakePokedexEntry
dba LarvitarPokedexEntry
dba PupitarPokedexEntry
dba TyranitarPokedexEntry
dba LugiaPokedexEntry
dba HoOhPokedexEntry
dba ShiShiPokedexEntry
dba CelebiPokedexEntry
assert_table_length NUM_POKEMON

2
data/pokemon/dex_order_alpha.asm
View file

@ -198,6 +198,7 @@ AlphabeticalPokedexOrder:
dw SEEL
dw SENTRET
dw SHELLDER
dw SHI_SHI
dw SHUCKLE
dw SKARMORY
dw SKIPLOOM
@ -245,6 +246,7 @@ AlphabeticalPokedexOrder:
dw VILEPLUME
dw VOLTORB
dw VULPIX
dw WALKING_WAKE
dw WARTORTLE
dw WEEDLE
dw WEEPINBELL

2
data/pokemon/dex_order_new.asm
View file

@ -245,6 +245,7 @@ NewPokedexOrder:
dw RAIKOU
dw ENTEI
dw SUICUNE
dw WALKING_WAKE
dw DRATINI
dw DRAGONAIR
dw DRAGONITE
@ -253,6 +254,7 @@ NewPokedexOrder:
dw TYRANITAR
dw LUGIA
dw HO_OH
dw SHI_SHI
dw MEWTWO
dw MEW
dw CELEBI

2
data/pokemon/egg_moves_johto.asm
View file

@ -95,12 +95,14 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw LarvitarEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
.IndirectEnd::
ChikoritaEggMoves:

32
data/pokemon/evos_attacks_johto.asm
View file

@ -95,11 +95,13 @@ EvosAttacksPointers2::
dw RaikouEvosAttacks
dw EnteiEvosAttacks
dw SuicuneEvosAttacks
dw WalkingWakeEvosAttacks
dw LarvitarEvosAttacks
dw PupitarEvosAttacks
dw TyranitarEvosAttacks
dw LugiaEvosAttacks
dw HoOhEvosAttacks
dw ShiShiEvosAttacks
dw CelebiEvosAttacks
.IndirectEnd::
@ -1315,6 +1317,22 @@ SuicuneEvosAttacks:
dbw 71, HYDRO_PUMP
db 0 ; no more level-up moves
WalkingWakeEvosAttacks:
db 0 ; no more evolutions
dbw 1, BITE
dbw 1, LEER
dbw 7, SUNNY_DAY
dbw 14, WATER_GUN
dbw 21, ROAR
dbw 28, DRAGONBREATH
dbw 35, AURORA_BEAM
dbw 42, TWISTER
dbw 49, CRUNCH
dbw 56, OUTRAGE
dbw 63, FLAMETHROWER
dbw 70, HYDRO_PUMP
db 0 ; no more level-up moves
LarvitarEvosAttacks:
dbbw EVOLVE_LEVEL, 30, PUPITAR
db 0 ; no more evolutions
@ -1391,6 +1409,20 @@ HoOhEvosAttacks:
dbw 99, FUTURE_SIGHT
db 0 ; no more level-up moves
ShiShiEvosAttacks:
db 0 ; no more evolutions
dbw 1, FLY ; (placeholder before Wind Ride is added)
dbw 11, SAFEGUARD
dbw 22, GUST
dbw 33, RECOVER
dbw 44, BLIZZARD
dbw 55, CRUNCH
dbw 66, BODY_SLAM
dbw 77, WHIRLWIND
dbw 88, EXTREMESPEED
dbw 99, FUTURE_SIGHT
db 0 ; no more level-up moves
CelebiEvosAttacks:
db 0 ; no more evolutions
dbw 1, LEECH_SEED

2
data/pokemon/first_stages.asm
View file

@ -249,10 +249,12 @@ FirstEvoStages::
dw RAIKOU
dw ENTEI
dw SUICUNE
dw WALKING_WAKE
dw LARVITAR
dw LARVITAR
dw LARVITAR ;f8
dw LUGIA
dw HO_OH
dw SHI_SHI
dw CELEBI
assert_table_length NUM_POKEMON

6
data/pokemon/gen1_order.asm
View file

@ -253,7 +253,7 @@ Pokered_MonIndices:
db SNUBBULL
db GRANBULL
db QWILFISH
db WOBBUFFET
db WOBBUFFET
db BELLIGNAN
assert_table_length NUM_POKEMON + 1
db WALKING_WAKE
db SHI_SHI
assert_table_length NUM_POKEMON - 1

2
data/pokemon/menu_icons.asm
View file

@ -250,10 +250,12 @@ MonMenuIcons:
db ICON_FOX ; RAIKOU
db ICON_FOX ; ENTEI
db ICON_FOX ; SUICUNE
db ICON_MONSTER ; WALKING_WAKE
db ICON_MONSTER ; LARVITAR
db ICON_MONSTER ; PUPITAR
db ICON_MONSTER ; TYRANITAR
db ICON_LUGIA ; LUGIA
db ICON_HO_OH ; HO_OH
db ICON_FOX ; SHI_SHI
db ICON_HUMANSHAPE ; CELEBI
assert_table_length NUM_POKEMON

2
data/pokemon/names.asm
View file

@ -252,10 +252,12 @@ PokemonNames::
db "RAIKOU@@@@"
db "ENTEI@@@@@"
db "SUICUNE@@@"
db "WALKINWAKE" ; this is terrible but unless we can increase the character limit this is our best option
db "LARVITAR@@"
db "PUPITAR@@@"
db "TYRANITAR@"
db "LUGIA@@@@@"
db "HO-OH@@@@@"
db "SHI-SHI@@@"
db "CELEBI@@@@"
assert_table_length NUM_POKEMON

4
data/pokemon/palettes.asm
View file

@ -529,6 +529,8 @@ INCBIN "gfx/pokemon/entei/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/entei/shiny.pal"
INCBIN "gfx/pokemon/suicune/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/suicune/shiny.pal"
INCBIN "gfx/pokemon/walking_wake/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/walking_wake/shiny.pal"
INCBIN "gfx/pokemon/larvitar/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/larvitar/shiny.pal"
INCBIN "gfx/pokemon/pupitar/front.gbcpal", middle_colors
@ -539,6 +541,8 @@ INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/lugia/shiny.pal"
INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/ho_oh/shiny.pal"
INCBIN "gfx/pokemon/shi_shi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/shi_shi/shiny.pal"
INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/celebi/shiny.pal"

4
data/pokemon/pic_pointers.asm
View file

@ -512,6 +512,8 @@ PokemonPicPointers::
dba EnteiBackpic
dba SuicuneFrontpic
dba SuicuneBackpic
dba WalkingWakeFrontpic
dba WalkingWakeBackpic
dba LarvitarFrontpic
dba LarvitarBackpic
dba PupitarFrontpic
@ -522,6 +524,8 @@ PokemonPicPointers::
dba LugiaBackpic
dba HoOhFrontpic
dba HoOhBackpic
dba ShiShiFrontpic
dba ShiShiBackpic
dba CelebiFrontpic
dba CelebiBackpic
assert_table_length NUM_POKEMON + 1