woohoo it's orfry

constants/pokemon_constants.asm

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

data/pokemon/base_stats.asm

@@ -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"

data/pokemon/cries.asm

@@ -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

data/pokemon/dex_entries.asm

@@ -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"

data/pokemon/dex_entries/orfry.asm

@@ -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

data/pokemon/dex_entry_pointers.asm

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

data/pokemon/dex_order_alpha.asm

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

data/pokemon/dex_order_new.asm

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

data/pokemon/egg_moves_kanto.asm

@@ -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

data/pokemon/evos_attacks_kanto.asm

@@ -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

data/pokemon/first_stages.asm

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

data/pokemon/gen1_base_special.asm

@@ -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

data/pokemon/gen1_order.asm

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

data/pokemon/menu_icons.asm

@@ -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

data/pokemon/names.asm

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

data/pokemon/palettes.asm

@@ -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

data/pokemon/pic_pointers.asm

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

gfx/footprints.asm

@@ -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"

gfx/pics.asm

@@ -898,3 +898,5 @@ 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"
+OrfryFrontpic:	 INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
+OrfryBackpic:	 INCBIN "gfx/pokemon/orfry/back.2bpp.lz"

gfx/pokemon/anim_pointers.asm

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

gfx/pokemon/anims.asm

@@ -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"

gfx/pokemon/bitmask_pointers.asm

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

gfx/pokemon/bitmasks.asm

@@ -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"

gfx/pokemon/frame_pointers.asm

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

gfx/pokemon/idle_pointers.asm

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

gfx/pokemon/idles.asm

@@ -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"

gfx/pokemon/kanto_frames.asm

@@ -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"

gfx/pokemon/orfry/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/orfry/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/orfry/shiny.pal

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