Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack

constants/pokedex_constants.asm

@@ -16,7 +16,7 @@
 	const DEX_TOTARTLE   ; 		(009)
 	const DEX_PIKACHU    ; 25	(010)
 	const DEX_RAICHU     ; 26	(011)
-	; const DEX_RAICHU_A   ; 	(012)
+	const DEX_RAICHU_A   ; 		(012)
 	const DEX_GOROCHU	 ;   	(013)
 	const DEX_EEVEE      ; 133	(014)
 	const DEX_VAPOREON   ; 134	(015)
@@ -29,7 +29,7 @@
 	const DEX_SYLVEON	 ;		(022)
 	const DEX_RATTATA    ; 19	(023)
 	const DEX_RATICATE   ; 20	(024)
-	; const DEX_RATICATE_A   ; 	(025)
+	const DEX_RATICATE_A ;  	(025)
 	const DEX_PIDGEY     ; 16	(026)
 	const DEX_PIDGEOTTO  ; 17	(027)
 	const DEX_PIDGEOT    ; 18	(028)
@@ -42,7 +42,7 @@
 	const DEX_KONYA 	 ;		(035)
 	const DEX_MEOWTH     ; 52	(036)
 	const DEX_PERSIAN    ; 53	(037)
-	; const DEX_PERSIAN_A  ;	    (038)
+	const DEX_PERSIAN_A  ;	    (038)
 	const DEX_PERRSERKER ;      (039)
 	const DEX_SPEAROW    ; 21	(040)
 	const DEX_FEAROW     ; 22	(041)
@@ -50,7 +50,7 @@
 	const DEX_ARBOK      ; 24	(043)
 	const DEX_SANDSHREW  ; 27	(044)
 	const DEX_SANDSLASH  ; 28	(045)
-	; const DEX_SANDSLASH_A  ;	(046)
+	const DEX_SANDSLASH_A ;		(046)
 	const DEX_NIDORAN_F  ; 29	(047)
 	const DEX_NIDORINA   ; 30	(048)
 	const DEX_NIDOQUEEN  ; 31	(049)

constants/pokemon_constants.asm

@@ -241,12 +241,12 @@
 	const MELMETAL		   	 ; $E8
 	const ARCANINE_H		 ; $E9
 	const ELECTRODE_H		 ; $EA
-	; const RATICATE_A		   ; $EB
+	const RATICATE_A		 ; $EB
-	; const RAICHU_A           ; $EC
+	const RAICHU_A           ; $EC
-	; const SANDSLASH_A		   ; $ED
+	const SANDSLASH_A		   ; $ED
 	; const NINETALES_A		   ; $EE
 	; const DUGTRIO_A		   ; $EF
-	; const PERSIAN_A		   ; $F0
+	const PERSIAN_A		     ; $F0
 	; const GOLEM_A		 	   ; $F1
 	; const RAPIDASH_G		   ; $F2
 	; const SLOWBRO_G		   ; $F3

data/pokemon/base_stats.asm

@@ -11,7 +11,7 @@ INCLUDE "data/pokemon/base_stats/wartortle.asm"
 INCLUDE "data/pokemon/base_stats/totartle.asm"
 INCLUDE "data/pokemon/base_stats/pikachu.asm"
 INCLUDE "data/pokemon/base_stats/raichu.asm"
-; INCLUDE "data/pokemon/base_stats/raichua.asm"
+INCLUDE "data/pokemon/base_stats/raichua.asm"
 INCLUDE "data/pokemon/base_stats/gorochu.asm"
 INCLUDE "data/pokemon/base_stats/eevee.asm"
 INCLUDE "data/pokemon/base_stats/vaporeon.asm"
@@ -24,7 +24,7 @@ INCLUDE "data/pokemon/base_stats/glaceon.asm"
 INCLUDE "data/pokemon/base_stats/sylveon.asm"
 INCLUDE "data/pokemon/base_stats/rattata.asm"
 INCLUDE "data/pokemon/base_stats/raticate.asm"
