thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-12-02 17:44:31 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Terrados & Bug Fix

Browse source 
Fixes Molambino and Luanbo not evolving properly (oops) and adds Magiprey/Terrados. Since there's no place to put Magiprey in Johto or Kanto, this'll likely be a Nihon exclusive. Got some stuff in mind!
This commit is contained in:
Llinos Evans 2024-07-07 09:27:46 +01:00
parent b451ca81ce
commit 62bdbe2a1b
44 changed files with 151 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/pokemon_constants.asm
View file

@ -184,6 +184,8 @@
const TAUROS ; 80
const MAGIKARP ; 81
const GYARADOS ; 82
const MAGIPREY
const TERRADOS
const LAPRAS ; 83
const DITTO ; 84
const EEVEE ; 85

2
data/pokemon/base_stats.asm
View file

@ -192,6 +192,8 @@ INCLUDE "data/pokemon/base_stats/tricules.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
INCLUDE "data/pokemon/base_stats/magikarp.asm"
INCLUDE "data/pokemon/base_stats/gyarados.asm"
INCLUDE "data/pokemon/base_stats/magiprey.asm"
INCLUDE "data/pokemon/base_stats/terrados.asm"
INCLUDE "data/pokemon/base_stats/lapras.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
INCLUDE "data/pokemon/base_stats/eevee.asm"

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 20, 10, 55, 80, 15, 20
; hp atk def spd sat sdf
db GROUND, GROUND ; type
db 255 ; catch rate
db 20 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 5 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/magiprey/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_MINERAL, EGG_DRAGON ; egg groups
; tm/hm learnset
tmhm
; end

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 95, 125, 79, 81, 60, 100
; hp atk def spd sat sdf
db GROUND, DARK ; type
db 45 ; catch rate
db 214 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 5 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/terrados/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_MINERAL, EGG_DRAGON ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER
; end

2
data/pokemon/cries.asm
View file

@ -171,6 +171,8 @@ PokemonCries::
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS
mon_cry CRY_EKANS, 128, 128 ; MAGIKARP
mon_cry CRY_EKANS, 0, 256 ; GYARADOS
mon_cry CRY_EKANS, 128, 128 ; MAGIPREY (incomplete)
mon_cry CRY_EKANS, 0, 256 ; TERRADOS (incomplete)
mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS
mon_cry CRY_PIDGEY, 255, 383 ; DITTO
mon_cry CRY_VENONAT, 136, 224 ; EEVEE

2
data/pokemon/dex_entries.asm
View file

@ -373,3 +373,5 @@ 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"
MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm"
TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm"

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

@ -0,0 +1,10 @@
db "LAMPREY@" ; species name
dw 211, 220 ; height, weight
db "It hides in desert"
next "sands. When #MON"
next "come close, it"
page "latches onto"
next "them to suck"
next "their blood.@" ; blood is rarely said in mons so consider revising

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

@ -0,0 +1,10 @@
db "TREMOR@" ; species name
dw 2104, 5180 ; height, weight
db "It blindly tunnels"
next "through the earth,"
next "feasting on any,"
page "unfortunate GRAVELER"
next "or ONIX that it"
next "comes across.@"

2
data/pokemon/dex_entry_pointers.asm
View file

@ -166,6 +166,8 @@ PokedexDataPointerTable:
dba TaurosPokedexEntry
dba MagikarpPokedexEntry
dba GyaradosPokedexEntry
dba MagipreyPokedexEntry
dba TerradosPokedexEntry
dba LaprasPokedexEntry
dba DittoPokedexEntry
dba EeveePokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -182,6 +182,7 @@ AlphabeticalPokedexOrder:
dw MAGBY
dw MAGCARGO
dw MAGIKARP
dw MAGIPREY
dw MAGMAR
dw MAGNEMITE
dw MAGNETON
@ -320,6 +321,7 @@ AlphabeticalPokedexOrder:
dw TEDDIURSA
dw TENTACOOL
dw TENTACRUEL
dw TERRADOS
dw TOGEPI
dw TOGETIC
dw TOGEKISS

2
data/pokemon/dex_order_new.asm
View file

