R/B/G sprites, and a few minor edits

constants/pokedex_constants.asm

@@ -186,6 +186,11 @@
 	const DEX_VAPOREON   ; 134
 	const DEX_JOLTEON    ; 135
 	const DEX_FLAREON    ; 136
+	const DEX_ESPEON
+	const DEX_UMBREON
+	const DEX_LEAFEON
+	const DEX_GLACEON
+	const DEX_SYLVEON
 	const DEX_PORYGON    ; 137
 	const DEX_OMANYTE    ; 138
 	const DEX_OMASTAR    ; 139
@@ -201,11 +206,5 @@
 	const DEX_DRAGONITE  ; 149
 	const DEX_MEWTWO     ; 150
 	const DEX_MEW        ; 151
-	const DEX_RHYPERIOR
-	const DEX_ESPEON
-	const DEX_UMBREON
-	const DEX_LEAFEON
-	const DEX_GLACEON
-	const DEX_SYLVEON
 
 DEF NUM_POKEMON EQU const_value - 1

data/pokemon/base_stats.asm

@@ -182,6 +182,11 @@ INCLUDE "data/pokemon/base_stats/eevee.asm"
 INCLUDE "data/pokemon/base_stats/vaporeon.asm"
 INCLUDE "data/pokemon/base_stats/jolteon.asm"
 INCLUDE "data/pokemon/base_stats/flareon.asm"
+INCLUDE "data/pokemon/base_stats/espeon.asm"
+INCLUDE "data/pokemon/base_stats/umbreon.asm"
+INCLUDE "data/pokemon/base_stats/leafeon.asm"
+INCLUDE "data/pokemon/base_stats/glaceon.asm"
+INCLUDE "data/pokemon/base_stats/sylveon.asm"
 INCLUDE "data/pokemon/base_stats/porygon.asm"
 INCLUDE "data/pokemon/base_stats/omanyte.asm"
 INCLUDE "data/pokemon/base_stats/omastar.asm"
@@ -197,10 +202,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"
-INCLUDE "data/pokemon/base_stats/espeon.asm"
-INCLUDE "data/pokemon/base_stats/umbreon.asm"
-INCLUDE "data/pokemon/base_stats/leafeon.asm"
-INCLUDE "data/pokemon/base_stats/glaceon.asm"
-INCLUDE "data/pokemon/base_stats/sylveon.asm"
 	assert_table_length NUM_POKEMON

data/pokemon/cries.asm

@@ -203,9 +203,9 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished)
 	mon_cry SFX_CRY_1F, $40, $01 ; Pudi
 	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_00, $00, $00 ; Bellossom (unfinished from this point onward)
+	mon_cry SFX_CRY_00, $00, $00 ; Scizor
+	mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
 	mon_cry SFX_CRY_00, $00, $00 ; Espeon
 	mon_cry SFX_CRY_00, $00, $00 ; Umbreon
 	mon_cry SFX_CRY_00, $00, $00 ; Leafeon

data/pokemon/dex_entries.asm

@@ -1559,42 +1559,42 @@ ScizorDexEntry:
 RhyperiorDexEntry:
     db "DRILL@"
 	db 7,10
-	dw 6235
+	dw 6240
 	text_far _RhyperiorDexEntry
 	text_end 
 
 EspeonDexEntry:
     db "SUN@"
 	db 2,11
-	dw 584
+	dw 580
 	text_far _EspeonDexEntry
 	text_end 
 	
 UmbreonDexEntry:
     db "MOONLIGHT@"
 	db 3,3
-	dw 595
+	dw 600
 	text_far _UmbreonDexEntry
 	text_end 
 	
 LeafeonDexEntry:
     db "VERDANT@"
 	db 3,3
-	dw 562
+	dw 560
 	text_far _LeafeonDexEntry
 	text_end 
 	
 GlaceonDexEntry:
     db "FRESH SNOW@"
 	db 2,7
-	dw 571
+	dw 570
 	text_far _GlaceonDexEntry
 	text_end 
 	
 SylveonDexEntry:
     db "INTERTWINE@"
 	db 3,3
-	dw 518
+	dw 520
 	text_far _SylveonDexEntry
 	text_end 
 	

data/pokemon/menu_icons.asm

@@ -182,6 +182,11 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Vaporeon
 	nybble ICON_QUADRUPED ; Jolteon
 	nybble ICON_QUADRUPED ; Flareon
