From c6b2bf0885f428047fffd2d41cfc6f4136250aab Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:31:10 +0100 Subject: [PATCH] woohoo it's orfry --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/orfry.asm | 10 ++++++++++ data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_kanto.asm | 5 +++-- data/pokemon/evos_attacks_kanto.asm | 14 ++++++++++++++ data/pokemon/first_stages.asm | 5 +++-- data/pokemon/gen1_base_special.asm | 1 + data/pokemon/gen1_order.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints.asm | 1 + gfx/footprints/orfry.png | Bin 0 -> 69 bytes gfx/pics.asm | 4 +++- gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/kanto_frames.asm | 1 + gfx/pokemon/orfry/anim.asm | 1 + gfx/pokemon/orfry/anim_idle.asm | 1 + gfx/pokemon/orfry/back.png | Bin 0 -> 304 bytes gfx/pokemon/orfry/front.png | Bin 0 -> 315 bytes gfx/pokemon/orfry/shiny.pal | 2 ++ 33 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 data/pokemon/dex_entries/orfry.asm create mode 100644 gfx/footprints/orfry.png create mode 100644 gfx/pokemon/orfry/anim.asm create mode 100644 gfx/pokemon/orfry/anim_idle.asm create mode 100644 gfx/pokemon/orfry/back.png create mode 100644 gfx/pokemon/orfry/front.png create mode 100644 gfx/pokemon/orfry/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index b730377..12eda9f 100644 --- a/constants/pokemon_constants.asm +++ b/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 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 1193ff7..3eb1159 100644 --- a/data/pokemon/base_stats.asm +++ b/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" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 6779fb1..ef09050 100644 --- a/data/pokemon/cries.asm +++ b/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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index f28cefe..9602e99 100644 --- a/data/pokemon/dex_entries.asm +++ b/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" diff --git a/data/pokemon/dex_entries/orfry.asm b/data/pokemon/dex_entries/orfry.asm new file mode 100644 index 0000000..f349292 --- /dev/null +++ b/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 diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 6cb1cc9..b2c4a67 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/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 diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 27f6d16..fde551c 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/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 diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index df60461..4744f3b 100644 --- a/data/pokemon/dex_order_new.asm +++ b/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 diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 6a765e9..90481e7 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/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 diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 6a3c9f0..a53e58e 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/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 diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 3332d59..4415824 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -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 diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index de49949..779dc68 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/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 diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index cfccb12..4287711 100644 --- a/data/pokemon/gen1_order.asm +++ b/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 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 5c9084b..3b65eab 100644 --- a/data/pokemon/menu_icons.asm +++ b/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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 3b79c16..507b54d 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -145,6 +145,7 @@ PokemonNames:: db "SEADRA@@@@" db "BLASTYKE@@" db "BLASTOISE@" + db "ORFRY@@@@@" db "GOLDEEN@@@" db "SEAKING@@@" db "STARYU@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index fbd1e24..09bbba6 100644 --- a/data/pokemon/palettes.asm +++ b/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 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 80b0731..6a554e9 100644 --- a/data/pokemon/pic_pointers.asm +++ b/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 diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 946ebe6..8645a02 100644 --- a/gfx/footprints.asm +++ b/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" diff --git a/gfx/footprints/orfry.png b/gfx/footprints/orfry.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index 48ffa17..19f4625 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -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" \ No newline at end of file +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" \ No newline at end of file diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 088b7e1..f21135a 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -141,6 +141,7 @@ AnimationPointers: dw SeadraAnimation dw BlastykeAnimation dw BlastoiseAnimation + dw OrfryAnimation dw GoldeenAnimation dw SeakingAnimation dw StaryuAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 253ea0f..99ef896 100644 --- a/gfx/pokemon/anims.asm +++ b/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" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index f3f0cda..4d4a84b 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -141,6 +141,7 @@ BitmasksPointers: dw SeadraBitmasks dw BlastykeBitmasks dw BlastoiseBitmasks + dw OrfryBitmasks dw GoldeenBitmasks dw SeakingBitmasks dw StaryuBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index f34ab6e..13a74a5 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/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" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 993d1d1..3ef40e0 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -141,6 +141,7 @@ FramesPointers: dba SeadraFrames dba BlastykeFrames dba BlastoiseFrames + dba OrfryFrames dba GoldeenFrames dba SeakingFrames dba StaryuFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index a3ab823..46e2dfb 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -141,6 +141,7 @@ AnimationIdlePointers: dw SeadraAnimationIdle dw BlastykeAnimationIdle dw BlastoiseAnimationIdle + dw OrfryAnimationIdle dw GoldeenAnimationIdle dw SeakingAnimationIdle dw StaryuAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 1699c3f..8749ab0 100644 --- a/gfx/pokemon/idles.asm +++ b/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" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 04df1dc..5da51c8 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/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" diff --git a/gfx/pokemon/orfry/anim.asm b/gfx/pokemon/orfry/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/orfry/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/orfry/anim_idle.asm b/gfx/pokemon/orfry/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/orfry/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/orfry/back.png b/gfx/pokemon/orfry/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/orfry/shiny.pal b/gfx/pokemon/orfry/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/orfry/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file