From 20b68991697a6cb67eccd0995032b36c06a8966f Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 1 Sep 2022 10:16:49 +0100 Subject: [PATCH] Finished adding Rhyperior --- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 +- data/pokemon/base_stats.asm | 2 +- data/pokemon/base_stats/rhyperior.asm | 14 +++++++------- data/pokemon/cries.asm | 2 +- data/pokemon/dex_entries.asm | 6 +++--- data/pokemon/evos_moves.asm | 1 + data/pokemon/menu_icons.asm | 2 +- data/pokemon/new_dex_text.asm | 12 ++++++------ data/pokemon/palettes.asm | 2 +- engine/debug/debug_party.asm | 2 +- gfx/pics.asm | 2 ++ gfx/pokemon/back/rhyperiorb.png | Bin 0 -> 563 bytes gfx/pokemon/front/rhyperior.png | Bin 0 -> 831 bytes 14 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 gfx/pokemon/back/rhyperiorb.png create mode 100644 gfx/pokemon/front/rhyperior.png diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 6128d2a8..f9bd2f1d 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -148,6 +148,7 @@ const DEX_WEEZING ; 110 const DEX_RHYHORN ; 111 const DEX_RHYDON ; 112 + const DEX_RHYPERIOR const DEX_CHANSEY ; 113 const DEX_MONJA const DEX_TANGELA ; 114 @@ -200,6 +201,5 @@ const DEX_DRAGONITE ; 149 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 - const DEX_RHYPERIOR DEF NUM_POKEMON EQU const_value - 1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index b8bc5604..59d090b4 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -206,7 +206,7 @@ const BETOBEBII ; $C5 (new) const BELLOSSOM ; $C6 (new) const SCIZOR ; $C7 (new) - const RHYPERIOR ; $C8 (test) + const RHYPERIOR ; $C8 DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 629e8ddc..fc321dea 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -144,6 +144,7 @@ INCLUDE "data/pokemon/base_stats/koffing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/rhyperior.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" INCLUDE "data/pokemon/base_stats/monja.asm" INCLUDE "data/pokemon/base_stats/tangela.asm" @@ -196,5 +197,4 @@ INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" INCLUDE "data/pokemon/base_stats/mew.asm" -INCLUDE "data/pokemon/base_stats/rhyperior.asm" assert_table_length NUM_POKEMON diff --git a/data/pokemon/base_stats/rhyperior.asm b/data/pokemon/base_stats/rhyperior.asm index ecaaff01..cb5544ca 100644 --- a/data/pokemon/base_stats/rhyperior.asm +++ b/data/pokemon/base_stats/rhyperior.asm @@ -1,14 +1,14 @@ - db DEX_RHYDON ; pokedex id + db DEX_RHYPERIOR ; pokedex id db 115, 140, 130, 50, 55 ; hp atk def spd spc db GROUND, ROCK ; type - db 60 ; catch rate - db 204 ; base exp + db 30 ; catch rate + db 217 ; base exp - INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions - dw RhydonPicFront, RhydonPicBack + INCBIN "gfx/pokemon/front/rhyperior.pic", 0, 1 ; sprite dimensions + dw RhyperiorPicFront, RhyperiorPicBack db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset db GROWTH_SLOW ; growth rate @@ -23,5 +23,5 @@ SURF, STRENGTH ; end - db BANK(RhydonPicFront) - assert BANK(RhydonPicFront) == BANK(RhydonPicBack) + db BANK(RhyperiorPicFront) + assert BANK(RhyperiorPicFront) == BANK(RhyperiorPicBack) diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 107ab171..2f2d6fa6 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -205,5 +205,5 @@ CryData:: mon_cry SFX_CRY_05, $FF, $40 ; Betobebii mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished) mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished) - mon_cry SFX_CRY_00, $00, $00 ; Rhyperior (test) + mon_cry SFX_CRY_03, $0D, $FF ; Rhyperior assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 585fe968..9828ebc8 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1552,9 +1552,9 @@ ScizorDexEntry: text_end RhyperiorDexEntry: - db "TEST@" - db 5,11 - dw 5000 + db "DRILL@" + db 7,10 + dw 6240 text_far _RhyperiorDexEntry text_end \ No newline at end of file diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 2c50a57d..f06bc01f 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -207,6 +207,7 @@ EvosMovesPointerTable: RhydonEvosMoves: ; Evolutions + db EV_ITEM, MOON_STONE, 1, RHYPERIOR ; Protector isn't added yet ~M db 0 ; Learnset db 30, STOMP diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 7748cb02..7277adfd 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -144,6 +144,7 @@ MonPartyData: nybble ICON_MON ; Weezing nybble ICON_QUADRUPED ; Rhyhorn nybble ICON_MON ; Rhydon + nybble ICON_MON ; Rhyperior nybble ICON_FAIRY ; Chansey nybble ICON_GRASS ; Monja nybble ICON_GRASS ; Tangela @@ -196,5 +197,4 @@ MonPartyData: nybble ICON_SNAKE ; Dragonite nybble ICON_MON ; Mewtwo nybble ICON_MON ; Mew - nybble ICON_MON ; Rhyperior end_nybble_array NUM_POKEMON diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index d9eaeea1..63b4e5db 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -449,13 +449,13 @@ _BellossomDexEntry:: dex _RhyperiorDexEntry:: - text "This is a newly" - next "discovered" - next "#MON. It is" + text "It launches rocks" + next "from the holes" + next "in its palms." - page "currently under" - next "investigation. No" - next "info is available" + page "On rare occasions," + next "it can even fire" + next "out GEODUDE" dex _MissingNoDexEntry:: diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 984520f9..6283fa45 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -145,6 +145,7 @@ MonsterPalettes: db PAL_PURPLEMON ; WEEZING db PAL_GREYMON ; RHYHORN db PAL_GREYMON ; RHYDON + db PAL_BROWNMON ; RHYPERIOR db PAL_PINKMON ; CHANSEY db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; TANGELA @@ -197,5 +198,4 @@ MonsterPalettes: db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW - db PAL_GREYMON ; RHYPERIOR assert_table_length NUM_POKEMON + 1 diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 36eb8e6f..03455ef1 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -129,7 +129,7 @@ IF DEF(_DEBUG) ret DebugSetPokedexEntries: - ld b, wPokedexOwnedEnd - wPokedexOwned - 1 + ld b, wPokedexOwnedEnd - wPokedexOwned ld a, %11111111 .loop ld [hli], a diff --git a/gfx/pics.asm b/gfx/pics.asm index 27d17754..7166e078 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -467,6 +467,8 @@ BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic" BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic" ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic" +RhyperiorPicFront:: INCBIN "gfx/pokemon/front/rhyperior.pic" +RhyperiorPicBack:: INCBIN "gfx/pokemon/back/rhyperiorb.pic" FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" diff --git a/gfx/pokemon/back/rhyperiorb.png b/gfx/pokemon/back/rhyperiorb.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4f49c73dffd8215f6e81b65620e49027aed5f9 GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_Gg@o9J<=p50-*-G3FQfg)p99R6YyHQ7v(eC`m~y zNwrEYN(E93Mg~Skx(1fI28JO97FH&vRwl;U1_o9J2Cui>`Gle&H$NpatrCj{Lx=|6 zlG1dbhN#pC&op0O1}z|)gMpP%h=Cc%Vgy14Mkxl6mw_w>FGguNJBU#OssrYA+tv@GQIJTU;NjnzG;&fFSFJu@LTyuKx9X;*GIoR1w znQHQwv7K{SS@SuypCdJK;pUJ_Cl7Rlb^JSbz~Z#P@`a2CSx+hECr;M?^YJ(Pyj@$Q UmQ7k(0dzitr>mdKI;Vst0Pl#MEdT%j literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/rhyperior.png b/gfx/pokemon/front/rhyperior.png new file mode 100644 index 0000000000000000000000000000000000000000..c92f21d2ede501c3f0e9af6555bb39b6c9edd1a0 GIT binary patch literal 831 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiA}Ms6eaV=9#rKut!TE{-7@=Up$I&lYwRVgIl_ zTYL%EZ8K}ey_&XLl)tHY@V|5Fy%O-k%(`Dp@JRE6qyHT`8gnkPNX?4aQ)bR<)~xP7 z&ufwBDs3^F%5NdXUbE%0B4odZZ{|;XP+Vc~`JQ--K)@GOL2(v${hv<$KcC7oERoss zu}!zs<$q+Nw2^Yxn&2OcJNssRD1NtaP3QW2;cq8j6<^t#b}0Es^opwe=Q%spyp&b_ z66kd8LxthPYm*L%*{qv?`HfP~a+icpR`GqBA|^L_!cpY{_%T|e*DAIdEGygZ!8jxd$2Q7XwtTVZ*jXX@crcY#S*A|A}S^9aH_?f=}nOe zOm0_Z+Z|pZX854yZI7Y=n?+lS4>w!OS^uwdwDh0f&N#TRw$ZO}`J@lOw^^iXSDf)Y>wogV zb#~*P+j{e5_%)B5zf^m|uX*DAt{w4gCMqmapOZNkc~vASd#D*|9NRnl;rAD>8^R9c z_g@Ss;9qyl=7!6w4U6}Fo$V{UV?z{uLi^S{ zj6J%CcWXiF5f$wf3^94H6nAGZ$jrVJWFNIcZKJ_fH#gpw^_z4R`QBR3)L2y8pzwU| zi+}tarfa8to4QI9n4nZkTq8t*jzH00)|WTsW()^IdUE*PkR!PC{xWt~$(69Bm%Q#t?u literal 0 HcmV?d00001