-; INCLUDE "data/pokemon/base_stats/raticatea.asm"
+INCLUDE "data/pokemon/base_stats/raticatea.asm"
 INCLUDE "data/pokemon/base_stats/pidgey.asm"
 INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
 INCLUDE "data/pokemon/base_stats/pidgeot.asm"
@@ -37,7 +37,7 @@ INCLUDE "data/pokemon/base_stats/beedrill.asm"
 INCLUDE "data/pokemon/base_stats/konya.asm"
 INCLUDE "data/pokemon/base_stats/meowth.asm"
 INCLUDE "data/pokemon/base_stats/persian.asm"
-; INCLUDE "data/pokemon/base_stats/persiana.asm"
+INCLUDE "data/pokemon/base_stats/persiana.asm"
 INCLUDE "data/pokemon/base_stats/perrserker.asm"
 INCLUDE "data/pokemon/base_stats/spearow.asm"
 INCLUDE "data/pokemon/base_stats/fearow.asm"
@@ -45,7 +45,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm"
 INCLUDE "data/pokemon/base_stats/arbok.asm"
 INCLUDE "data/pokemon/base_stats/sandshrew.asm"
 INCLUDE "data/pokemon/base_stats/sandslash.asm"
-; INCLUDE "data/pokemon/base_stats/sandslasha.asm"
+INCLUDE "data/pokemon/base_stats/sandslasha.asm"
 INCLUDE "data/pokemon/base_stats/nidoranf.asm"
 INCLUDE "data/pokemon/base_stats/nidorina.asm"
 INCLUDE "data/pokemon/base_stats/nidoqueen.asm"

data/pokemon/base_stats/persiana.asm

@@ -1,4 +1,4 @@
-	db DEX_PERSIAN ; pokedex id
+	db DEX_PERSIAN_A ; pokedex id
 
 	db  65,  60,  60, 115,  75
 	;   hp  atk  def  spd  spc

data/pokemon/base_stats/raichua.asm

@@ -3,7 +3,7 @@
 	db  60,  85,  50, 100,  95
 	;   hp  atk  def  spd  spc
 
-	db ELECTRIC, PSYCHIC ; type
+	db ELECTRIC, PSYCHIC_TYPE ; type
 	db 75 ; catch rate
 	db 122 ; base exp
 
@@ -15,11 +15,11 @@
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
-	     DOUBLE_EDGE,  HYPER_BEAM,   PAY_DAY,      SUBMISSION,   SEISMIC_TOSS, \
+	     DOUBLE_EDGE,  HYPER_BEAM,   PAY_DAY,      SUBMISSION,   COUNTER,      \
-	     RAGE,         THUNDERBOLT,  THUNDER,      MIMIC,        DOUBLE_TEAM,  \
+	     SEISMIC_TOSS, RAGE,         THUNDERBOLT,  THUNDER,      PSYCHIC_M,    \
-	     REFLECT,      BIDE,         SWIFT,        SKULL_BASH,   REST,         \
+	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
-	     THUNDER_WAVE, SUBSTITUTE,   FLY,          SURF,         FLASH, 		\
+	     SWIFT,        SKULL_BASH,   REST,         THUNDER_WAVE, PSYWAVE,	   \
-		 PSYCHIC_M, PSYWAVE, TELEPORT, COUNTER ; I forgot why it got this ngl
+		 SUBSTITUTE,   FLY,          SURF,         FLASH 	   
 	; end
 
 	db BANK(RaichuAPicFront)

data/pokemon/base_stats/raticatea.asm

@@ -16,8 +16,8 @@
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
 	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   RAGE,         \
-	     DIG,          MIMIC,        DOUBLE_TEAM,  \
+	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         SWIFT,        \
-	     BIDE,         SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
+	     SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
 	db BANK(RaticateAPicFront)

data/pokemon/base_stats/sandslasha.asm

