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