Hisuian Arcanine and Electrode!

(also another title screen graphic since we can never settle on which one looks the best)

constants/pokedex_constants.asm

@@ -80,7 +80,7 @@
 	const DEX_PUDI		 ;		(073)
 	const DEX_GROWLITHE  ; 58	(074)
 	const DEX_ARCANINE   ; 59	(075)
-	; const DEX_ARCANINE_H  ; 	(076)	
+	const DEX_ARCANINE_H ; 		(076)
 	const DEX_MANKEY     ; 56	(077)
 	const DEX_PRIMEAPE   ; 57	(078)
 	const DEX_ANNIHILAPE ;      (079)
@@ -129,7 +129,7 @@
 	const DEX_GOROTORA 	 ;		(122)
 	const DEX_VOLTORB    ; 100	(123)
 	const DEX_ELECTRODE  ; 101	(124)
-	; const DEX_ELECTRODE_H  ; 	(125)
+	const DEX_ELECTRODE_H ;		(125)
 	const DEX_TENTACOOL  ; 72	(126)
 	const DEX_TENTACRUEL ; 73	(127)
 	const DEX_TOEDSCOOL  ;      (128)

constants/pokemon_constants.asm

@@ -239,8 +239,8 @@
 	const MR_RIME            ; $E6
 	const MELTAN			 ; $E7
 	const MELMETAL		   	 ; $E8
-	; const ARCANINE_H		   ; $E9
-	; const ELECTRODE_H		   ; $EA
+	const ARCANINE_H		 ; $E9
+	const ELECTRODE_H		 ; $EA
 	; const RATICATE_A		   ; $EB
 	; const RAICHU_A           ; $EC
 	; const SANDSLASH_A		   ; $ED

data/pokemon/base_stats.asm

@@ -75,7 +75,7 @@ INCLUDE "data/pokemon/base_stats/ninetales.asm"
 INCLUDE "data/pokemon/base_stats/pudi.asm"
 INCLUDE "data/pokemon/base_stats/growlithe.asm"
 INCLUDE "data/pokemon/base_stats/arcanine.asm"
-; INCLUDE "data/pokemon/base_stats/arcanineh.asm"
+INCLUDE "data/pokemon/base_stats/arcanineh.asm"
 INCLUDE "data/pokemon/base_stats/mankey.asm"
 INCLUDE "data/pokemon/base_stats/primeape.asm"
 INCLUDE "data/pokemon/base_stats/annihilape.asm"
@@ -124,7 +124,7 @@ INCLUDE "data/pokemon/base_stats/gaotora.asm"
 INCLUDE "data/pokemon/base_stats/gorotora.asm"
 INCLUDE "data/pokemon/base_stats/voltorb.asm"
 INCLUDE "data/pokemon/base_stats/electrode.asm"
-; INCLUDE "data/pokemon/base_stats/electrodeh.asm"
+INCLUDE "data/pokemon/base_stats/electrodeh.asm"
 INCLUDE "data/pokemon/base_stats/tentacool.asm"
 INCLUDE "data/pokemon/base_stats/tentacruel.asm"
 INCLUDE "data/pokemon/base_stats/toedscool.asm"

data/pokemon/base_stats/electrodeh.asm

@@ -10,15 +10,15 @@
 	INCBIN "gfx/pokemon/front/electrodeh.pic", 0, 1 ; sprite dimensions
 	dw ElectrodeHPicFront, ElectrodeHPicBack
 
-	db THUNDERBOLT, MEGA_DRAIN, THUNDER_WAVE, EXPLOSION ; level 1 learnset, for trainers i guess
+	db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
-	tmhm TOXIC,        TAKE_DOWN,    HYPER_BEAM,   RAGE,         THUNDERBOLT,  \
-	     THUNDER,      TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      \
-	     BIDE,         SELFDESTRUCT, SWIFT,        SKULL_BASH,   REST,         \
-	     THUNDER_WAVE, EXPLOSION,    SUBSTITUTE,   FLASH, 		 MEGA_DRAIN		\
-		 SOLAR_BEAM
+	tmhm TOXIC,        TAKE_DOWN,    HYPER_BEAM,   RAGE,         MEGA_DRAIN,   \
+	     SOLARBEAM,	   THUNDERBOLT,  THUNDER,      TELEPORT,     MIMIC,        \
+	     DOUBLE_TEAM,  REFLECT,      BIDE,         SELFDESTRUCT, SWIFT,        \
+	     SKULL_BASH,   REST,         THUNDER_WAVE, EXPLOSION,    SUBSTITUTE,   \
+		 FLASH
 	; end
 
 	db BANK(ElectrodeHPicFront)

data/pokemon/cries.asm