@@ -15,10 +15,10 @@
 
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
-	     HYPER_BEAM,   SUBMISSION,   SEISMIC_TOSS, RAGE,         EARTHQUAKE,   \
+	     ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   SUBMISSION,   SEISMIC_TOSS, \
-	     FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     RAGE,         EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        \
-	     SWIFT,        SKULL_BASH,   REST,         ROCK_SLIDE,   SUBSTITUTE,   \
+	     DOUBLE_TEAM,  BIDE,         SWIFT,        SKULL_BASH,   REST,         \
-	     CUT,          STRENGTH, BLIZZARD, ICE_BEAM
+	     ROCK_SLIDE,   SUBSTITUTE,   CUT,          STRENGTH
 	; end
 
 	db BANK(SandslashAPicFront)

data/pokemon/cries.asm

@@ -240,12 +240,12 @@ CryData::
 	mon_cry SFX_CRY_11, $F0, $60 ; Melmetal
 	mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H
 	mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H
-	; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
+	mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
-	; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
+	mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
-	; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
+	mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
 	; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
 	; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
-	; mon_cry SFX_CRY_19, $99, $FF ; Persian-A
+	mon_cry SFX_CRY_19, $99, $FF ; Persian-A
 	; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
 	; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
 	; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G

data/pokemon/dex_entries.asm

@@ -234,6 +234,10 @@ PokedexEntryPointers:
 	dw MelmetalDexEntry
 	dw ArcanineHDexEntry
 	dw ElectrodeHDexEntry
+	dw RaticateADexEntry
+	dw RaichuADexEntry
+	dw SandslashADexEntry
+	dw PersianADexEntry
 	dw ArticunoGDexEntry
 	dw ZapdosGDexEntry
 	dw MoltresGDexEntry
@@ -1869,6 +1873,34 @@ ElectrodeHDexEntry:
 	text_far _ElectrodeHDexEntry
 	text_end
 	
+RaticateADexEntry:
+	db "RAT@"
+	db 2,4
+	dw 560
+	text_far _RaticateADexEntry
+	text_end
+	
+RaichuADexEntry:
+	db "MOUSE@"
+	db 2,4
+	dw 460
+	text_far _RaichuADexEntry
+	text_end
+
+SandslashADexEntry:
+	db "MOUSE@"
+	db 3,11
+	dw 1210
+	text_far _SandslashADexEntry
+	text_end
+	
+PersianADexEntry:
+	db "CLASSY CAT@"
+	db 3,7
+	dw 730
+	text_far _PersianADexEntry
+	text_end
+	
 ArticunoGDexEntry:
 	db "CRUEL@"
 	db 5,7

data/pokemon/dex_order.asm

@@ -234,6 +234,10 @@ PokedexOrder:
 	db DEX_MELMETAL
 	db DEX_ARCANINE_H
 	db DEX_ELECTRODE_H
+	db DEX_RATICATE_A
+	db DEX_RAICHU_A
+	db DEX_SANDSLASH_A
+	db DEX_PERSIAN_A
 	db DEX_ARTICUNO_G
 	db DEX_ZAPDOS_G
 	db DEX_MOLTRES_G

data/pokemon/evos_moves.asm

@@ -56,7 +56,6 @@ EvosMovesPointerTable:
 	dw ChanseyEvosMoves
 	dw MachokeEvosMoves
 	dw MrMimeEvosMoves
-	;dw MrMimeGEvosMoves
 	dw HitmonleeEvosMoves
 	dw HitmonchanEvosMoves
 	dw ArbokEvosMoves
@@ -105,7 +104,6 @@ EvosMovesPointerTable:
 	;dw NinetalesAEvosMoves
 	dw PikachuEvosMoves
 	dw RaichuEvosMoves
-	;dw RaichuAEvosMoves
 	dw RibbitoEvosMoves
 	dw CroakozunaEvosMoves
 	dw DratiniEvosMoves
@@ -118,7 +116,6 @@ EvosMovesPointerTable:
 	dw CryithanEvosMoves
 	dw SandshrewEvosMoves
 	dw SandslashEvosMoves
-	;dw SandslashAEvosMoves
 	dw OmanyteEvosMoves
 	dw OmastarEvosMoves
 	dw JigglypuffEvosMoves
@@ -169,7 +166,6 @@ EvosMovesPointerTable:
 	dw WeezingEvosMoves
 	;dw WeezingGEvosMoves
 	dw PersianEvosMoves
