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

These Fires be Gouging, yo

Browse source 
The bolts are also raging but they look fucking dumb so who cares

- Adds Gouging Fire and Raging Bolt, complete with sprites and learnsets. Gouging Fire was done by Zeta_Null, and Raging Bolt was done by Albatross, who did a great job at making the giraffe-necked smilodon look less ridiculous.

- Added a proper dex entry for Wake, based on the ones added in SV's Indigo Disk DLC.

- Fixed a bug with Lickilicky and Lickilord's dex entries where they weren't terminated correcly

- Made Rock Slash less obscene, now acting like Stone Edge without the raised crit chance.

- Changed the layout of the Beginning World (Debug Room) ever so slightly.
This commit is contained in:
Martha Schilling 2024-03-15 20:56:55 +00:00
parent 0116edcb25
commit 51a7593d6f
49 changed files with 229 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/pokemon/base_stats.asm
View file

@ -319,10 +319,12 @@ INCLUDE "data/pokemon/base_stats/elekid.asm"
INCLUDE "data/pokemon/base_stats/magby.asm"
INCLUDE "data/pokemon/base_stats/miltank.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/raging_bolt.asm"
INCLUDE "data/pokemon/base_stats/gouging_fire.asm"
INCLUDE "data/pokemon/base_stats/walking_wake.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"

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 105, 115, 121, 91, 65, 93
; hp atk def spd sat sdf
db FIRE, DRAGON ; type
db 3 ; catch rate
db 217 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 80 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/gouging_fire/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, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER
; end

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 125, 73, 91, 75, 137, 89
; hp atk def spd sat sdf
db ELECTRIC, DRAGON ; type
db 3 ; catch rate
db 216 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 80 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/raging_bolt/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, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT
; end

4
data/pokemon/cries.asm
View file

@ -298,10 +298,12 @@ PokemonCries::
mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY
mon_cry CRY_GLIGAR, -461, 416 ; MILTANK
mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY
mon_cry CRY_RAIKOU, 564, 310 ; RAGING_BOLT
mon_cry CRY_ENTEI, 5, 432 ; GOUGING_FIRE
mon_cry CRY_MAGCARGO, 3, 400 ; WALKING_WAKE
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

4
data/pokemon/dex_entries.asm
View file

@ -304,10 +304,12 @@ ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/elekid.asm"
MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magby.asm"
MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/miltank.asm"
BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm"
RagingBoltPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raging_bolt.asm"
GougingFirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gouging_fire.asm"
WalkingWakePokedexEntry:: INCLUDE "data/pokemon/dex_entries/walking_wake.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"

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

@ -0,0 +1,10 @@
db "PARADOX@" ; species name
dw 1106, 13000 ; height, weight
db "Rumors state that"
next "this violent #-"
next "MON was the result"
page "of an attempt to"
next "resurrect a"
next "fossilized ENTEI.@"

2
data/pokemon/dex_entries/lickilicky.asm
View file

@ -7,4 +7,4 @@
page "can be extended"
next "with enough force"
next "to crush boulders."
next "to crush boulders.@"

2
data/pokemon/dex_entries/lickilord.asm
View file

@ -7,4 +7,4 @@
page "ches. A single"
next "lick causes"
next "severe poisoning."
next "severe poisoning.@"

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

@ -0,0 +1,10 @@
db "PARADOX@" ; species name
dw 1701, 10580 ; height, weight
db "Believed to be"
next "RAIKOU's ancestor,"
next "The lightning that"
page "it shoots from its"
next "cloud-shaped mane"
next "can burn anything.@"

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

@ -1,10 +1,10 @@
db "PARADOX@" ; species name
dw 1106, 6170 ; height, weight
db "Ecology under"
next "research."
next ""
db "This prehistoric,"
next "ferocious creature"
next "resembles SUICUNE."
page "Ecology under"
next "research."
next "@"
page "Has been witnessed"
next "racing atop lakes"
next "at high speed.@"

4
data/pokemon/dex_entry_pointers.asm
View file

@ -293,10 +293,12 @@ PokedexDataPointerTable:
dba MagbyPokedexEntry
dba MiltankPokedexEntry
dba BlisseyPokedexEntry
dba RagingBoltPokedexEntry
dba GougingFirePokedexEntry
dba WalkingWakePokedexEntry
dba RaikouPokedexEntry
dba EnteiPokedexEntry
dba SuicunePokedexEntry
dba WalkingWakePokedexEntry
dba LarvitarPokedexEntry
dba PupitarPokedexEntry
dba TyranitarPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -100,6 +100,7 @@ AlphabeticalPokedexOrder:
dw GOLEM
dw GOROCHU
dw GOROTORA
dw GOUGING_FIRE
dw GRANBULL
dw GRAVELER
dw GRIMER
@ -220,6 +221,7 @@ AlphabeticalPokedexOrder:
dw QUAGSIRE
dw QUILAVA
dw QWILFISH
dw RAGING_BOLT
dw RAICHU
dw RAITORA
dw RAIKOU

4
data/pokemon/dex_order_new.asm
View file

@ -289,10 +289,12 @@ NewPokedexOrder:
dw ARTICUNO
dw ZAPDOS
dw MOLTRES
dw RAGING_BOLT
dw GOUGING_FIRE
dw WALKING_WAKE
dw RAIKOU
dw ENTEI
dw SUICUNE
dw WALKING_WAKE
dw DRATINI
dw DRAGONAIR
dw DRAGONITE

