diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index df4b1b89..0373d875 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -65,7 +65,7 @@
 	const DEX_GEODUDE    ; 74	(058)
 	const DEX_GRAVELER   ; 75	(059)
 	const DEX_GOLEM      ; 76	(060)
-	; const DEX_GOLEM_A    ; 	(061)
+	const DEX_GOLEM_A    ; 	    (061)
 	const DEX_PARA		 ;		(062)
 	const DEX_PARAS      ; 46	(063)
 	const DEX_PARASECT   ; 47	(064)
@@ -155,7 +155,7 @@
 	const DEX_PUCHIKOON  ;		(148)
 	const DEX_PONYTA     ; 77	(149)
 	const DEX_RAPIDASH   ; 78	(150)
-	; const DEX_RAPIDASH_G ;  	(151)
+	const DEX_RAPIDASH_G ;  	(151)
 	const DEX_MONJA		 ;		(152)
 	const DEX_TANGELA    ; 114 	(153)
 	const DEX_TANGROWTH	 ;		(154)
@@ -168,7 +168,7 @@
 	const DEX_GENGAR     ; 94	(161)
 	const DEX_CUBONE     ; 104	(162)
 	const DEX_MAROWAK    ; 105	(163)
-	; const DEX_MAROWAK_A  ;	(164)
+	const DEX_MAROWAK_A  ;	    (164)
 	const DEX_GUARDIA 	 ;		(165)
 	const DEX_BETOBEBII  ;		(166)
 	const DEX_GRIMER     ; 88	(167)
@@ -200,7 +200,7 @@
 	const DEX_JAGG		 ;		(193)
 	const DEX_EXEGGCUTE  ; 102	(194)
 	const DEX_EXEGGUTOR  ; 103	(195)
-	; const DEX_EXEGGUTOR_A ; 	(196)
+	const DEX_EXEGGUTOR_A ; 	(196)
 	const DEX_RHYHORN    ; 111	(197)
 	const DEX_RHYDON     ; 112	(198)
 	const DEX_RHYPERIOR	 ;		(199)
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 9c59af80..4dee6fdb 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -247,13 +247,13 @@
 	; const NINETALES_A		   ; $EE
 	; const DUGTRIO_A		   ; $EF
 	const PERSIAN_A		     ; $F0
-	; const GOLEM_A		 	   ; $F1
-	; const RAPIDASH_G		   ; $F2
+	const GOLEM_A		 	   ; $F1
+	const RAPIDASH_G		   ; $F2
 	; const SLOWBRO_G		   ; $F3
 	; const SLOWKING_G		   ; $F4
 	; const MUK_A		       ; $F5
-	; const EXEGGUTOR_A		   ; $F6
-	; const MAROWAK_A		   ; $F7
+	const EXEGGUTOR_A		 ; $F6
+	const MAROWAK_A		     ; $F7
 	; const WEEZING_G		   ; $F8
 	; const TAUROS_P		   ; $F9
 	; const TAUROS_PA		   ; $FA
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 25108210..44525496 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -60,7 +60,7 @@ INCLUDE "data/pokemon/base_stats/crobat.asm"
 INCLUDE "data/pokemon/base_stats/geodude.asm"
 INCLUDE "data/pokemon/base_stats/graveler.asm"
 INCLUDE "data/pokemon/base_stats/golem.asm"
-; INCLUDE "data/pokemon/base_stats/golema.asm"
+INCLUDE "data/pokemon/base_stats/golema.asm"
 INCLUDE "data/pokemon/base_stats/para.asm"
 INCLUDE "data/pokemon/base_stats/paras.asm"
 INCLUDE "data/pokemon/base_stats/parasect.asm"
@@ -150,7 +150,7 @@ INCLUDE "data/pokemon/base_stats/slowking.asm"
 INCLUDE "data/pokemon/base_stats/puchikoon.asm"
 INCLUDE "data/pokemon/base_stats/ponyta.asm"
 INCLUDE "data/pokemon/base_stats/rapidash.asm"