@ -101,6 +101,8 @@ NewPokedexOrder:
dw REROAD
dw MAGIKARP
dw GYARADOS
dw MAGIPREY
dw TERRADOS
dw ORFRY
dw GOLDEEN
dw SEAKING

2
data/pokemon/egg_moves_kanto.asm
View file

@ -166,6 +166,8 @@ EggMovePointers1:
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Magiprey
dw NoEggMoves1 ; Terrados
dw LaprasEggMoves
dw NoEggMoves1
dw EeveeEggMoves

4
data/pokemon/evos_attacks_johto.asm
View file

@ -1981,7 +1981,7 @@ TonquitoEvosAttacks:
db 0 ; no more level-up moves
MolambinoEvosAttacks:
db EVOLVE_LEVEL, 20, LUANBO
dbbw EVOLVE_LEVEL, 20, LUANBO
dbw 1, BUBBLE
dbw 1, SUPERSONIC
; dbw 7, DRAINING_KISS ; move not yet implemented
@ -1995,7 +1995,7 @@ MolambinoEvosAttacks:
db 0 ; no more level-up moves
LuanboEvosAttacks:
db EVOLVE_LEVEL, 35, GRANBO
dbbw EVOLVE_LEVEL, 35, GRANBO
dbw 1, BUBBLE
dbw 1, SUPERSONIC
; dbw 7, DRAINING_KISS ; move not yet implemented

22
data/pokemon/evos_attacks_kanto.asm
View file

@ -166,6 +166,8 @@ EvosAttacksPointers1::
dw TaurosEvosAttacks
dw MagikarpEvosAttacks
dw GyaradosEvosAttacks
dw MagipreyEvosAttacks
dw TerradosEvosAttacks
dw LaprasEvosAttacks
dw DittoEvosAttacks
dw EeveeEvosAttacks
@ -2452,6 +2454,26 @@ GyaradosEvosAttacks:
dbw 50, HYPER_BEAM
db 0 ; no more level-up moves
MagipreyEvosAttacks:
dbbw EVOLVE_LEVEL, 20, TERRADOS
db 0 ; no more evolutions
dbw 1, SPLASH
dbw 15, LEECH_LIFE
dbw 30, FLAIL
db 0 ; no more level-up moves
TerradosEvosAttacks:
db 0 ; no more evolutions
dbw 1, DIG
dbw 20, BITE
dbw 25, MAGNITUDE
dbw 30, ROAR
dbw 35, CRUNCH
dbw 40, EARTHQUAKE
dbw 45, SANDSTORM
dbw 50, FISSURE
db 0 ; no more level-up moves
LaprasEvosAttacks:
db 0 ; no more evolutions
dbw 1, WATER_GUN

2
data/pokemon/first_stages.asm
View file

@ -166,6 +166,8 @@ FirstEvoStages::
dw TAUROS ;80
dw MAGIKARP
dw MAGIKARP
dw MAGIPREY
dw MAGIPREY
dw LAPRAS
dw DITTO
dw EEVEE

2
data/pokemon/gen1_base_special.asm
View file

@ -167,6 +167,8 @@ KantoMonSpecials:
db 70 ; TAUROS
db 20 ; MAGIKARP
db 100 ; GYARADOS
db 20 ; MAGIPREY
db 100 ; TERRADOS
db 95 ; LAPRAS
db 48 ; DITTO
db 65 ; EEVEE

2
data/pokemon/gen1_order.asm
View file

@ -361,4 +361,6 @@ Pokered_MonIndices:
db WEIRDUCK
db LUXWAN
db CHARMADA
db MAGIPREY
db TERRADOS
assert_table_length NUM_POKEMON - 1

2
data/pokemon/menu_icons.asm
View file

@ -167,6 +167,8 @@ MonMenuIcons:
db ICON_EQUINE ; TAUROS
db ICON_FISH ; MAGIKARP
db ICON_GYARADOS ; GYARADOS
db ICON_FISH ; MAGIPREY
db ICON_GYARADOS ; TERRADOS
db ICON_LAPRAS ; LAPRAS
db ICON_BLOB ; DITTO
db ICON_FOX ; EEVEE