2
data/pokemon/egg_moves_johto.asm
View file

@ -120,6 +120,8 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw LarvitarEggMoves
dw NoEggMoves2
dw NoEggMoves2

68
data/pokemon/evos_attacks_johto.asm
View file

@ -115,10 +115,12 @@ EvosAttacksPointers2::
dw MagbyEvosAttacks
dw MiltankEvosAttacks
dw BlisseyEvosAttacks
dw RagingBoltEvosAttacks
dw GougingFireEvosAttacks
dw WalkingWakeEvosAttacks
dw RaikouEvosAttacks
dw EnteiEvosAttacks
dw SuicuneEvosAttacks
dw WalkingWakeEvosAttacks
dw LarvitarEvosAttacks
dw PupitarEvosAttacks
dw TyranitarEvosAttacks
@ -1619,6 +1621,54 @@ BlisseyEvosAttacks:
dbw 40, LIGHT_SCREEN
dbw 47, DOUBLE_EDGE
db 0 ; no more level-up moves
RagingBoltEvosAttacks:
db 0 ; no more evolutions
dbw 1, STOMP
dbw 1, LEER
dbw 7, SUNNY_DAY
dbw 14, THUNDERSHOCK
dbw 21, ROAR
dbw 28, DRAGONBREATH
dbw 35, THUNDERBOLT
dbw 42, TWISTER
dbw 49, ZAP_CANNON
dbw 56, OUTRAGE
dbw 63, BODY_SLAM
dbw 70, THUNDER
db 0 ; no more level-up moves
GougingFireEvosAttacks:
db 0 ; no more evolutions
dbw 1, BITE
dbw 1, LEER
dbw 7, SUNNY_DAY
dbw 14, FLAME_WHEEL
dbw 21, ROAR
dbw 28, DRAGONBREATH
dbw 35, FLAMETHROWER
dbw 42, MORNING_SUN
dbw 49, PROTECT
dbw 56, OUTRAGE
dbw 63, ROCK_HEAD
dbw 70, FIRE_BLAST
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
RaikouEvosAttacks:
db 0 ; no more evolutions
@ -1659,22 +1709,6 @@ 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

4
data/pokemon/first_stages.asm
View file

@ -293,10 +293,12 @@ FirstEvoStages::
dw MAGBY ;f0
dw MILTANK
dw CHANSEY
dw RAGING_BOLT
dw GOUGING_FIRE
dw WALKING_WAKE
dw RAIKOU
dw ENTEI
dw SUICUNE
dw WALKING_WAKE
dw LARVITAR
dw LARVITAR
dw LARVITAR ;f8

2
data/pokemon/gen1_order.asm
View file

@ -303,4 +303,6 @@ Pokered_MonIndices:
db JUNGELA
db FOLAGE
db BARREAU
db RAGING_BOLT
db GOUGING_FIRE
assert_table_length NUM_POKEMON - 1

4
data/pokemon/menu_icons.asm
View file

@ -294,10 +294,12 @@ MonMenuIcons:
db ICON_HUMANSHAPE ; MAGBY
db ICON_EQUINE ; MILTANK
db ICON_CLEFAIRY ; BLISSEY
db ICON_MONSTER ; RAGING_BOLT
db ICON_MONSTER ; GOUGING_FIRE
db ICON_MONSTER ; WALKING_WAKE
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

4
data/pokemon/names.asm
View file

@ -296,10 +296,12 @@ PokemonNames::
db "MAGBY@@@@@"
db "MILTANK@@@"
db "BLISSEY@@@"
db "RAGINGBOLT"
db "GOUGINFIRE" ; this is terrible but unless we can increase the character limit this is our best option
db "WALKINWAKE" ; see above
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@"

8
data/pokemon/palettes.asm
View file

@ -617,14 +617,18 @@ INCBIN "gfx/pokemon/miltank/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/miltank/shiny.pal"
INCBIN "gfx/pokemon/blissey/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/blissey/shiny.pal"
INCBIN "gfx/pokemon/raging_bolt/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/raging_bolt/shiny.pal"
INCBIN "gfx/pokemon/gouging_fire/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gouging_fire/shiny.pal"
INCBIN "gfx/pokemon/walking_wake/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/walking_wake/shiny.pal"
INCBIN "gfx/pokemon/raikou/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/raikou/shiny.pal"
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

8
data/pokemon/pic_pointers.asm
View file

@ -600,14 +600,18 @@ PokemonPicPointers::
dba MiltankBackpic
dba BlisseyFrontpic
dba BlisseyBackpic
dba RagingBoltFrontpic
dba RagingBoltBackpic
dba GougingFireFrontpic
dba GougingFireBackpic
dba WalkingWakeFrontpic
dba WalkingWakeBackpic
dba RaikouFrontpic
dba RaikouBackpic
dba EnteiFrontpic
dba EnteiBackpic
dba SuicuneFrontpic
dba SuicuneBackpic
dba WalkingWakeFrontpic
dba WalkingWakeBackpic
dba LarvitarFrontpic
dba LarvitarBackpic
dba PupitarFrontpic