-; INCLUDE "data/pokemon/base_stats/rapidashg.asm"
+INCLUDE "data/pokemon/base_stats/rapidashg.asm"
 INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
 INCLUDE "data/pokemon/base_stats/tangrowth.asm"
@@ -163,7 +163,7 @@ INCLUDE "data/pokemon/base_stats/haunter.asm"
 INCLUDE "data/pokemon/base_stats/gengar.asm"
 INCLUDE "data/pokemon/base_stats/cubone.asm"
 INCLUDE "data/pokemon/base_stats/marowak.asm"
-; INCLUDE "data/pokemon/base_stats/marowaka.asm"
+INCLUDE "data/pokemon/base_stats/marowaka.asm"
 INCLUDE "data/pokemon/base_stats/guardia.asm"
 INCLUDE "data/pokemon/base_stats/betobebii.asm"
 INCLUDE "data/pokemon/base_stats/grimer.asm"
@@ -195,7 +195,7 @@ INCLUDE "data/pokemon/base_stats/kingdra.asm"
 INCLUDE "data/pokemon/base_stats/jagg.asm"
 INCLUDE "data/pokemon/base_stats/exeggcute.asm"
 INCLUDE "data/pokemon/base_stats/exeggutor.asm"
-; INCLUDE "data/pokemon/base_stats/exeggutora.asm"
+INCLUDE "data/pokemon/base_stats/exeggutora.asm"
 INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
 INCLUDE "data/pokemon/base_stats/rhydon.asm"
 INCLUDE "data/pokemon/base_stats/rhyperior.asm"
diff --git a/data/pokemon/base_stats/exeggutora.asm b/data/pokemon/base_stats/exeggutora.asm
index 124042c4..000c8745 100644
--- a/data/pokemon/base_stats/exeggutora.asm
+++ b/data/pokemon/base_stats/exeggutora.asm
@@ -1,6 +1,6 @@
 	db DEX_EXEGGUTOR_A ; pokedex id
 
-	db  95,  105,  85,  45, 125
+	db  95, 105,  85,  45, 125
 	;   hp  atk  def  spd  spc
 
 	db GRASS, DRAGON ; type
@@ -14,11 +14,11 @@
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset
-	tmhm TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   RAGE,         \
-	     MEGA_DRAIN,   SOLARBEAM,    PSYCHIC_M,    TELEPORT,     MIMIC,        \
-	     DOUBLE_TEAM,  REFLECT,      BIDE,         SELFDESTRUCT, EGG_BOMB,     \
-	     REST,         PSYWAVE,      EXPLOSION,    SUBSTITUTE,   STRENGTH,	   \
-		 DRAGON_RAGE, EARTHQUAKE, FISSURE, SWORDS_DANCE
+	tmhm SWORDS_DANCE, TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
+	     RAGE,         MEGA_DRAIN,   SOLARBEAM,    DRAGON_RAGE,  EARTHQUAKE,   \
+	     FISSURE,      PSYCHIC_M,    TELEPORT,     MIMIC,        DOUBLE_TEAM,  \
+	     REFLECT,      BIDE,         SELFDESTRUCT, EGG_BOMB,     REST,         \
+		 PSYWAVE,      EXPLOSION,    SUBSTITUTE,   STRENGTH	   
 	; end
 
 	db BANK(ExeggutorAPicFront)
diff --git a/data/pokemon/base_stats/golema.asm b/data/pokemon/base_stats/golema.asm
index 75246275..9919e798 100644
--- a/data/pokemon/base_stats/golema.asm
+++ b/data/pokemon/base_stats/golema.asm
@@ -3,7 +3,7 @@
 	db  80, 110, 130,  45,  55
 	;   hp  atk  def  spd  spc
 
-	db ROCK, GROUND ; type
+	db ROCK, ELECTRIC ; type
 	db 45 ; catch rate
 	db 177 ; base exp
 
@@ -16,10 +16,10 @@
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
 	     DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