-	;PersianAEvosMoves
 	dw MarowakEvosMoves
 	;dw MarowakAEvosMoves
 	dw GuardiaEvosMoves
@@ -194,7 +190,6 @@ EvosMovesPointerTable:
 	;dw RapidashGEvosMoves
 	dw RattataEvosMoves
 	dw RaticateEvosMoves
-	;dw RaticateAEvosMoves
 	dw NidorinoEvosMoves
 	dw NidorinaEvosMoves
 	dw GeodudeEvosMoves
@@ -264,6 +259,10 @@ EvosMovesPointerTable:
 	dw MelmetalEvosMoves
 	dw ArcanineHEvosMoves
 	dw ElectrodeHEvosMoves
+	dw RaticateAEvosMoves
+	dw RaichuAEvosMoves
+	dw SandslashAEvosMoves
+	dw PersianAEvosMoves
 	dw ArticunoGEvosMoves	
 	dw ZapdosGEvosMoves
 	dw MoltresGEvosMoves
@@ -797,18 +796,6 @@ MrMimeEvosMoves:
 	db 47, SUBSTITUTE
 	db 0
 
-;MrMimeGEvosMoves:
-; Evolutions
-;	db EV_ITEM, ICE_STONE, 1, MR_RIME
-;	db 0
-; Learnset
-;	db 23, LIGHT_SCREEN
-;	db 28, PSYBEAM
-;	db 31, AURORA_BEAM
-;	db 39, ICE_BEAM
-;	db 48, PSYCHIC_M
-;	db 0
-
 HitmonleeEvosMoves:
 ; Evolutions
 	db 0
@@ -1385,21 +1372,6 @@ RaichuEvosMoves:
 ; Learnset
 	db 0
 
-;RaichuAEvosMoves: ; pikachu learnset
-; Evolutions
-;	db 0
-; Learnset
-;	db 6, TAIL_WHIP
-;	db 8, THUNDER_WAVE
-;	db 11, QUICK_ATTACK
-;	db 15, DOUBLE_TEAM
-;	db 20, SLAM
-;	db 26, THUNDERBOLT
-;	db 33, AGILITY
-;	db 41, THUNDER
-;	db 50, LIGHT_SCREEN
-;	db 0
-
 RibbitoEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 30, CROAKOZUNA
@@ -1543,19 +1515,6 @@ SandslashEvosMoves:
 	db 47, FURY_SWIPES
 	db 0
 
-;SandslashAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 21, SWIFT
-;	db 24, FURY_SWIPES
-;	db 27, IRON_DEFENSE
-;	db 30, SLASH
-;	db 33, IRON_HEAD
-;	db 36, SWORDS_DANCE
-;	db 45, BLIZZARD
-;	db 0
-
 OmanyteEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 40, OMASTAR
@@ -2138,20 +2097,6 @@ PersianEvosMoves:
 	db 51, SLASH
 	db 0
 
-;PersianAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 6, BITE
-;	db 14, FURY_SWIPES
-;	db 17, SCREECH
-;	db 22, FEINT_ATTACK
-;	db 30, PAY_DAY
-;	db 33, SLASH
-;	db 38, NASTY_PLOT
-;	db 49, NIGHT_SLASH
-;	db 0
-
 MarowakEvosMoves:
 ; Evolutions
 	db EV_ITEM, HEART_STONE, 1, GUARDIA
@@ -2437,20 +2382,6 @@ RaticateEvosMoves:
 	db 41, SUPER_FANG
 	db 0
 
-;RaticateAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 4, QUICK_ATTACK
-;	db 7, FOCUS_ENERGY
-;	db 10, BITE
-;	db 16, HYPER_FANG
-;	db 20, BRUTAL_SWING
-;	db 28, SUPER_FANG
-;	db 31, DOUBLE_EDGE
-;	db 40, NIGHT_SLASH
-;	db 0
-
 NidorinoEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
@@ -3282,6 +3213,62 @@ ElectrodeHEvosMoves: ; voltorb-hisui learnset which is also trode's anyway
 	db 43, EXPLOSION
 	db 0
 	
+RaticateAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 4, QUICK_ATTACK
+	db 7, FOCUS_ENERGY
+	db 10, BITE
+	db 16, HYPER_FANG
+	db 20, BRUTAL_SWING
+	db 28, SUPER_FANG
+	db 31, DOUBLE_EDGE
+	db 40, NIGHT_SLASH
+	db 0
+	
+RaichuAEvosMoves: ; pikachu learnset
+; Evolutions
+	db 0
+; Learnset
+	db 6, TAIL_WHIP
+	db 8, THUNDER_WAVE
+	db 11, QUICK_ATTACK
+	db 15, DOUBLE_TEAM
+	db 20, SLAM
+	db 26, THUNDERBOLT
+	db 33, AGILITY
+	db 41, THUNDER
+	db 50, LIGHT_SCREEN
+	db 0
+	
+SandslashAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 21, SWIFT
+	db 24, FURY_SWIPES
+	db 27, IRON_DEFENSE
+	db 30, SLASH
+	db 33, IRON_HEAD
+	db 36, SWORDS_DANCE
+	db 45, BLIZZARD
+	db 0
+	
+PersianAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 6, BITE
+	db 14, FURY_SWIPES
+	db 17, SCREECH
+	db 22, FEINT_ATTACK
+	db 30, PAY_DAY
+	db 33, SLASH
+;	db 38, NASTY_PLOT
+	db 49, NIGHT_SLASH
+	db 0
+
 ArticunoGEvosMoves:
 ; Evolutions
 	db 0

data/pokemon/menu_icons.asm

@@ -11,7 +11,7 @@ MonPartyData:
 	nybble ICON_WATER     ; Totartle
 	nybble ICON_FAIRY     ; Pikachu
 	nybble ICON_FAIRY     ; Raichu
-	; 	nybble ICON_FAIRY     ; Raichu-A
+	nybble ICON_FAIRY     ; Raichu-A
 	nybble ICON_FAIRY     ; Gorochu
 	nybble ICON_QUADRUPED ; Eevee
 	nybble ICON_QUADRUPED ; Vaporeon
@@ -24,7 +24,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Sylveon
 	nybble ICON_QUADRUPED ; Rattata
 	nybble ICON_QUADRUPED ; Raticate
-	; 	nybble ICON_QUADRUPED ; Raticate-A
+	nybble ICON_QUADRUPED ; Raticate-A
 	nybble ICON_BIRD      ; Pidgey
 	nybble ICON_BIRD      ; Pidgeotto
 	nybble ICON_BIRD      ; Pidgeot
@@ -37,7 +37,7 @@ MonPartyData:
 	nybble ICON_MON       ; Konya
 	nybble ICON_MON       ; Meowth
 	nybble ICON_MON       ; Persian
-	;	nybble ICON_MON       ; Persian-A
+	nybble ICON_MON       ; Persian-A
 	nybble ICON_MON       ; Perrserker
 	nybble ICON_BIRD      ; Spearow
 	nybble ICON_BIRD      ; Fearow
@@ -45,7 +45,7 @@ MonPartyData:
 	nybble ICON_SNAKE     ; Arbok
 	nybble ICON_MON       ; Sandshrew
 	nybble ICON_MON       ; Sandslash
-	; 	nybble ICON_MON       ; Sandslash-A
+	nybble ICON_MON       ; Sandslash-A
 	nybble ICON_MON       ; NidoranF
 	nybble ICON_MON       ; Nidorina
 	nybble ICON_MON       ; Nidoqueen

data/pokemon/names.asm

@@ -44,7 +44,6 @@ MonsterNames::
 	db "CHANSEY@@@"
 	db "MACHOKE@@@"
 	db "MR.MIME@@@"
-	; db "MR.MIME-G@"
 	db "HITMONLEE@"
 	db "HITMONCHAN"
 	db "ARBOK@@@@@"
@@ -93,7 +92,6 @@ MonsterNames::
 	; db "NINETALESA"
 	db "PIKACHU@@@"
 	db "RAICHU@@@@"