2
data/pokemon/names.asm
View file

@ -169,6 +169,8 @@ PokemonNames::
db "TAUROS@@@@"
db "MAGIKARP@@"
db "GYARADOS@@"
db "MAGIPREY@@"
db "TERRADOS@@"
db "LAPRAS@@@@"
db "DITTO@@@@@"
db "EEVEE@@@@@"

4
data/pokemon/palettes.asm
View file

@ -363,6 +363,10 @@ INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/magikarp/shiny.pal"
INCBIN "gfx/pokemon/gyarados/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gyarados/shiny.pal"
INCBIN "gfx/pokemon/magiprey/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/magiprey/shiny.pal"
INCBIN "gfx/pokemon/terrados/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/terrados/shiny.pal"
INCBIN "gfx/pokemon/lapras/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/lapras/shiny.pal"
INCBIN "gfx/pokemon/ditto/front.gbcpal", middle_colors

4
data/pokemon/pic_pointers.asm
View file

@ -343,6 +343,10 @@ PokemonPicPointers::
dba MagikarpBackpic
dba GyaradosFrontpic
dba GyaradosBackpic
dba MagipreyFrontpic
dba MagipreyBackpic
dba TerradosFrontpic
dba TerradosBackpic
dba LaprasFrontpic
dba LaprasBackpic
dba DittoFrontpic

2
gfx/footprints.asm
View file

@ -166,6 +166,8 @@ INCBIN "gfx/footprints/tricules.1bpp"
INCBIN "gfx/footprints/tauros.1bpp"
INCBIN "gfx/footprints/magikarp.1bpp"
INCBIN "gfx/footprints/gyarados.1bpp"
INCBIN "gfx/footprints/magiprey.1bpp"
INCBIN "gfx/footprints/terrados.1bpp"
INCBIN "gfx/footprints/lapras.1bpp"
INCBIN "gfx/footprints/ditto.1bpp"
INCBIN "gfx/footprints/eevee.1bpp"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

4
gfx/pics.asm
View file

@ -946,3 +946,7 @@ LuxwanFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz"
LuxwanBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz"
CharmadaFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz"
CharmadaBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz"
MagipreyFrontpic: INCBIN "gfx/pokemon/magiprey/front.animated.2bpp.lz"
MagipreyBackpic: INCBIN "gfx/pokemon/magiprey/back.2bpp.lz"
TerradosFrontpic: INCBIN "gfx/pokemon/terrados/front.animated.2bpp.lz"
TerradosBackpic: INCBIN "gfx/pokemon/terrados/back.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -165,6 +165,8 @@ AnimationPointers:
dw TaurosAnimation
dw MagikarpAnimation
dw GyaradosAnimation
dw MagipreyAnimation
dw TerradosAnimation
dw LaprasAnimation
dw DittoAnimation
dw EeveeAnimation

2
gfx/pokemon/anims.asm
View file

@ -163,6 +163,8 @@ TriculesAnimation: INCLUDE "gfx/pokemon/tricules/anim.asm"
TaurosAnimation: INCLUDE "gfx/pokemon/tauros/anim.asm"
MagikarpAnimation: INCLUDE "gfx/pokemon/magikarp/anim.asm"
GyaradosAnimation: INCLUDE "gfx/pokemon/gyarados/anim.asm"
MagipreyAnimation: INCLUDE "gfx/pokemon/magiprey/anim.asm"
TerradosAnimation: INCLUDE "gfx/pokemon/terrados/anim.asm"
LaprasAnimation: INCLUDE "gfx/pokemon/lapras/anim.asm"
DittoAnimation: INCLUDE "gfx/pokemon/ditto/anim.asm"
EeveeAnimation: INCLUDE "gfx/pokemon/eevee/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -165,6 +165,8 @@ BitmasksPointers:
dw TaurosBitmasks
dw MagikarpBitmasks
dw GyaradosBitmasks
dw MagipreyBitmasks
dw TerradosBitmasks
dw LaprasBitmasks
dw DittoBitmasks
dw EeveeBitmasks

2
gfx/pokemon/bitmasks.asm
View file