-	     RAGE,         EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        \
-	     DOUBLE_TEAM,  BIDE,         METRONOME,    SELFDESTRUCT, FIRE_BLAST,   \
-	     REST,         EXPLOSION,    ROCK_SLIDE,   SUBSTITUTE,   STRENGTH,     \
-		 THUNDERBOLT, THUNDER, THUNDER_WAVE
+	     RAGE,         THUNDERBOLT,  THUNDER,      EARTHQUAKE,   FISSURE,      \
+	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         METRONOME,    \
+	     SELFDESTRUCT, FIRE_BLAST,   REST,         THUNDER_WAVE, EXPLOSION,    \
+		 ROCK_SLIDE,   SUBSTITUTE,   STRENGTH     
 	; end
 
 	db BANK(GolemAPicFront)
diff --git a/data/pokemon/base_stats/marowaka.asm b/data/pokemon/base_stats/marowaka.asm
index f41b8b5b..0b94d754 100644
--- a/data/pokemon/base_stats/marowaka.asm
+++ b/data/pokemon/base_stats/marowaka.asm
@@ -7,7 +7,7 @@
 	db 75 ; catch rate
 	db 124 ; base exp
 
-	INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/marowaka.pic", 0, 1 ; sprite dimensions
 	dw MarowakAPicFront, MarowakAPicBack
 
 	db BONE_CLUB, GROWL, FIRE_SPIN, FOCUS_ENERGY ; level 1 learnset
diff --git a/data/pokemon/base_stats/rapidashg.asm b/data/pokemon/base_stats/rapidashg.asm
index cf76e8bd..dff1b65c 100644
--- a/data/pokemon/base_stats/rapidashg.asm
+++ b/data/pokemon/base_stats/rapidashg.asm
@@ -15,9 +15,9 @@
 
 	; tm/hm learnset
 	tmhm TOXIC,        HORN_DRILL,   BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  \
-	     HYPER_BEAM,   PAY_DAY,      RAGE,         MIMIC,        DOUBLE_TEAM,  \
-	     REFLECT,      BIDE,         PSYCHIC_M,   SWIFT,        SKULL_BASH,   \
-	     REST,         SUBSTITUTE, PSYWAVE, TELEPORT
+	     HYPER_BEAM,   PAY_DAY,      RAGE,         PSYCHIC_M,    TELEPORT,     \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         SWIFT,        \
+	     SKULL_BASH,   REST,         PSYWAVE,      SUBSTITUTE
 	; end
 
 	db BANK(RapidashGPicFront)
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index 25f178ee..d6152c58 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -246,13 +246,13 @@ CryData::
 	; 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_12, $E0, $40 ; Golem-A
-	; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
+	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
 	; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
 	; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
-	; mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
-	; mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
+	mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
+	mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
 	; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
 	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
 	; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index 19900a15..c6f4d620 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -238,6 +238,10 @@ PokedexEntryPointers:
 	dw RaichuADexEntry
 	dw SandslashADexEntry
 	dw PersianADexEntry
+	dw GolemADexEntry
+	dw RapidashGDexEntry
+	dw ExeggutorADexEntry
+	dw MarowakADexEntry
 	dw ArticunoGDexEntry
 	dw ZapdosGDexEntry
 	dw MoltresGDexEntry
@@ -1901,6 +1905,34 @@ PersianADexEntry:
 	text_far _PersianADexEntry
 	text_end
 	
+GolemADexEntry:
+	db "MEGATON@"
+	db 5,7
+	dw 6970
+	text_far _GolemADexEntry
+	text_end
+	
+RapidashGDexEntry:
+	db "UNIQUEHORN@"
+	db 5,7
+	dw 1760
+	text_far _RapidashGDexEntry
+	text_end
+
+ExeggutorADexEntry:
+	db "COCONUT@"
+	db 35,9
+	dw 9160
+	text_far _ExeggutorADexEntry
+	text_end
+	
+MarowakADexEntry:
+	db "BONEKEEPER@"
+	db 3,3
+	dw 750
+	text_far _MarowakADexEntry
+	text_end
+	
 ArticunoGDexEntry:
 	db "CRUEL@"
 	db 5,7
diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm
index a56951c8..017b7e8e 100644
--- a/data/pokemon/dex_order.asm
+++ b/data/pokemon/dex_order.asm
@@ -238,6 +238,10 @@ PokedexOrder:
 	db DEX_RAICHU_A
 	db DEX_SANDSLASH_A
 	db DEX_PERSIAN_A
+	db DEX_GOLEM_A
+	db DEX_RAPIDASH_G
+	db DEX_EXEGGUTOR_A
+	db DEX_MAROWAK_A
 	db DEX_ARTICUNO_G
 	db DEX_ZAPDOS_G
 	db DEX_MOLTRES_G
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index 19a63f25..f24c5f03 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -23,7 +23,6 @@ EvosMovesPointerTable:
 	;dw SlowbroGEvosMoves
 	dw IvysaurEvosMoves
 	dw ExeggutorEvosMoves
-	;dw ExeggutorAEvosMoves
 	dw LickitungEvosMoves
 	dw ExeggcuteEvosMoves
 	dw GrimerEvosMoves
@@ -63,7 +62,6 @@ EvosMovesPointerTable:
 	dw PsyduckEvosMoves
 	dw DrowzeeEvosMoves
 	dw GolemEvosMoves
-	;dw GolemAEvosMoves
 	dw BarundaEvosMoves
 	dw MagmarEvosMoves
 	dw BuuEvosMoves
@@ -167,7 +165,6 @@ EvosMovesPointerTable:
 	;dw WeezingGEvosMoves
 	dw PersianEvosMoves
 	dw MarowakEvosMoves
-	;dw MarowakAEvosMoves
 	dw GuardiaEvosMoves
 	dw HaunterEvosMoves
 	dw AbraEvosMoves
@@ -187,7 +184,6 @@ EvosMovesPointerTable:
 	dw PuchikoonEvosMoves
 	dw PonytaEvosMoves
 	dw RapidashEvosMoves
-	;dw RapidashGEvosMoves
 	dw RattataEvosMoves
 	dw RaticateEvosMoves
 	dw NidorinoEvosMoves
@@ -263,6 +259,10 @@ EvosMovesPointerTable:
 	dw RaichuAEvosMoves
 	dw SandslashAEvosMoves
 	dw PersianAEvosMoves
+	dw GolemAEvosMoves
+	dw RapidashGEvosMoves
+	dw ExeggutorAEvosMoves
+	dw MarowakAEvosMoves
 	dw ArticunoGEvosMoves	
 	dw ZapdosGEvosMoves
 	dw MoltresGEvosMoves
@@ -398,18 +398,6 @@ ExeggutorEvosMoves:
 	db 28, STOMP
 	db 0
 
-;ExeggutorAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 25, REFLECT ; this would normally be removed, but because this'll be traded, we're using this
-;	db 28, LEECH_SEED
-;	db 32, STUN_SPORE
-;	db 37, POISONPOWDER
-;	db 42, SOLARBEAM
-;	db 48, SLEEP_POWDER
-;	db 0
-
 LickitungEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 32, LICKILICKY
@@ -786,7 +774,6 @@ MachokeEvosMoves:
 
 MrMimeEvosMoves:
 ; Evolutions
-	db EV_ITEM, ICE_STONE, 1, MR_RIME
 	db 0
 ; Learnset
 	db 15, CONFUSION
@@ -878,17 +865,6 @@ GolemEvosMoves:
 	db 43, EXPLOSION
 	db 0
 
-;GolemAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 16, ROCK_THROW
-;	db 22, THUNDER_PUNCH
-;	db 24, SELFDESTRUCT
-;	db 36, EXPLOSION
-;	db 40, DOUBLE_EDGE
-;	db 0
-
 BarundaEvosMoves:
 ; Evolutions
 	db 0
@@ -2046,17 +2022,6 @@ ElectrodeEvosMoves:
 	db 50, EXPLOSION
 	db 0
 