-	; db "RAICHU-A@@"
 	db "RIBBITO@@@"
 	db "CROAKOZUNA"
 	db "DRATINI@@@"
@@ -105,7 +103,6 @@ MonsterNames::
 	db "BAWLIGUA@@"
 	db "CRYITHAN@@"
 	db "SANDSHREW@"
-	; db "SANDSLASHA"
 	db "SANDSLASH@"
 	db "OMANYTE@@@"
 	db "OMASTAR@@@"
@@ -157,7 +154,6 @@ MonsterNames::
 	db "WEEZING@@@"
 	; db "WEEZING-G@"
 	db "PERSIAN@@@"
-	; db "PERSIAN-A@"
 	db "MAROWAK@@@"
 	; db "MAROWAK-A@"
 	db "GUARDIA@@@"
@@ -182,7 +178,6 @@ MonsterNames::
 	; db "RAPIDASH-G"
 	db "RATTATA@@@"
 	db "RATICATE@@"
-	; db  "RATICATE-A"
 	db "NIDORINO@@"
 	db "NIDORINA@@"
 	db "GEODUDE@@@"
@@ -252,6 +247,10 @@ MonsterNames::
 	db "MELMETAL@@"
 	db "ARCANINE-H"
 	db "ELECTRODEH"
+	db "RATICATE-A"
+	db "RAICHU-A@@"
+	db "SANDSLASHA"
+	db "PERSIAN-A@"
 	db "ARTICUNO-G"
 	db "ZAPDOS-G@@"
 	db "MOLTRES-G@"

data/pokemon/new_dex_text.asm

@@ -828,25 +828,35 @@ _ElectrodeHDexEntry::
 	next "of 20,000 volts" ; 100 kV in a bolt of lightning on average
 	dex
 
-;_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries
+_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries
-;	text "It commands nests"
+	text "It commands nests"
-;	next "of RATTATA. It"
+	next "of RATTATA. It"
-;	next "will greedily"
+	next "will greedily"
 	
-;	page "command them to"
+	page "command them to"
-;	next "gather large"
+	next "gather large"
-;	next "amounts of food"
+	next "amounts of food"
-;	dex
+	dex
 	
-;_SandslashADexEntry::
+_RaichuADexEntry:: 
-;	text "It adapted to a"
+	text "It uses PSI to"
-;	next "frigid region."
+	next "ride on its tail"
-;	next "Wounds caused"
+	next "like a surfboard."
 	
-;	page "by SANDSLASH"
+	page "It has been known"
-;	next "cause severe"
+	next "to teach PIKACHU"
-;	next "frostbite"
+	next "how to SURF"
-;	dex
+	dex
+
+_SandslashADexEntry::
+	text "It adapted to a"
+	next "frigid region."
+	next "Wounds caused"
+	
+	page "by SANDSLASH"
+	next "cause severe"
+	next "frostbite"
+	dex
 
 ;_NinetalesADexEntry::
 ;	text "Once thought to"
@@ -868,15 +878,15 @@ _ElectrodeHDexEntry::
 ;	next "from attacks"
 ;	dex
 
-;_PersianADexEntry::
+_PersianADexEntry::
-;	text "Its round face"
+	text "Its round face"
-;	next "is a symbol of"
+	next "is a symbol of"
-;	next "prosperity."
+	next "prosperity."
 	
-;	page "Despite this, it"
+	page "Despite this, it"
-;	next "prefers to fight"
+	next "prefers to fight"
-;	next "underhandedly"
+	next "underhandedly"
-;	dex
+	dex
 
 ;_GolemADexEntry::
 ;	text "It fires rocks"
@@ -958,16 +968,6 @@ _ElectrodeHDexEntry::
 ;	next "building factories" ; referencing this: https://ibb.co/ZM2714Q - PLA takes place before RB
 ;	dex
 
-;_MrMimeGDexEntry::
-;	text "Although it no"
-;	next "longer creates"
-;	next "invisible walls,"
-	
-;	page "This MR.MIME can"
-;	next "use PSI to make"
-;	next "barriers of ice"
-;	dex
-
 ;_TaurosPDexEntry::
 ;	text "Known as the"
 ;	next "Combat Breed,"