@@ -238,8 +238,8 @@ CryData::
 	mon_cry SFX_CRY_20, $00, $90 ; Mr. Rime
 	mon_cry SFX_CRY_0E, $FF, $1C ; Meltan
 	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_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_09, $EE, $08 ; Raichu-A
 	; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A

data/pokemon/dex_entries.asm

@@ -232,6 +232,8 @@ PokedexEntryPointers:
 	dw MrRimeDexEntry
 	dw MeltanDexEntry
 	dw MelmetalDexEntry
+	dw ArcanineHDexEntry
+	dw ElectrodeHDexEntry
 	dw ArticunoGDexEntry
 	dw ZapdosGDexEntry
 	dw MoltresGDexEntry
@@ -1853,6 +1855,20 @@ MelmetalDexEntry:
 	text_far _MelmetalDexEntry
 	text_end
 	
+ArcanineHDexEntry:
+	db "LEGENDARY@"
+	db 6,7
+	dw 3700
+	text_far _ArcanineHDexEntry
+	text_end
+	
+ElectrodeHDexEntry:
+	db "SPHERE@"
+	db 3,11
+	dw 1570
+	text_far _ElectrodeHDexEntry
+	text_end
+	
 ArticunoGDexEntry:
 	db "CRUEL@"
 	db 5,7

data/pokemon/dex_order.asm

@@ -232,6 +232,8 @@ PokedexOrder:
 	db DEX_MR_RIME
 	db DEX_MELTAN
 	db DEX_MELMETAL
+	db DEX_ARCANINE_H
+	db DEX_ELECTRODE_H
 	db DEX_ARTICUNO_G
 	db DEX_ZAPDOS_G
 	db DEX_MOLTRES_G

data/pokemon/evos_moves.asm

@@ -34,7 +34,6 @@ EvosMovesPointerTable:
 	dw RhyhornEvosMoves
 	dw LaprasEvosMoves
 	dw ArcanineEvosMoves
-	;dw ArcanineHEvosMoves
 	dw MewEvosMoves
 	dw GyaradosEvosMoves
 	dw ShellderEvosMoves
@@ -166,7 +165,6 @@ EvosMovesPointerTable:
 	dw CloysterEvosMoves
 	dw MagnetiteEvosMoves
 	dw ElectrodeEvosMoves
-	;dw ElectrodeHEvosMoves
 	dw ClefableEvosMoves
 	dw WeezingEvosMoves
 	;dw WeezingGEvosMoves
@@ -264,6 +262,8 @@ EvosMovesPointerTable:
 	dw MrRimeEvosMoves
 	dw MeltanEvosMoves
 	dw MelmetalEvosMoves
+	dw ArcanineHEvosMoves
+	dw ElectrodeHEvosMoves
 	dw ArticunoGEvosMoves	
 	dw ZapdosGEvosMoves
 	dw MoltresGEvosMoves
@@ -525,18 +525,6 @@ ArcanineEvosMoves:
 ; Learnset
 	db 0
 
-;ArcanineHEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 18, EMBER ; no growlithe-hisui
-;	db 23, LEER
-;	db 30, TAKE_DOWN
-;	db 35, ROCK_SLIDE
-;	db 39, AGILITY
-;	db 50, FLAMETHROWER
-;	db 0
-
 MewEvosMoves:
 ; Evolutions
 	db 0
@@ -3270,6 +3258,29 @@ MelmetalEvosMoves:
 	db 81, SUBMISSION
 	db 90, HYPER_BEAM
 	db 0
+	
+ArcanineHEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 18, EMBER ; no growlithe-hisui
+	db 23, LEER
+	db 30, TAKE_DOWN
+	db 35, ROCK_SLIDE
+	db 39, AGILITY
+	db 50, FLAMETHROWER
+	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
 
 ArticunoGEvosMoves:
 ; Evolutions

data/pokemon/menu_icons.asm

@@ -75,7 +75,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Pudi
 	nybble ICON_QUADRUPED ; Growlithe
 	nybble ICON_QUADRUPED ; Arcanine
-	; 	nybble ICON_QUADRUPED ; Arcanine-A
+	nybble ICON_QUADRUPED ; Arcanine-H
 	nybble ICON_MON       ; Mankey
 	nybble ICON_MON       ; Primeape
 	nybble ICON_MON       ; Annihilape
@@ -124,7 +124,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Gorotora
 	nybble ICON_BALL      ; Voltorb
 	nybble ICON_BALL      ; Electrode
-	; 	nybble ICON_BALL      ; Electrode-A
+	nybble ICON_BALL      ; Electrode-H
 	nybble ICON_WATER     ; Tentacool
 	nybble ICON_WATER     ; Tentacruel
 	nybble ICON_GRASS     ; Toedscool

data/pokemon/names.asm

@@ -22,7 +22,6 @@ MonsterNames::
 	db "RHYHORN@@@"
 	db "LAPRAS@@@@"
 	db "ARCANINE@@"
