thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

woohoo it's orfry

Browse source
This commit is contained in:
Llinos Evans 2024-07-02 11:31:10 +01:00
parent ca092d9bd1
commit c6b2bf0885
33 changed files with 61 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -160,6 +160,7 @@
const SEADRA ; 75
const BLASTYKE
const BLASTOISE
const ORFRY
const GOLDEEN ; 76
const SEAKING ; 77
const STARYU ; 78

1
data/pokemon/base_stats.asm
View file

@ -168,6 +168,7 @@ INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/orfry.asm"
INCLUDE "data/pokemon/base_stats/goldeen.asm"
INCLUDE "data/pokemon/base_stats/seaking.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm"

1
data/pokemon/cries.asm
View file

@ -147,6 +147,7 @@ PokemonCries::
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_NIDORAN_M, 0, 0 ; ORFRY (incomplete)
mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN
mon_cry CRY_CATERPIE, 16, 383 ; SEAKING
mon_cry CRY_PARAS, 2, 160 ; STARYU

1
data/pokemon/dex_entries.asm
View file

@ -145,6 +145,7 @@ HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm"
SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm"
BlastykePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastyke.asm"
BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm"
OrfryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/orfry.asm"
GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm"
SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm"
StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm"

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

@ -0,0 +1,10 @@
db "GOLDFISH@" ; species name
dw 200, 330 ; height, weight - placeholder (port from kep at some point)
db "Tiny, weak, and"
next "easily preyed on."
next "It's a popular"
page "prize at fairs"
next "and carnivals,"
next "but it grows fast.@" ; A personal touch! My first pet was a goldfish from a fair in Lincolnshire! This happens in Japan a lot too. ~ PvK

1
data/pokemon/dex_entry_pointers.asm
View file

@ -142,6 +142,7 @@ PokedexDataPointerTable:
dba SeadraPokedexEntry
dba BlastykePokedexEntry
dba BlastoisePokedexEntry
dba OrfryPokedexEntry
dba GoldeenPokedexEntry
dba SeakingPokedexEntry
dba StaryuPokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -209,6 +209,7 @@ AlphabeticalPokedexOrder:
dw OMANYTE
dw OMASTAR
dw ONIX
dw ORFRY
dw PALSSIO
dw PARAS
dw PARASECT

1
data/pokemon/dex_order_new.asm
View file

@ -99,6 +99,7 @@ NewPokedexOrder:
dw POLITOED
dw MAGIKARP
dw GYARADOS
dw ORFRY
dw GOLDEEN
dw SEAKING
dw SLOWPOKE

5
data/pokemon/egg_moves_kanto.asm
View file

@ -142,7 +142,8 @@ EggMovePointers1:
dw NoEggMoves1
dw BlastykeEggMoves ; Blastyke
dw NoEggMoves1 ; Blastoise
dw GoldeenEggMoves
dw OrfryEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -561,7 +562,7 @@ BlastykeEggMoves:
dw FLAIL
dw -1 ; end
GoldeenEggMoves:
OrfryEggMoves:
dw PSYBEAM
dw HAZE
dw HYDRO_PUMP

14
data/pokemon/evos_attacks_kanto.asm
View file

@ -142,6 +142,7 @@ EvosAttacksPointers1::
dw SeadraEvosAttacks
dw BlastykeEvosAttacks
dw BlastoiseEvosAttacks
dw OrfryEvosAttacks
dw GoldeenEvosAttacks
dw SeakingEvosAttacks
dw StaryuEvosAttacks
@ -2105,6 +2106,19 @@ db 0 ; no more evolutions
dbw 68, HYDRO_PUMP
db 0 ; no more level-up moves
OrfryEvosAttacks:
dbbw EVOLVE_LEVEL, 16, GOLDEEN
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, TAIL_WHIP
dbw 7, SUPERSONIC
dbw 12, HORN_ATTACK
dbw 16, FURY_ATTACK
dbw 26, WATERFALL
dbw 30, HORN_DRILL
dbw 34, AGILITY
db 0 ; no more level-up moves
GoldeenEvosAttacks:
dbbw EVOLVE_LEVEL, 33, SEAKING
db 0 ; no more evolutions

5
data/pokemon/first_stages.asm
View file

@ -142,8 +142,9 @@ FirstEvoStages::
dw HORSEA
dw BLASTYKE
dw BLASTYKE
dw GOLDEEN
dw GOLDEEN
dw ORFRY
dw ORFRY
dw ORFRY
dw STARYU ;78
dw STARYU
dw MR__MIME

1
data/pokemon/gen1_base_special.asm
View file

@ -143,6 +143,7 @@ KantoMonSpecials:
db 95 ; SEADRA
db 45 ; BLASTYKE
db 85 ; BLASTOISE
db 20 ; ORFRY
db 50 ; GOLDEEN
db 80 ; SEAKING
db 70 ; STARYU

1
data/pokemon/gen1_order.asm
View file

@ -338,4 +338,5 @@ Pokered_MonIndices:
db IRON_TREADS
db IRON_BUNDLE
db IRON_THORNS
db ORFRY
assert_table_length NUM_POKEMON - 1

1
data/pokemon/menu_icons.asm
View file

