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

Merge branch 'ZetaNull:master' into master

Browse source
This commit is contained in:
thornAvery 2023-10-28 06:48:02 +11:00 committed by GitHub
parent ba3612713b 721b6a5d8f
commit 7a0ef631bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 831 additions and 623 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/pokemon_constants.asm
View file

@ -27,7 +27,7 @@
const CHARIZARD ; 06
const SQUIRTLE ; 07
const WARTORTLE ; 08
const TOTARTLE ; 09
const TOTARTLE ; 09
const CATERPIE ; 0a
const METAPOD ; 0b
const BUTTERFREE ; 0c
@ -268,13 +268,15 @@ DEF JOHTO_POKEMON EQU const_value
const RAIKOU ; f3
const ENTEI ; f4
const SUICUNE ; f5
const WALKING_WAKE
const LARVITAR ; f6
const PUPITAR ; f7
const TYRANITAR ; f8
const LUGIA ; f9
const HO_OH ; fa
const SHI_SHI
const CELEBI ; fb
DEF NUM_POKEMON EQU const_value - 1
DEF NUM_POKEMON EQU const_value
DEF EGG EQU -3

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, EXTREMESPEED
dbw 77, WHIRLWIND
dbw 88, ANCIENTPOWER
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

9
data/trainers/parties.asm
View file

@ -4699,13 +4699,10 @@ SageGroup:
db -1 ; end
next_list_item ; SAGE (9)
db "LI@", TRAINERTYPE_NORMAL
db 7
dw BELLSPROUT
db 7
dw BELLSPROUT
db "LI@", TRAINERTYPE_MOVES
db 10
dw HOOTHOOT
dw BELLIGNAN
dw FLASH, VINE_WHIP, GROWTH, WRAP
db -1 ; end
next_list_item ; SAGE (10)

30
data/wild/johto_grass.asm
View file

@ -1681,32 +1681,36 @@ JohtoGrassWildMons:
dbw 27, GRAVELER
end_grass_wildmons
; Buff Phanpy encounter rates to replace Geodude in the daytime, expanding on Crystal's work.
; Ports the 5% Jigglypuff all-day encounter from GS.
; Makes Hoothoot replace a Rattata at night to have continuity with Spearow.
; Overall, increased Johto frequency that matches early advertising for the game.
def_grass_wildmons ROUTE_46
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 2, GEODUDE
dbw 2, SPEAROW
dbw 3, GEODUDE
dbw 3, RATTATA
dbw 2, PHANPY
dbw 2, RATTATA
dbw 2, RATTATA
; day
dbw 2, GEODUDE
dbw 2, SPEAROW
dbw 3, GEODUDE
dbw 3, PHANPY
dbw 3, RATTATA
dbw 2, RATTATA
dbw 2, JIGGLYPUFF
dbw 2, JIGGLYPUFF
; day
dbw 2, PHANPY
dbw 2, SPEAROW
dbw 3, PHANPY
dbw 3, RATTATA
dbw 2, RATTATA
dbw 2, RATTATA
dbw 2, JIGGLYPUFF
dbw 2, JIGGLYPUFF
; nite
dbw 2, GEODUDE
dbw 2, RATTATA
dbw 2, HOOTHOOT
dbw 3, GEODUDE
dbw 3, RATTATA
dbw 2, RATTATA
dbw 2, RATTATA
dbw 2, RATTATA
dbw 2, JIGGLYPUFF
dbw 2, JIGGLYPUFF
end_grass_wildmons
def_grass_wildmons SILVER_CAVE_OUTSIDE

1178
data/wild/kanto_grass.asm
View file

File diff suppressed because it is too large Load diff

4
gfx/footprints.asm
View file

@ -249,11 +249,13 @@ INCBIN "gfx/footprints/blissey.1bpp"
INCBIN "gfx/footprints/raikou.1bpp"
INCBIN "gfx/footprints/entei.1bpp"
INCBIN "gfx/footprints/suicune.1bpp"
INCBIN "gfx/footprints/walking_wake.1bpp"
INCBIN "gfx/footprints/larvitar.1bpp"
INCBIN "gfx/footprints/pupitar.1bpp"
INCBIN "gfx/footprints/tyranitar.1bpp"
INCBIN "gfx/footprints/lugia.1bpp"
INCBIN "gfx/footprints/ho_oh.1bpp"
INCBIN "gfx/footprints/shi_shi.1bpp"
INCBIN "gfx/footprints/celebi.1bpp"
INCBIN "gfx/footprints/252.1bpp"
INCBIN "gfx/footprints/253.1bpp"
@ -261,4 +263,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp"
assert_table_length $102
assert_table_length $104

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