-	; db "ARCANINE-H"
 	db "MEW@@@@@@@"
 	db "GYARADOS@@"
 	db "SHELLDER@@"
@@ -154,7 +153,6 @@ MonsterNames::
 	db "CLOYSTER@@"
 	db "MAGNETITE@"
 	db "ELECTRODE@"
-	; db "ELECTRODEA"
 	db "CLEFABLE@@"
 	db "WEEZING@@@"
 	; db "WEEZING-G@"
@@ -252,6 +250,8 @@ MonsterNames::
 	db "MR.RIME@@@"
 	db "MELTAN@@@@"
 	db "MELMETAL@@"
+	db "ARCANINE-H"
+	db "ELECTRODEH"
 	db "ARTICUNO-G"
 	db "ZAPDOS-G@@"
 	db "MOLTRES-G@"

data/pokemon/new_dex_text.asm

@@ -808,25 +808,25 @@ _MoltresGDexEntry::
 	next "wanders too close"
 	dex
 
-;_ArcanineHDexEntry::
-;	text "Its body has a"
-;	next "rock-like feel."
-;	next "It dances around"
+_ArcanineHDexEntry::
+	text "Its body has a"
+	next "rock-like feel."
+	next "It dances around"
 	
-;	page "its foes before"
-;	next "biting them in"
-;	next "a vicious rage" ; reference to Raging Fury, its signature move.
-;	dex
+	page "its foes before"
+	next "biting them in"
+	next "a vicious rage" ; reference to Raging Fury, its signature move.
+	dex
 
-;_ElectrodeHDexEntry::
-;	text "Its body has a"
-;	next "similar feel to"
-;	next "a type of berry."
+_ElectrodeHDexEntry::
+	text "Its body has a"
+	next "similar feel to"
+	next "a type of berry."
 	
-;	page "If angered, it"
-;	next "looses electricity"
-;	next "of 20,000 volts" ; 100 kV in a bolt of lightning on average
-;	dex
+	page "If angered, it"
+	next "looses electricity"
+	next "of 20,000 volts" ; 100 kV in a bolt of lightning on average
+	dex
 
 ;_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries
 ;	text "It commands nests"

data/pokemon/palettes.asm

@@ -76,7 +76,7 @@ MonsterPalettes:
 	db PAL_REDMON    ; PUDI
 	db PAL_REDMON    ; GROWLITHE
 	db PAL_REDMON    ; ARCANINE
-	;	db PAL_REDMON    ; ARCANINE_A
+	db PAL_REDMON    ; ARCANINE_A
 	db PAL_BROWNMON  ; MANKEY
 	db PAL_BROWNMON  ; PRIMEAPE
 	db PAL_GREYMON   ; ANNIHILAPE
@@ -125,7 +125,7 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; GOROTORA
 	db PAL_REDMON    ; VOLTORB
 	db PAL_REDMON    ; ELECTRODE
-	;	db PAL_REDMON    ; ELECTRODE_H
+	db PAL_REDMON    ; ELECTRODE_H
 	db PAL_CYANMON   ; TENTACOOL
 	db PAL_CYANMON   ; TENTACRUEL
 	db PAL_BROWNMON  ; TOEDSCOOL
@@ -217,7 +217,6 @@ MonsterPalettes:
 	db PAL_CYANMON   ; BAWLIGUA
 	db PAL_CYANMON   ; CRYITHAN
 	db PAL_PINKMON   ; MR_MIME
-	;	db PAL_CYANMON   ; MR_MIME_G
 	db PAL_CYANMON   ; MR_RIME
 	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU

engine/debug/debug_party.asm

@@ -22,7 +22,8 @@ SetIshiharaTeam:
 
 IshiharaTeam:
 	db EXEGGUTOR, 90
-	db SCREAM_TAIL, 90
+	db ARCANINE_H, 90
+	db ELECTRODE_H, 90
 	db MELTAN, 50
 IF DEF(_DEBUG)
 	db RAICHU, 50

gfx/pics.asm

@@ -549,7 +549,13 @@ ToedscruelPicBack::       INCBIN "gfx/pokemon/back/toedscruelb.pic"
 MissingNoPicFront::    INCBIN "gfx/pokemon/front/missingno.pic"
 MissingNoPicBack::     INCBIN "gfx/pokemon/back/missingnob.pic"
 
-SECTION "Pics 10", ROMX ; Extra Trainer Bank
+SECTION "Pics 10", ROMX ; Extra Trainer Bank, currently storing regionals here too
+
+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"
+
 YujirouPic::	    INCBIN "gfx/trainers/yujirou.pic"
 StudentPic::	    INCBIN "gfx/trainers/student.pic"
 FirefighterPic::	INCBIN "gfx/trainers/firefighter.pic"