Gorochu

This is the first use of the placeholder graphic. Works like a charm - copypaste the folder whenever you add something new.

This required me to change the layout.link for cries but it seems to work just fine. Earthtron cry is now available for use on other Pokemon, which I think could be neat for Shi-Shi.

data/pokemon/base_stats.asm

@@ -53,6 +53,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm"
 INCLUDE "data/pokemon/base_stats/arbok.asm"
 INCLUDE "data/pokemon/base_stats/pikachu.asm"
 INCLUDE "data/pokemon/base_stats/raichu.asm"
+INCLUDE "data/pokemon/base_stats/gorochu.asm"
 INCLUDE "data/pokemon/base_stats/sandshrew.asm"
 INCLUDE "data/pokemon/base_stats/sandslash.asm"
 INCLUDE "data/pokemon/base_stats/nidoran_f.asm"

data/pokemon/cries.asm

@@ -32,6 +32,7 @@ PokemonCries::
 	mon_cry CRY_EKANS,       224,  144 ; ARBOK
 	mon_cry CRY_BULBASAUR,   238,  129 ; PIKACHU
 	mon_cry CRY_RAICHU,      238,  136 ; RAICHU
+	mon_cry CRY_EARTHTRON,       0,  256 ; GOROCHU
 	mon_cry CRY_NIDORAN_M,    32,  192 ; SANDSHREW
 	mon_cry CRY_NIDORAN_M,   255,  383 ; SANDSLASH
 	mon_cry CRY_NIDORAN_F,     0,  256 ; NIDORAN_F

data/pokemon/dex_entries.asm

@@ -26,6 +26,7 @@ EkansPokedexEntry::      INCLUDE "data/pokemon/dex_entries/ekans.asm"
 ArbokPokedexEntry::      INCLUDE "data/pokemon/dex_entries/arbok.asm"
 PikachuPokedexEntry::    INCLUDE "data/pokemon/dex_entries/pikachu.asm"
 RaichuPokedexEntry::     INCLUDE "data/pokemon/dex_entries/raichu.asm"
+GorochuPokedexEntry::     INCLUDE "data/pokemon/dex_entries/gorochu.asm"
 SandshrewPokedexEntry::  INCLUDE "data/pokemon/dex_entries/sandshrew.asm"
 SandslashPokedexEntry::  INCLUDE "data/pokemon/dex_entries/sandslash.asm"
 NidoranFPokedexEntry::   INCLUDE "data/pokemon/dex_entries/nidoran_f.asm"

data/pokemon/dex_entries/gorochu.asm

@@ -0,0 +1,10 @@
+	db "VOLTAGE@" ; species name
+	dw 511, 1960 ; height, weight
+
+	db   "Proud of its power,"
+	next "GOROCHU will seek"
+	next "foes and shock"
+
+	page "them with THUNDER."
+	next "It can easily take"
+	next "down a TRAMPEL.@"

data/pokemon/dex_entry_pointers.asm

@@ -27,6 +27,7 @@ PokedexDataPointerTable:
 	dba ArbokPokedexEntry
 	dba PikachuPokedexEntry
 	dba RaichuPokedexEntry
+	dba GorochuPokedexEntry
 	dba SandshrewPokedexEntry
 	dba SandslashPokedexEntry
 	dba NidoranFPokedexEntry

data/pokemon/dex_order_alpha.asm

@@ -78,6 +78,7 @@ AlphabeticalPokedexOrder:
 	dw GOLDEEN
 	dw GOLDUCK
 	dw GOLEM
+	dw GOROCHU
 	dw GRANBULL
 	dw GRAVELER
 	dw GRIMER

data/pokemon/dex_order_new.asm

@@ -25,6 +25,7 @@ NewPokedexOrder:
 	dw PICHU
 	dw PIKACHU
 	dw RAICHU
+	dw GOROCHU
 	dw CATERPIE
 	dw METAPOD
 	dw BUTTERFREE

data/pokemon/egg_moves_kanto.asm

@@ -27,6 +27,7 @@ EggMovePointers1:
 	dw NoEggMoves1
 	dw NoEggMoves1
 	dw NoEggMoves1