-;ElectrodeHEvosMoves: ; voltorb-hisui learnset which is also trode's anyway
-; Evolutions
-;	db 0
-; Learnset
-;	db 17, SONICBOOM
-;	db 22, SELFDESTRUCT
-;	db 29, LIGHT_SCREEN
-;	db 36, SWIFT
-;	db 43, EXPLOSION
-;	db 0
-
 ClefableEvosMoves:
 ; Evolutions
 	db 0
@@ -2112,18 +2077,6 @@ MarowakEvosMoves:
 	db 55, RAGE
 	db 0
 
-;MarowakAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 18, FIRE_SPIN
-;	db 25, LEER
-;	db 33, EMBER
-;	db 41, THRASH
-;	db 46, BONEMERANG
-;	db 55, FLAMETHROWER
-;	db 0
-
 GuardiaEvosMoves:
 ; Evolutions
 	db 0
@@ -2346,21 +2299,6 @@ RapidashEvosMoves:
 	db 55, AGILITY
 	db 0
 
-;RapidashGEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 30, TAIL_WHIP
-;	db 32, CONFUSION
-;	db 35, FAIRY_WIND
-;	db 39, AGILITY
-;	db 42, PSYBEAM
-;	db 46, STOMP
-;	db 47, TAKE_DOWN
-;	db 52, DAZZLE_GLEAM
-;	db 55, PSYCHIC
-;	db 0
-
 RattataEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 20, RATICATE
@@ -3268,6 +3206,56 @@ PersianAEvosMoves:
 ;	db 38, NASTY_PLOT
 	db 49, NIGHT_SLASH
 	db 0
+	
+GolemAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 16, ROCK_THROW
+	db 22, THUNDERPUNCH
+	db 24, SELFDESTRUCT
+	db 36, EXPLOSION
+	db 40, DOUBLE_EDGE
+	db 0
+	
+RapidashGEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 30, TAIL_WHIP
+	db 32, CONFUSION
+	db 35, FAIRY_WIND
+	db 39, AGILITY
+	db 42, PSYBEAM
+	db 46, STOMP
+	db 47, TAKE_DOWN
+	db 52, DAZZLE_GLEAM
+	db 55, PSYCHIC_M
+	db 0
+
+ExeggutorAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 25, REFLECT ; this would normally be removed, but because this'll be traded, we're using this
+	db 28, LEECH_SEED
+	db 32, STUN_SPORE
+	db 37, POISONPOWDER
+	db 42, SOLARBEAM
+	db 48, SLEEP_POWDER
+	db 0
+
+MarowakAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 18, FIRE_SPIN
+	db 25, LEER
+	db 33, EMBER
+	db 41, THRASH
+	db 46, BONEMERANG
+	db 55, FLAMETHROWER
+	db 0
 
 ArticunoGEvosMoves:
 ; Evolutions
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 171db0c6..1b7295c9 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -60,7 +60,7 @@ MonPartyData:
 	nybble ICON_MON       ; Geodude
 	nybble ICON_MON       ; Graveler
 	nybble ICON_MON       ; Golem
-	; 	nybble ICON_MON       ; Golem-A
+	nybble ICON_MON       ; Golem-A
 	nybble ICON_BUG       ; Para
 	nybble ICON_BUG       ; Paras
 	nybble ICON_BUG       ; Parasect
@@ -150,7 +150,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Puchikoon
 	nybble ICON_QUADRUPED ; Ponyta
 	nybble ICON_QUADRUPED ; Rapidash
-	; 	nybble ICON_QUADRUPED ; Rapidash-G
+	nybble ICON_QUADRUPED ; Rapidash-G
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
 	nybble ICON_GRASS     ; Tangrowth
@@ -163,7 +163,7 @@ MonPartyData:
 	nybble ICON_MON       ; Gengar
 	nybble ICON_MON       ; Cubone
 	nybble ICON_MON       ; Marowak