data/pokemon/palettes.asm

@@ -12,7 +12,7 @@ MonsterPalettes:
 	db PAL_CYANMON   ; TOTARTLE
 	db PAL_YELLOWMON ; PIKACHU
 	db PAL_YELLOWMON ; RAICHU
-	; 	db PAL_YELLOWMON ; RAICHU_A
+	db PAL_YELLOWMON ; RAICHU_A
 	db PAL_YELLOWMON ; GOROCHU
 	db PAL_BROWNMON  ; EEVEE
 	db PAL_CYANMON   ; VAPOREON
@@ -25,7 +25,7 @@ MonsterPalettes:
 	db PAL_FUCHSIA   ; SYLVEON
 	db PAL_PURPLEMON ; RATTATA
 	db PAL_BROWNMON  ; RATICATE
-	; 	db PAL_GREYMON   ; RATICATE_A
+	db PAL_GREYMON   ; RATICATE_A
 	db PAL_BROWNMON  ; PIDGEY
 	db PAL_BROWNMON  ; PIDGEOTTO
 	db PAL_BROWNMON  ; PIDGEOT
@@ -38,7 +38,7 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; KONYA
 	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
-	;	db PAL_BLUEMON   ; PERSIAN_A
+	db PAL_CYANMON   ; PERSIAN_A
 	db PAL_GREYMON   ; PERRSEKRER
 	db PAL_BROWNMON  ; SPEAROW
 	db PAL_BROWNMON  ; FEAROW
@@ -46,7 +46,7 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; ARBOK
 	db PAL_BROWNMON  ; SANDSHREW
 	db PAL_BROWNMON  ; SANDSLASH
-	; 	db PAL_CYANMON   ; SANDSLASH_A
+	db PAL_CYANMON   ; SANDSLASH_A
 	db PAL_BLUEMON   ; NIDORAN_F
 	db PAL_BLUEMON   ; NIDORINA
 	db PAL_BLUEMON   ; NIDOQUEEN

engine/debug/debug_party.asm

@@ -22,11 +22,11 @@ SetIshiharaTeam:
 
 IshiharaTeam:
 	db EXEGGUTOR, 90
-	db ARCANINE_H, 90
+	db SANDSLASH_A, 90
-	db ELECTRODE_H, 90
+	db RATICATE_A, 90
-	db MELTAN, 50
+	db PERSIAN_A, 50
 IF DEF(_DEBUG)
-	db RAICHU, 50
+	db RAICHU_A, 50
 ENDC
 	db -1 ; end
 

gfx/pics.asm

@@ -555,6 +555,14 @@ ArcanineHPicFront::    INCBIN "gfx/pokemon/front/arcanineh.pic"
 ArcanineHPicBack::     INCBIN "gfx/pokemon/back/arcaninehb.pic"
 ElectrodeHPicFront::   INCBIN "gfx/pokemon/front/electrodeh.pic"
 ElectrodeHPicBack::    INCBIN "gfx/pokemon/back/electrodehb.pic"
+RaticateAPicFront::    INCBIN "gfx/pokemon/front/raticatea.pic"
+RaticateAPicBack::     INCBIN "gfx/pokemon/back/raticateab.pic"
+RaichuAPicFront::      INCBIN "gfx/pokemon/front/raichua.pic"
+RaichuAPicBack::       INCBIN "gfx/pokemon/back/raichuab.pic"
+SandslashAPicFront::   INCBIN "gfx/pokemon/front/sandslasha.pic"
+SandslashAPicBack::    INCBIN "gfx/pokemon/back/sandslashab.pic"
+PersianAPicFront::     INCBIN "gfx/pokemon/front/persiana.pic"
+PersianAPicBack::      INCBIN "gfx/pokemon/back/persianab.pic"
 
 YujirouPic::	    INCBIN "gfx/trainers/yujirou.pic"
 StudentPic::	    INCBIN "gfx/trainers/student.pic"