+	dw NoEggMoves1
 	dw SandshrewEggMoves
 	dw NoEggMoves1
 	dw NidoranFEggMoves

data/pokemon/evos_attacks_kanto.asm

@@ -27,6 +27,7 @@ EvosAttacksPointers1::
 	dw ArbokEvosAttacks
 	dw PikachuEvosAttacks
 	dw RaichuEvosAttacks
+	dw GorochuEvosAttacks
 	dw SandshrewEvosAttacks
 	dw SandslashEvosAttacks
 	dw NidoranFEvosAttacks
@@ -504,12 +505,25 @@ PikachuEvosAttacks:
 	db 0 ; no more level-up moves
 
 RaichuEvosAttacks:
+	dbbw EVOLVE_TRADE, -1, GOROCHU
 	db 0 ; no more evolutions
 	dbw 1, THUNDERSHOCK
 	dbw 1, TAIL_WHIP
 	dbw 1, QUICK_ATTACK
 	dbw 1, THUNDERBOLT
 	db 0 ; no more level-up moves
+	
+GorochuEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, THUNDERSHOCK
+	dbw 1, TAIL_WHIP
+	dbw 1, QUICK_ATTACK
+	dbw 1, THUNDERBOLT
+	dbw 53, SAND_ATTACK
+	dbw 57, FOCUS_ENERGY
+	dbw 60, LEER
+	dbw 65, HORN_DRILL
+	db 0 ; no more level-up moves
 
 SandshrewEvosAttacks:
 	dbbw EVOLVE_LEVEL, 22, SANDSLASH

data/pokemon/first_stages.asm

@@ -27,6 +27,7 @@ FirstEvoStages::
 	dw EKANS      ;18
 	dw PICHU
 	dw PICHU
+	dw PICHU
 	dw SANDSHREW
 	dw SANDSHREW
 	dw NIDORAN_F

data/pokemon/gen1_base_special.asm

@@ -28,6 +28,7 @@ KantoMonSpecials:
 	db  65 ; ARBOK
 	db  50 ; PIKACHU
 	db  90 ; RAICHU
+	db 100 ; GOROCHU
 	db  30 ; SANDSHREW
 	db  55 ; SANDSLASH
 	db  40 ; NIDORAN_F

data/pokemon/gen1_order.asm

@@ -257,4 +257,5 @@ Pokered_MonIndices:
 	db WALKING_WAKE
 	db SHI_SHI
 	db MUNCHLAX
+	db GOROCHU
 	assert_table_length NUM_POKEMON - 1

data/pokemon/menu_icons.asm

@@ -28,6 +28,7 @@ MonMenuIcons:
 	db ICON_SERPENT     ; ARBOK
 	db ICON_PIKACHU     ; PIKACHU
 	db ICON_PIKACHU     ; RAICHU
+	db ICON_PIKACHU		; GOROCHU
 	db ICON_MONSTER     ; SANDSHREW
 	db ICON_MONSTER     ; SANDSLASH
 	db ICON_FOX         ; NIDORAN_F

data/pokemon/names.asm

@@ -30,6 +30,7 @@ PokemonNames::
 	db "ARBOK@@@@@"
 	db "PIKACHU@@@"
 	db "RAICHU@@@@"
+	db "GOROCHU@@@"
 	db "SANDSHREW@"
 	db "SANDSLASH@"
 	db "NIDORAN♀@@"

data/pokemon/palettes.asm

@@ -85,6 +85,8 @@ INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/pikachu/shiny.pal"
 INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/raichu/shiny.pal"
+INCBIN "gfx/pokemon/gorochu/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/gorochu/shiny.pal"
 INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sandshrew/shiny.pal"
 INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors

data/pokemon/pic_pointers.asm

@@ -65,6 +65,8 @@ PokemonPicPointers::
 	dba PikachuBackpic
 	dba RaichuFrontpic
 	dba RaichuBackpic
+	dba GorochuFrontpic
+	dba GorochuBackpic
 	dba SandshrewFrontpic
 	dba SandshrewBackpic
 	dba SandslashFrontpic