-	; 	nybble ICON_MON       ; Marowak-A
+	nybble ICON_MON       ; Marowak-A
 	nybble ICON_MON	      ; Guardia
 	nybble ICON_MON       ; Betobebii
 	nybble ICON_MON       ; Grimer
@@ -195,7 +195,7 @@ MonPartyData:
 	nybble ICON_WATER	  ; Jagg
 	nybble ICON_GRASS     ; Exeggcute
 	nybble ICON_GRASS     ; Exeggutor
-	; 	nybble ICON_GRASS     ; Exeggutor-A
+	nybble ICON_GRASS     ; Exeggutor-A
 	nybble ICON_QUADRUPED ; Rhyhorn
 	nybble ICON_MON       ; Rhydon
 	nybble ICON_MON       ; Rhyperior
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 9dbc0fc8..1380e819 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -11,7 +11,6 @@ MonsterNames::
 	; "SLOWBRO-G@"
 	db "IVYSAUR@@@"
 	db "EXEGGUTOR@"
-	; db "EXEGGUTORA"
 	db "LICKITUNG@"
 	db "EXEGGCUTE@"
 	db "GRIMER@@@@"
@@ -51,7 +50,6 @@ MonsterNames::
 	db "PSYDUCK@@@"
 	db "DROWZEE@@@"
 	db "GOLEM@@@@@"
-	; db "GOLEM-A@@"
 	db "BARUNDA@@@"
 	db "MAGMAR@@@@"
 	db "BUU@@@@@@@"
@@ -155,7 +153,6 @@ MonsterNames::
 	; db "WEEZING-G@"
 	db "PERSIAN@@@"
 	db "MAROWAK@@@"
-	; db "MAROWAK-A@"
 	db "GUARDIA@@@"
 	db "HAUNTER@@@"
 	db "ABRA@@@@@@"
@@ -175,7 +172,6 @@ MonsterNames::
 	db "PUCHIKOON@"
 	db "PONYTA@@@@"
 	db "RAPIDASH@@"
-	; db "RAPIDASH-G"
 	db "RATTATA@@@"
 	db "RATICATE@@"
 	db "NIDORINO@@"
@@ -251,6 +247,10 @@ MonsterNames::
 	db "RAICHU-A@@"
 	db "SANDSLASHA"
 	db "PERSIAN-A@"
+	db "GOLEM-A@@@"
+	db "RAPIDASH-G"
+	db "EXEGGUTORA"
+	db "MAROWAK-A@"
 	db "ARTICUNO-G"
 	db "ZAPDOS-G@@"
 	db "MOLTRES-G@"
diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm
index 89b01bfa..a45d8668 100644
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@@ -888,25 +888,25 @@ _PersianADexEntry::
 	next "underhandedly"
 	dex
 
-;_GolemADexEntry::
-;	text "It fires rocks"
-;	next "charged with"
-;	next "electricity."
+_GolemADexEntry::
+	text "It fires rocks"
+	next "charged with"
+	next "electricity."
 	
-;	page "If it can't find"
-;	next "ammo, it may fire"
-;	next "GEODUDE instead"
-;	dex
+	page "If it can't find"
+	next "ammo, it may fire"
+	next "GEODUDE instead"
+	dex
 
-;_RapidashGDexEntry::
-;	text "Its galloping is"
-;	next "supported by its"
-;	next "PSI abilities." ; adapting from similar psychic-based entries.
+_RapidashGDexEntry::
+	text "Its galloping is"
+	next "supported by its"
+	next "PSI abilities." ; adapting from similar psychic-based entries.
 	
-;	page "If released from"
-;	next "its horn, it can"
-;	next "break concrete"
-;	dex
+	page "If released from"
+	next "its horn, it can"
+	next "break concrete"
+	dex
 
 ;_SlowbroGDexEntry::
 ;	text "The SHELLDER that"
@@ -938,25 +938,25 @@ _PersianADexEntry::
 ;	next "a lot of trash"
 ;	dex
 