4
gfx/pics.asm
View file

@ -719,6 +719,10 @@ BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz"
WalkingWakeBackpic: INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz"
ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz"
ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz"
INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -248,10 +248,12 @@ AnimationPointers:
dw RaikouAnimation
dw EnteiAnimation
dw SuicuneAnimation
dw WalkingWakeAnimation
dw LarvitarAnimation
dw PupitarAnimation
dw TyranitarAnimation
dw LugiaAnimation
dw HoOhAnimation
dw ShiShiAnimation
dw CelebiAnimation
assert_table_length NUM_POKEMON

2
gfx/pokemon/anims.asm
View file

@ -246,10 +246,12 @@ BlisseyAnimation: INCLUDE "gfx/pokemon/blissey/anim.asm"
RaikouAnimation: INCLUDE "gfx/pokemon/raikou/anim.asm"
EnteiAnimation: INCLUDE "gfx/pokemon/entei/anim.asm"
SuicuneAnimation: INCLUDE "gfx/pokemon/suicune/anim.asm"
WalkingWakeAnimation: INCLUDE "gfx/pokemon/walking_wake/anim.asm"
LarvitarAnimation: INCLUDE "gfx/pokemon/larvitar/anim.asm"
PupitarAnimation: INCLUDE "gfx/pokemon/pupitar/anim.asm"
TyranitarAnimation: INCLUDE "gfx/pokemon/tyranitar/anim.asm"
LugiaAnimation: INCLUDE "gfx/pokemon/lugia/anim.asm"
HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/anim.asm"
ShiShiAnimation: INCLUDE "gfx/pokemon/shi_shi/anim.asm"
CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm"
EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -248,10 +248,12 @@ BitmasksPointers:
dw RaikouBitmasks
dw EnteiBitmasks
dw SuicuneBitmasks
dw WalkingWakeBitmasks
dw LarvitarBitmasks
dw PupitarBitmasks
dw TyranitarBitmasks
dw LugiaBitmasks
dw HoOhBitmasks
dw ShiShiBitmasks
dw CelebiBitmasks
assert_table_length NUM_POKEMON

2
gfx/pokemon/bitmasks.asm
View file

@ -246,10 +246,12 @@ BlisseyBitmasks: INCLUDE "gfx/pokemon/blissey/bitmask.asm"
RaikouBitmasks: INCLUDE "gfx/pokemon/raikou/bitmask.asm"
EnteiBitmasks: INCLUDE "gfx/pokemon/entei/bitmask.asm"
SuicuneBitmasks: INCLUDE "gfx/pokemon/suicune/bitmask.asm"
WalkingWakeBitmasks: INCLUDE "gfx/pokemon/walking_wake/bitmask.asm"
LarvitarBitmasks: INCLUDE "gfx/pokemon/larvitar/bitmask.asm"
PupitarBitmasks: INCLUDE "gfx/pokemon/pupitar/bitmask.asm"
TyranitarBitmasks: INCLUDE "gfx/pokemon/tyranitar/bitmask.asm"
LugiaBitmasks: INCLUDE "gfx/pokemon/lugia/bitmask.asm"
HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/bitmask.asm"
ShiShiBitmasks: INCLUDE "gfx/pokemon/shi_shi/bitmask.asm"
CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm"
EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm"

2
gfx/pokemon/frame_pointers.asm
View file

@ -248,10 +248,12 @@ FramesPointers:
dba RaikouFrames
dba EnteiFrames
dba SuicuneFrames
dba WalkingWakeFrames
dba LarvitarFrames
dba PupitarFrames
dba TyranitarFrames
dba LugiaFrames
dba HoOhFrames
dba ShiShiFrames
dba CelebiFrames
assert_table_length NUM_POKEMON

2
gfx/pokemon/idle_pointers.asm
View file

@ -248,10 +248,12 @@ AnimationIdlePointers:
dw RaikouAnimationIdle
dw EnteiAnimationIdle
dw SuicuneAnimationIdle
dw WalkingWakeAnimationIdle
dw LarvitarAnimationIdle
dw PupitarAnimationIdle
dw TyranitarAnimationIdle
dw LugiaAnimationIdle
dw HoOhAnimationIdle
dw ShiShiAnimationIdle
dw CelebiAnimationIdle
assert_table_length NUM_POKEMON

2
gfx/pokemon/idles.asm
View file