@ -143,6 +143,7 @@ MonMenuIcons:
db ICON_FISH ; SEADRA
db ICON_SQUIRTLE ; BLASTYKE
db ICON_SQUIRTLE ; BLASTOISE
db ICON_FISH ; ORFRY
db ICON_FISH ; GOLDEEN
db ICON_FISH ; SEAKING
db ICON_STARYU ; STARYU

1
data/pokemon/names.asm
View file

@ -145,6 +145,7 @@ PokemonNames::
db "SEADRA@@@@"
db "BLASTYKE@@"
db "BLASTOISE@"
db "ORFRY@@@@@"
db "GOLDEEN@@@"
db "SEAKING@@@"
db "STARYU@@@@"

2
data/pokemon/palettes.asm
View file

@ -315,6 +315,8 @@ INCBIN "gfx/pokemon/blastyke/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/blastyke/shiny.pal"
INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/blastoise/shiny.pal"
INCBIN "gfx/pokemon/orfry/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/orfry/shiny.pal"
INCBIN "gfx/pokemon/goldeen/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/goldeen/shiny.pal"
INCBIN "gfx/pokemon/seaking/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -295,6 +295,8 @@ PokemonPicPointers::
dba BlastykeBackpic
dba BlastoiseFrontpic
dba BlastoiseBackpic
dba OrfryFrontpic
dba OrfryBackpic
dba GoldeenFrontpic
dba GoldeenBackpic
dba SeakingFrontpic

1
gfx/footprints.asm
View file

@ -142,6 +142,7 @@ INCBIN "gfx/footprints/horsea.1bpp"
INCBIN "gfx/footprints/seadra.1bpp"
INCBIN "gfx/footprints/blastyke.1bpp"
INCBIN "gfx/footprints/blastoise.1bpp"
INCBIN "gfx/footprints/orfry.1bpp"
INCBIN "gfx/footprints/goldeen.1bpp"
INCBIN "gfx/footprints/seaking.1bpp"
INCBIN "gfx/footprints/staryu.1bpp"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

4
gfx/pics.asm
View file

@ -897,4 +897,6 @@ IronTreadsBackpic: INCBIN "gfx/pokemon/iron_treads/back.2bpp.lz"
IronBundleFrontpic: INCBIN "gfx/pokemon/iron_bundle/front.animated.2bpp.lz"
IronBundleBackpic: INCBIN "gfx/pokemon/iron_bundle/back.2bpp.lz"
IronThornsFrontpic: INCBIN "gfx/pokemon/iron_thorns/front.animated.2bpp.lz"
IronThornsBackpic: INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
IronThornsBackpic: INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
OrfryFrontpic: INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
OrfryBackpic: INCBIN "gfx/pokemon/orfry/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -141,6 +141,7 @@ AnimationPointers:
dw SeadraAnimation
dw BlastykeAnimation
dw BlastoiseAnimation
dw OrfryAnimation
dw GoldeenAnimation
dw SeakingAnimation
dw StaryuAnimation

1
gfx/pokemon/anims.asm
View file

@ -139,6 +139,7 @@ HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm"
SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm"
BlastykeAnimation: INCLUDE "gfx/pokemon/blastyke/anim.asm"
BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm"
OrfryAnimation: INCLUDE "gfx/pokemon/orfry/anim.asm"
GoldeenAnimation: INCLUDE "gfx/pokemon/goldeen/anim.asm"
SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm"
StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -141,6 +141,7 @@ BitmasksPointers:
dw SeadraBitmasks
dw BlastykeBitmasks
dw BlastoiseBitmasks
dw OrfryBitmasks
dw GoldeenBitmasks
dw SeakingBitmasks
dw StaryuBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -139,6 +139,7 @@ HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm"
SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm"
BlastykeBitmasks: INCLUDE "gfx/pokemon/blastyke/bitmask.asm"
BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm"
OrfryBitmasks: INCLUDE "gfx/pokemon/orfry/bitmask.asm"
GoldeenBitmasks: INCLUDE "gfx/pokemon/goldeen/bitmask.asm"
SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm"
StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -141,6 +141,7 @@ FramesPointers:
dba SeadraFrames
dba BlastykeFrames
dba BlastoiseFrames
dba OrfryFrames
dba GoldeenFrames
dba SeakingFrames
dba StaryuFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -141,6 +141,7 @@ AnimationIdlePointers:
dw SeadraAnimationIdle
dw BlastykeAnimationIdle
dw BlastoiseAnimationIdle
dw OrfryAnimationIdle
dw GoldeenAnimationIdle
dw SeakingAnimationIdle
dw StaryuAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -139,6 +139,7 @@ HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm"
SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/anim_idle.asm"
BlastykeAnimationIdle: INCLUDE "gfx/pokemon/blastyke/anim_idle.asm"
BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm"
OrfryAnimationIdle: INCLUDE "gfx/pokemon/orfry/anim_idle.asm"
GoldeenAnimationIdle: INCLUDE "gfx/pokemon/goldeen/anim_idle.asm"
SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm"
StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -141,6 +141,7 @@ HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm"
SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm"
BlastykeFrames: INCLUDE "gfx/pokemon/blastyke/frames.asm"
BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm"
OrfryFrames: INCLUDE "gfx/pokemon/orfry/frames.asm"
GoldeenFrames: INCLUDE "gfx/pokemon/goldeen/frames.asm"
SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm"
StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm"

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

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

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