-;_ExeggutorADexEntry::
-;	text "Strong sunlight"
-;	next "awoke its hidden"
-;	next "draconic powers."
+_ExeggutorADexEntry::
+	text "Strong sunlight"
+	next "awoke its hidden"
+	next "draconic powers."
 	
-;	page "However, as a"
-;	next "result, its PSI"
-;	next "has weakened"
-;	dex ; consider revising
+	page "However, as a"
+	next "result, its PSI"
+	next "has weakened"
+	dex ; consider revising
 
-;_MarowakADexEntry::
-;	text "While dancing in"
-;	next "mourning of its"
-;	next "kin, the spirit"
+_MarowakADexEntry::
+	text "While dancing in"
+	next "mourning of its"
+	next "kin, the spirit"
 	
-;	page "of its mother"
-;	next "inhabits its"
-;	next "cherished bone"
-;	dex
+	page "of its mother"
+	next "inhabits its"
+	next "cherished bone"
+	dex
 
 ;_WeezingGDexEntry::
 ;	text "It is better at"
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index 5ed5fdea..68296097 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -61,7 +61,7 @@ MonsterPalettes:
 	db PAL_GREYMON   ; GEODUDE
 	db PAL_GREYMON   ; GRAVELER
 	db PAL_GREYMON   ; GOLEM
-	;	db PAL_GREYMON   ; GOLEM_A
+	db PAL_GREYMON   ; GOLEM_A
 	db PAL_REDMON    ; PARA
 	db PAL_REDMON    ; PARAS
 	db PAL_REDMON    ; PARASECT
@@ -151,7 +151,7 @@ MonsterPalettes:
 	db PAL_REDMON    ; PUCHIKOON
 	db PAL_REDMON    ; PONYTA
 	db PAL_REDMON    ; RAPIDASH
-	;	db PAL_PURPLEMON ; RAPIDASH_G
+	db PAL_PURPLEMON ; RAPIDASH_G
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
 	db PAL_CYANMON   ; TANGROWTH
@@ -164,7 +164,7 @@ MonsterPalettes:
 	db PAL_PURPLEMON ; GENGAR
 	db PAL_BROWNMON  ; CUBONE
 	db PAL_BROWNMON  ; MAROWAK
-	;	db PAL_PURPLEMON ; MAROWAK_A
+	db PAL_PURPLEMON ; MAROWAK_A
 	db PAL_BROWNMON  ; GUARDIA
 	db PAL_PURPLEMON ; BETOBEBII
 	db PAL_PURPLEMON ; GRIMER
@@ -196,7 +196,7 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; JAGG
 	db PAL_PINKMON   ; EXEGGCUTE
 	db PAL_GREENMON  ; EXEGGUTOR
-	;	db PAL_GREENMON  ; EXEGGUTOR_A
+	db PAL_GREENMON  ; EXEGGUTOR_A
 	db PAL_GREYMON   ; RHYHORN
 	db PAL_GREYMON   ; RHYDON
 	db PAL_BROWNMON  ; RHYPERIOR
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 0ab51ea7..1a691471 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -563,6 +563,14 @@ 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"
+GolemAPicFront::       INCBIN "gfx/pokemon/front/golema.pic"
+GolemAPicBack::        INCBIN "gfx/pokemon/back/golemab.pic"
+RapidashGPicFront::    INCBIN "gfx/pokemon/front/rapidashg.pic"
+RapidashGPicBack::     INCBIN "gfx/pokemon/back/rapidashgb.pic"
+ExeggutorAPicFront::   INCBIN "gfx/pokemon/front/exeggutora.pic"
+ExeggutorAPicBack::    INCBIN "gfx/pokemon/back/exeggutorab.pic"
+MarowakAPicFront::     INCBIN "gfx/pokemon/front/marowaka.pic"
+MarowakAPicBack::      INCBIN "gfx/pokemon/back/marowakab.pic"
 
 YujirouPic::	    INCBIN "gfx/trainers/yujirou.pic"
 StudentPic::	    INCBIN "gfx/trainers/student.pic"