diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 1be14e2d..7c221ae5 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 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 9cdcf2d5..41df0a27 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" 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/evos_moves.asm b/data/pokemon/evos_moves.asm index 7ac775c4..c5de78dd 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -212,7 +212,8 @@ EvosMovesPointerTable: RhydonEvosMoves: ; Evolutions - db EV_TRADE, 1, RHYPERIOR + db EV_ITEM, MOON_STONE, 1, RHYPERIOR ; Protector isn't added yet ~M + db 0 ; Learnset db 30, STOMP db 35, TAIL_WHIP diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 42234b17..055cce3c 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 diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 42b3de3d..20805d55 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 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 00000000..8b4f49c7 Binary files /dev/null and b/gfx/pokemon/back/rhyperiorb.png differ diff --git a/gfx/pokemon/front/rhyperior.png b/gfx/pokemon/front/rhyperior.png new file mode 100644 index 00000000..c92f21d2 Binary files /dev/null and b/gfx/pokemon/front/rhyperior.png differ