@ -163,6 +163,8 @@ TriculesBitmasks: INCLUDE "gfx/pokemon/tricules/bitmask.asm"
TaurosBitmasks: INCLUDE "gfx/pokemon/tauros/bitmask.asm"
MagikarpBitmasks: INCLUDE "gfx/pokemon/magikarp/bitmask.asm"
GyaradosBitmasks: INCLUDE "gfx/pokemon/gyarados/bitmask.asm"
MagipreyBitmasks: INCLUDE "gfx/pokemon/magiprey/bitmask.asm"
TerradosBitmasks: INCLUDE "gfx/pokemon/terrados/bitmask.asm"
LaprasBitmasks: INCLUDE "gfx/pokemon/lapras/bitmask.asm"
DittoBitmasks: INCLUDE "gfx/pokemon/ditto/bitmask.asm"
EeveeBitmasks: INCLUDE "gfx/pokemon/eevee/bitmask.asm"

2
gfx/pokemon/frame_pointers.asm
View file

@ -165,6 +165,8 @@ FramesPointers:
dba TaurosFrames
dba MagikarpFrames
dba GyaradosFrames
dba MagipreyFrames
dba TerradosFrames
dba LaprasFrames
dba DittoFrames
dba EeveeFrames

2
gfx/pokemon/idle_pointers.asm
View file

@ -165,6 +165,8 @@ AnimationIdlePointers:
dw TaurosAnimationIdle
dw MagikarpAnimationIdle
dw GyaradosAnimationIdle
dw MagipreyAnimationIdle
dw TerradosAnimationIdle
dw LaprasAnimationIdle
dw DittoAnimationIdle
dw EeveeAnimationIdle

2
gfx/pokemon/idles.asm
View file

@ -163,6 +163,8 @@ TriculesAnimationIdle: INCLUDE "gfx/pokemon/tricules/anim_idle.asm"
TaurosAnimationIdle: INCLUDE "gfx/pokemon/tauros/anim_idle.asm"
MagikarpAnimationIdle: INCLUDE "gfx/pokemon/magikarp/anim_idle.asm"
GyaradosAnimationIdle: INCLUDE "gfx/pokemon/gyarados/anim_idle.asm"
MagipreyAnimationIdle: INCLUDE "gfx/pokemon/magiprey/anim_idle.asm"
TerradosAnimationIdle: INCLUDE "gfx/pokemon/terrados/anim_idle.asm"
LaprasAnimationIdle: INCLUDE "gfx/pokemon/lapras/anim_idle.asm"
DittoAnimationIdle: INCLUDE "gfx/pokemon/ditto/anim_idle.asm"
EeveeAnimationIdle: INCLUDE "gfx/pokemon/eevee/anim_idle.asm"

2
gfx/pokemon/kanto_frames.asm
View file

@ -165,6 +165,8 @@ TriculesFrames: INCLUDE "gfx/pokemon/tricules/frames.asm"
TaurosFrames: INCLUDE "gfx/pokemon/tauros/frames.asm"
MagikarpFrames: INCLUDE "gfx/pokemon/magikarp/frames.asm"
GyaradosFrames: INCLUDE "gfx/pokemon/gyarados/frames.asm"
MagipreyFrames: INCLUDE "gfx/pokemon/magiprey/frames.asm"
TerradosFrames: INCLUDE "gfx/pokemon/terrados/frames.asm"
LaprasFrames: INCLUDE "gfx/pokemon/lapras/frames.asm"
DittoFrames: INCLUDE "gfx/pokemon/ditto/frames.asm"
EeveeFrames: INCLUDE "gfx/pokemon/eevee/frames.asm"

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

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

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

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

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

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

2
main.asm
View file

@ -467,10 +467,10 @@ INCLUDE "engine/movie/intro.asm"
SECTION "bank3E", ROMX
INCLUDE "engine/gfx/load_font.asm"
INCLUDE "engine/events/name_rater.asm"
SECTION "bank3Econt", ROMX
INCLUDE "engine/events/name_rater.asm"
INCLUDE "engine/events/play_slow_cry.asm"
INCLUDE "engine/link/time_capsule.asm"
INCLUDE "engine/link/time_capsule_2.asm"