@ -246,10 +246,12 @@ BlisseyAnimationIdle: INCLUDE "gfx/pokemon/blissey/anim_idle.asm"
RaikouAnimationIdle: INCLUDE "gfx/pokemon/raikou/anim_idle.asm"
EnteiAnimationIdle: INCLUDE "gfx/pokemon/entei/anim_idle.asm"
SuicuneAnimationIdle: INCLUDE "gfx/pokemon/suicune/anim_idle.asm"
WalkingWakeAnimationIdle: INCLUDE "gfx/pokemon/walking_wake/anim_idle.asm"
LarvitarAnimationIdle: INCLUDE "gfx/pokemon/larvitar/anim_idle.asm"
PupitarAnimationIdle: INCLUDE "gfx/pokemon/pupitar/anim_idle.asm"
TyranitarAnimationIdle: INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm"
LugiaAnimationIdle: INCLUDE "gfx/pokemon/lugia/anim_idle.asm"
HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm"
ShiShiAnimationIdle: INCLUDE "gfx/pokemon/shi_shi/anim_idle.asm"
CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm"

2
gfx/pokemon/johto_frames.asm
View file

@ -94,10 +94,12 @@ BlisseyFrames: INCLUDE "gfx/pokemon/blissey/frames.asm"
RaikouFrames: INCLUDE "gfx/pokemon/raikou/frames.asm"
EnteiFrames: INCLUDE "gfx/pokemon/entei/frames.asm"
SuicuneFrames: INCLUDE "gfx/pokemon/suicune/frames.asm"
WalkingWakeFrames: INCLUDE "gfx/pokemon/walking_wake/frames.asm"
LarvitarFrames: INCLUDE "gfx/pokemon/larvitar/frames.asm"
PupitarFrames: INCLUDE "gfx/pokemon/pupitar/frames.asm"
TyranitarFrames: INCLUDE "gfx/pokemon/tyranitar/frames.asm"
LugiaFrames: INCLUDE "gfx/pokemon/lugia/frames.asm"
HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/frames.asm"
ShiShiFrames: INCLUDE "gfx/pokemon/shi_shi/frames.asm"
CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm"
EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm"

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 565 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 888 B

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

@ -0,0 +1,2 @@
RGB 18, 18, 11
RGB 25, 25, 18

32
gfx/pokemon/walking_wake/anim.asm Normal file
View file

@ -0,0 +1,32 @@
frame 0, 04
frame 4, 04
frame 5, 04
frame 6, 04
frame 7, 04
frame 8, 04
frame 5, 04
frame 6, 04
frame 7, 06
frame 8, 06
frame 5, 06
frame 6, 06
frame 7, 06
frame 4, 06
frame 1, 04
frame 2, 04
frame 3, 04
frame 0, 04
frame 1, 04
frame 2, 04
frame 3, 04
frame 1, 08
frame 2, 09
frame 3, 10
frame 9, 03
frame 10, 02
frame 11, 02
frame 0, 04
frame 12, 06
frame 0, 04
frame 12, 06
endanim

6
gfx/pokemon/walking_wake/anim_idle.asm Normal file
View file

@ -0,0 +1,6 @@
frame 12, 35
setrepeat 2
frame 0, 06
frame 12, 06
dorepeat 2
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 588 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

4
gfx/pokemon/walking_wake/shiny.pal Normal file
View file

@ -0,0 +1,4 @@
RGB 25, 24, 31
RGB 16, 19, 24

38
maps/PlayersHouse2F.asm
View file

@ -119,7 +119,7 @@ DebugPokemon1Script:
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke BELLIGNAN, 35, RARE_CANDY
givepoke BELLIGNAN, 35, MASTER_BALL
closetext
end
@ -141,6 +141,40 @@ ReceivedDebugPokemonText:
text "!"
done
DebugPokemon3Script:
faceplayer
opentext
writetext DebugTextA
cry WALKING_WAKE
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon WALKING_WAKE, 40
startbattle
reloadmapafterbattle
end
DebugTextA:
text "Waaaake!!"
done
DebugPokemon4Script:
faceplayer
opentext
writetext DebugTextB
cry SHI_SHI
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon SHI_SHI, 40
startbattle
reloadmapafterbattle
end
DebugTextB:
text "Komaiiii!"
done
PlayersHouse2F_MapEvents:
db 0, 0 ; filler
@ -163,4 +197,6 @@ PlayersHouse2F_MapEvents:
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
object_event 2, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon1Script, -1
object_event 7, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1
object_event 3, 5, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon3Script, -1
object_event 6, 5, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon4Script, -1

2
maps/SproutTower1F.asm
View file

@ -77,7 +77,7 @@ SproutTower1FSage2Text:
done
SproutTower1FGrannyText:
text "A BELLSPROUT over"
text "A BELLIGNAN over"
line "100 feet tall…"
para "People say that it"