+	nybble ICON_QUADRUPED ; Espeon
+	nybble ICON_QUADRUPED ; Umbreon
+	nybble ICON_QUADRUPED ; Leafeon
+	nybble ICON_QUADRUPED ; Glaceon
+	nybble ICON_QUADRUPED ; Sylveon
 	nybble ICON_MON       ; Porygon
 	nybble ICON_HELIX     ; Omanyte
 	nybble ICON_HELIX     ; Omastar
@@ -197,10 +202,4 @@ MonPartyData:
 	nybble ICON_SNAKE     ; Dragonite
 	nybble ICON_MON       ; Mewtwo
 	nybble ICON_MON       ; Mew
-	nybble ICON_MON       ; Rhyperior
-	nybble ICON_QUADRUPED ; Espeon
-	nybble ICON_QUADRUPED ; Umbreon
-	nybble ICON_QUADRUPED ; Leafeon
-	nybble ICON_QUADRUPED ; Glaceon
-	nybble ICON_QUADRUPED ; Sylveon
 	end_nybble_array NUM_POKEMON

data/pokemon/new_dex_text.asm

@@ -449,18 +449,18 @@ _BellossomDexEntry::
 	dex
 
 _RhyperiorDexEntry::
-	text "From holes in its"
-	next "palms, it fires"
-	next "out Geodude!"
+	text "Stores rocks in"
+	next "the holes in its"
+	next "palms, using its"
 
-	page "Its carapace can"
-	next "withstand a"
-	next "volcanic eruption"
+	page "muscles to shoot"
+	next "them. GEODUDE are"
+	next "shot occasionally"
 	dex
 
 _EspeonDexEntry::
 	text "It uses the fine"
-	next "fair that covers"
+	next "hair that covers"
 	next "its body to sense"
 
 	page "air currents and"
@@ -468,14 +468,14 @@ _EspeonDexEntry::
 	next "enemy's actions"
 	dex
 
-_UmbreonDexEntry::
-	text "On the night of a"
-	next "full moon, or"
-	next "when it gets"
+_UmbreonDexEntry::	; Entry alludes to its scrapped Poison type, and I thought it was a neat touch. ~M
+	text "When this #MON"
+	next "becomes angry, its"
+	next "pores secrete a"
 
-	page "excited, the"
-	next "ring patterns on"
-	next "its body glow"
+	page "poisonous sweat,"
+	next "which it sprays at"
+	next "its foe's eyes"
 	dex
 	
 _LeafeonDexEntry::
@@ -499,13 +499,13 @@ _GlaceonDexEntry::
 	dex
 	
 _SylveonDexEntry::
-	text "It sends a"
-	next "soothing aura"
-	next "from its"
+	text "This #MON uses"
+	next "its ribbonlike"
+	next "feelers to emit"
 
-	page "ribbonlike"
-	next "feelers to calm"
-	next "nearby fights"
+	page "a soothing aura"
+	next "that calms any"
+	next "hostile emotions"
 	dex
 
 _MissingNoDexEntry::

data/pokemon/palettes.asm

@@ -183,6 +183,11 @@ MonsterPalettes:
 	db PAL_CYANMON   ; VAPOREON
 	db PAL_YELLOWMON ; JOLTEON
 	db PAL_REDMON    ; FLAREON
+	db PAL_YELLOWMON ; ESPEON
+	db PAL_PURPLEMON ; UMBREON
+	db PAL_GREENMON  ; LEAFEON
+	db PAL_CYANMON   ; GLACEON
+	db PAL_MEWMON    ; SYLVEON
 	db PAL_MEWMON    ; PORYGON
 	db PAL_BLUEMON   ; OMANYTE
 	db PAL_BLUEMON   ; OMASTAR
@@ -198,10 +203,4 @@ MonsterPalettes:
 	db PAL_BROWNMON  ; DRAGONITE
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
-	db PAL_GREYMON   ; RHYPERIOR
-	db PAL_YELLOWMON ; ESPEON
-	db PAL_PURPLEMON ; UMBREON
-	db PAL_GREENMON  ; LEAFEON
-	db PAL_CYANMON   ; GLACEON
-	db PAL_MEWMON    ; SYLVEON
 	assert_table_length NUM_POKEMON + 1