From 4baf3964982c6772622c07c3ae1cd4380fa35a96 Mon Sep 17 00:00:00 2001
From: MementoMartha <harleyrayquaza@gmail.com>
Date: Sat, 8 Apr 2023 14:59:04 +0100
Subject: [PATCH] Dugtrio-A and Ninetales-A!

---
 constants/pokedex_constants.asm        |   4 +-
 constants/pokemon_constants.asm        |  10 ++--
 data/pokemon/base_stats.asm            |   4 +-
 data/pokemon/base_stats/ninetalesa.asm |   8 +--
 data/pokemon/cries.asm                 |   4 +-
 data/pokemon/dex_entries.asm           |  16 +++++
 data/pokemon/dex_order.asm             |   2 +
 data/pokemon/evos_moves.asm            |  56 ++++++++---------
 data/pokemon/menu_icons.asm            |   4 +-
 data/pokemon/names.asm                 |   4 +-
 data/pokemon/new_dex_text.asm          |  32 +++++-----
 data/pokemon/palettes.asm              |   4 +-
 data/trainers/scaled_parties.asm       |  80 ++++++++++++-------------
 gfx/pics.asm                           |   4 ++
 gfx/pokemon/back/dugtrioab.png         | Bin 0 -> 448 bytes
 gfx/pokemon/back/ninetalesab.png       | Bin 0 -> 533 bytes
 gfx/pokemon/front/dugtrioa.png         | Bin 0 -> 709 bytes
 gfx/pokemon/front/ninetalesa.png       | Bin 0 -> 956 bytes
 18 files changed, 127 insertions(+), 105 deletions(-)
 create mode 100644 gfx/pokemon/back/dugtrioab.png
 create mode 100644 gfx/pokemon/back/ninetalesab.png
 create mode 100644 gfx/pokemon/front/dugtrioa.png
 create mode 100644 gfx/pokemon/front/ninetalesa.png

diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index 0373d875..07ee739e 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -76,7 +76,7 @@
 	const DEX_MIKON      ;		(069)
 	const DEX_VULPIX     ; 37	(070)
 	const DEX_NINETALES  ; 38	(071)
-	; const DEX_NINETALES_A ;	(072)
+	const DEX_NINETALES_A ;	    (072)
 	const DEX_PUDI		 ;		(073)
 	const DEX_GROWLITHE  ; 58	(074)
 	const DEX_ARCANINE   ; 59	(075)
@@ -119,7 +119,7 @@
 	const DEX_ALAKAZAM   ; 65	(112)
 	const DEX_DIGLETT    ; 50	(113)
 	const DEX_DUGTRIO    ; 51	(114)
-	; const DEX_DUGTRIO_A    ;  (115)
+	const DEX_DUGTRIO_A  ;      (115)
 	const DEX_WIGLETT    ; 	    (116)
 	const DEX_WUGTRIO    ; 	    (117)
 	const DEX_ONIX       ; 95	(118)
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 4dee6fdb..accf664e 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -243,12 +243,12 @@
 	const ELECTRODE_H		 ; $EA
 	const RATICATE_A		 ; $EB
 	const RAICHU_A           ; $EC
-	const SANDSLASH_A		   ; $ED
-	; const NINETALES_A		   ; $EE
-	; const DUGTRIO_A		   ; $EF
+	const SANDSLASH_A		 ; $ED
+	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
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 44525496..348d27e7 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -71,7 +71,7 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
 INCLUDE "data/pokemon/base_stats/mikon.asm"
 INCLUDE "data/pokemon/base_stats/vulpix.asm"
 INCLUDE "data/pokemon/base_stats/ninetales.asm"
-; INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
+INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
 INCLUDE "data/pokemon/base_stats/pudi.asm"
 INCLUDE "data/pokemon/base_stats/growlithe.asm"
 INCLUDE "data/pokemon/base_stats/arcanine.asm"
@@ -114,7 +114,7 @@ INCLUDE "data/pokemon/base_stats/kadabra.asm"
 INCLUDE "data/pokemon/base_stats/alakazam.asm"
 INCLUDE "data/pokemon/base_stats/diglett.asm"
 INCLUDE "data/pokemon/base_stats/dugtrio.asm"
-; INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
+INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
 INCLUDE "data/pokemon/base_stats/wiglett.asm"
 INCLUDE "data/pokemon/base_stats/wugtrio.asm"
 INCLUDE "data/pokemon/base_stats/onix.asm"
diff --git a/data/pokemon/base_stats/ninetalesa.asm b/data/pokemon/base_stats/ninetalesa.asm
index e214a869..c588352b 100644
--- a/data/pokemon/base_stats/ninetalesa.asm
+++ b/data/pokemon/base_stats/ninetalesa.asm
@@ -14,10 +14,10 @@
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
-	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
-	     RAGE,         DIG,          MIMIC,        DOUBLE_TEAM,  REFLECT,      \
-	     BIDE,         BLIZZARD,   SWIFT,        SKULL_BASH,   REST,         \
-	     SUBSTITUTE, ICE_BEAM
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  ICE_BEAM,     \
+	     BLIZZARD,     HYPER_BEAM,   RAGE,         DIG,          MIMIC,        \
+	     DOUBLE_TEAM,  REFLECT,      BIDE,         SWIFT,        SKULL_BASH,   \
+	     REST,         SUBSTITUTE
 	; end
 
 	db BANK(NinetalesAPicFront)
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index d6152c58..9666ff78 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -243,8 +243,8 @@ CryData::
 	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
-	; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
-	; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-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_12, $E0, $40 ; Golem-A
 	mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index c6f4d620..68d38ed9 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -237,6 +237,8 @@ PokedexEntryPointers:
 	dw RaticateADexEntry
 	dw RaichuADexEntry
 	dw SandslashADexEntry
+	dw NinetalesADexEntry
+	dw DugtrioADexEntry
 	dw PersianADexEntry
 	dw GolemADexEntry
 	dw RapidashGDexEntry
@@ -1898,6 +1900,20 @@ SandslashADexEntry:
 	text_far _SandslashADexEntry
 	text_end
 	
+NinetalesADexEntry:
+	db "FOX@"
+	db 3,7
+	dw 440
+	text_far _NinetalesADexEntry
+	text_end
+	
+DugtrioADexEntry:
+	db "MOLE@"
+	db 2,4
+	dw 1470
+	text_far _DugtrioADexEntry
+	text_end
+	
 PersianADexEntry:
 	db "CLASSY CAT@"
 	db 3,7
diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm
index 017b7e8e..911b0756 100644
--- a/data/pokemon/dex_order.asm
+++ b/data/pokemon/dex_order.asm
@@ -237,6 +237,8 @@ PokedexOrder:
 	db DEX_RATICATE_A
 	db DEX_RAICHU_A
 	db DEX_SANDSLASH_A
+	db DEX_NINETALES_A
+	db DEX_DUGTRIO_A
 	db DEX_PERSIAN_A
 	db DEX_GOLEM_A
 	db DEX_RAPIDASH_G
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index f24c5f03..acce281b 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -99,7 +99,6 @@ EvosMovesPointerTable:
 	dw MikonEvosMoves
 	dw VulpixEvosMoves
 	dw NinetalesEvosMoves
-	;dw NinetalesAEvosMoves
 	dw PikachuEvosMoves
 	dw RaichuEvosMoves
 	dw RibbitoEvosMoves
@@ -135,7 +134,6 @@ EvosMovesPointerTable:
 	dw DodrioEvosMoves
 	dw PrimeapeEvosMoves
 	dw DugtrioEvosMoves
-	;DugtrioAEvosMoves
 	dw VenomothEvosMoves
 	dw DewgongEvosMoves
 	dw PurakkusuEvosMoves
@@ -258,6 +256,8 @@ EvosMovesPointerTable:
 	dw RaticateAEvosMoves
 	dw RaichuAEvosMoves
 	dw SandslashAEvosMoves
+	dw NinetalesAEvosMoves
+	dw DugtrioAEvosMoves
 	dw PersianAEvosMoves
 	dw GolemAEvosMoves
 	dw RapidashGEvosMoves
@@ -1311,20 +1311,6 @@ NinetalesEvosMoves:
 ; Learnset
 	db 0
 
-;NinetalesAEvosMoves: ; vulpix-alola learnset
-; Evolutions
-;	db 0
-; Learnset
-;	db 7, ROAR
-;	db 12, CONFUSE_RAY
-;	db 23, FEINT_ATTACK
-;	db 28, AURORA_BEAM
-;	db 36, ICE_BEAM
-;	db 38, DAZZLE_GLEAM
-;	db 42, BLIZZARD
-;	db 46, CHARM
-;	db 0
-
 PikachuEvosMoves:
 ; Evolutions
 	db EV_ITEM, THUNDER_STONE, 1, RAICHU
@@ -1740,18 +1726,6 @@ DugtrioEvosMoves:
 	db 47, EARTHQUAKE
 	db 0
 
-;DugtrioAEvosMoves:
-; Evolutions
-;	db 0
-; Learnset
-;	db 6, GROWL
-;	db 20, SLASH
-;	db 31, DIG
-;	db 35, IRON_HEAD
-;	db 39, EARTHQUAKE
-;	db 43, FISSURE
-;	db 0
-
 VenomothEvosMoves:
 ; Evolutions
 	db 0
@@ -3193,6 +3167,32 @@ SandslashAEvosMoves:
 	db 45, BLIZZARD
 	db 0
 	
+NinetalesAEvosMoves: ; vulpix-alola learnset
+; Evolutions
+	db 0
+; Learnset
+	db 7, ROAR
+	db 12, CONFUSE_RAY
+	db 23, FEINT_ATTACK
+	db 28, AURORA_BEAM
+	db 36, ICE_BEAM
+	db 38, DAZZLE_GLEAM
+	db 42, BLIZZARD
+	db 46, CHARM
+	db 0
+
+DugtrioAEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 6, GROWL
+	db 20, SLASH
+	db 31, DIG
+	db 35, IRON_HEAD
+	db 39, EARTHQUAKE
+	db 43, FISSURE
+	db 0
+	
 PersianAEvosMoves:
 ; Evolutions
 	db 0
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 1b7295c9..208919a1 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -71,7 +71,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Mikon
 	nybble ICON_QUADRUPED ; Vulpix
 	nybble ICON_QUADRUPED ; Ninetales
-	; 	nybble ICON_QUADRUPED ; Ninetales-A
+	nybble ICON_QUADRUPED ; Ninetales-A
 	nybble ICON_QUADRUPED ; Pudi
 	nybble ICON_QUADRUPED ; Growlithe
 	nybble ICON_QUADRUPED ; Arcanine
@@ -114,7 +114,7 @@ MonPartyData:
 	nybble ICON_MON       ; Alakazam
 	nybble ICON_MON       ; Diglett
 	nybble ICON_MON       ; Dugtrio
-	; 	nybble ICON_MON       ; Dugtrio-A
+	nybble ICON_MON       ; Dugtrio-A
 	nybble ICON_WATER     ; Wiglett
 	nybble ICON_WATER     ; Wugtrio
 	nybble ICON_SNAKE     ; Onix
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 1380e819..ac9d0c4b 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -87,7 +87,6 @@ MonsterNames::
 	db "MIKON@@@@@"
 	db "VULPIX@@@@"
 	db "NINETALES@"
-	; db "NINETALESA"
 	db "PIKACHU@@@"
 	db "RAICHU@@@@"
 	db "RIBBITO@@@"
@@ -123,7 +122,6 @@ MonsterNames::
 	db "DODRIO@@@@"
 	db "PRIMEAPE@@"
 	db "DUGTRIO@@@"
-	; db "DUGTRIO-A@"
 	db "VENOMOTH@@"
 	db "DEWGONG@@@"
 	db "PURAKKUSU@"
@@ -246,6 +244,8 @@ MonsterNames::
 	db "RATICATE-A"
 	db "RAICHU-A@@"
 	db "SANDSLASHA"
+	db "NINETALESA"
+	db "DUGTRIO-A@"
 	db "PERSIAN-A@"
 	db "GOLEM-A@@@"
 	db "RAPIDASH-G"
diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm
index a45d8668..9810df31 100644
--- a/data/pokemon/new_dex_text.asm
+++ b/data/pokemon/new_dex_text.asm
@@ -858,25 +858,25 @@ _SandslashADexEntry::
 	next "frostbite"
 	dex
 
-;_NinetalesADexEntry::
-;	text "Once thought to"
-;	next "be a deity, it"
-;	next "appears to lost" 
+_NinetalesADexEntry::
+	text "Once thought to"
+	next "be a deity, it"
+	next "appears to lost" 
 	
-;	page "mountain climbers"
-;	next "to guide them away"
-;	next "from its home"
-;	dex
+	page "mountain climbers"
+	next "to guide them away"
+	next "from its home"
+	dex
 
-;_DugtrioADexEntry::
-;	text "DUGTRIO's hair"
-;	next "and whiskers are"
-;	next "made of metal."
+_DugtrioADexEntry::		; revised to add more info
+	text "The metal whiskers"
+	next "on its heads help"
+	next "protect it from"
 	
-;	page "They provide it"
-;	next "with protection"
-;	next "from attacks"
-;	dex
+	page "attacks, and can"
+	next "sense sounds from"
+	next "many miles away"
+	dex
 
 _PersianADexEntry::
 	text "Its round face"
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index 68296097..bf895bde 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -72,7 +72,7 @@ MonsterPalettes:
 	db PAL_REDMON    ; MIKON
 	db PAL_REDMON    ; VULPIX
 	db PAL_YELLOWMON ; NINETALES
-	;	db PAL_CYANMON	 ; NINETALES_A
+	db PAL_CYANMON	 ; NINETALES_A
 	db PAL_REDMON    ; PUDI
 	db PAL_REDMON    ; GROWLITHE
 	db PAL_REDMON    ; ARCANINE
@@ -115,7 +115,7 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; ALAKAZAM
 	db PAL_BROWNMON  ; DIGLETT
 	db PAL_BROWNMON  ; DUGTRIO
-	;	db PAL_BROWNMON  ; DUGTRIO_A
+	db PAL_BROWNMON  ; DUGTRIO_A
 	db PAL_PINKMON   ; WIGLETT
 	db PAL_PINKMON   ; WUGTRIO
 	db PAL_GREYMON   ; ONIX
diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm
index 7efc51ee..c48cc3ac 100644
--- a/data/trainers/scaled_parties.asm
+++ b/data/trainers/scaled_parties.asm
@@ -1,18 +1,18 @@
 ; gyms except giovanni begin here
 BrockData:
-	db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0											; 0 badges
-	db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0								; 1
-	db $FF, 22, GRAVELER, 22, OMANYTE, 22, KABUTO, 23, DECILLA, 25, ONIX, 0					; 2
-	db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0					; 3
-	db $FF, 39, GOLEM, 38, OMANYTE, 38, KABUTO, 39, NIDOREIGN, 41, GYAOON, 0				; 4
-	db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0				; 5
-	db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0				; 6
-	db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0	; 7 (unused)
-	db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0	; 8 (postgame)
+	db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0											 ; 0 badges
+	db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0								 ; 1
+	db $FF, 22, GRAVELER, 22, OMANYTE, 22, KABUTO, 23, DECILLA, 25, ONIX, 0					 ; 2
+	db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0					 ; 3
+	db $FF, 39, GOLEM, 38, OMANYTE, 38, KABUTO, 39, NIDOREIGN, 41, GYAOON, 0				 ; 4
+	db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0				 ; 5
+	db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0				 ; 6
+	db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0	 ; 7 (unused)
+	db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame)
 
 MistyData:
-	db $FF, 10, HORSEA, 11, GYOPIN, 13, STARYU, 0											; 0 badges
-	db $FF, 19, HORSEA, 18, CHEEP, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0				; 1
+	db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0											; 0 badges
+	db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0							; 1
 	db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0				; 2
 	db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0				; 3
 	db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, STARMIE, 0				; 4
@@ -22,31 +22,31 @@ MistyData:
 	db $FF, 66, STARMIE, 67, VAPOREON, 67, GOLDUCK, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0	; 8 (postgame)
 
 LtSurgeData:
-	db $FF, 10, VOLTORB, 10, KOTORA, 11, PIKACHU, 0													; 0 badges
-	db $FF, 19, VOLTORB, 18, KOTORA, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0					; 1
+	db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0												; 0 badges
+	db $FF, 19, VOLTORB, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0								; 1
 	db $FF, 22, VOLTORB, 22, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0					; 2
 	db $FF, 28, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0				; 3
 	db $FF, 39, ELECTRODE, 38, GOROTORA, 38, MAGNETON, 39, ELECTABUZZ, 41, GOROCHU, 0				; 4
 	db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0				; 5
 	db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0				; 6
 	db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0	; 7 (unused)
-	db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, SANDY_SHOCKS, 67, GOROCHU, 70, ZAPDOS, 0	; 8 (postgame)
+	db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, GOLEM_A, 67, GOROCHU, 70, ZAPDOS, 0	    ; 8 (postgame)
 
 ErikaData:
-	db $FF, 10, BELLSPROUT, 10, PARAS, 11, MONJA, 13, GLOOM, 0											; 0 badges
-	db $FF, 19, BELLSPROUT, 18, PARAS, 18, TOEDSCOOL, 19, TANGELA, 21, GLOOM, 0							; 1
-	db $FF, 22, BELLSPROUT, 22, PARASECT, 22, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0						; 2
-	db $FF, 28, WEEPINBELL, 28, PARASECT, 28, CACTUS, 29, TANGELA, 31, BELLOSSOM, 0						; 3
-	db $FF, 38, VICTREEBEL, 38, BELLOSSOM, 39, TOEDSCRUEL, 39, CACTUS, 41, TANGROWTH, 0					; 4
-	db $FF, 40, VICTREEBEL, 40, BELLOSSOM, 41, TOEDSCRUEL, 41, CACTUS, 43, TANGROWTH, 0					; 5
-	db $FF, 44, VICTREEBEL, 44, BELLOSSOM, 45, TOEDSCRUEL, 45, CACTUS, 47, TANGROWTH, 0					; 6
-	db $FF, 46, VICTREEBEL, 46, BELLOSSOM, 47, TOEDSCRUEL, 48, CACTUS, 48, EXEGGUTOR, 50, TANGROWTH, 0	; 7 (unused)
-	db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0	; 8 (postgame)
+	db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0														 ; 0 badges
+	db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, TANGELA, 21, GLOOM, 0									 ; 1
+	db $FF, 22, BELLSPROUT, 22, PARASECT, 22, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0						 ; 2
+	db $FF, 28, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0					 ; 3
+	db $FF, 38, VICTREEBEL, 38, PARASECT, 39, TOEDSCRUEL, 39, BELLOSSOM, 41, TANGROWTH, 0				 ; 4
+	db $FF, 40, VICTREEBEL, 40, PARASECT, 41, TOEDSCRUEL, 41, BELLOSSOM, 43, TANGROWTH, 0				 ; 5
+	db $FF, 44, VICTREEBEL, 44, PARASECT, 45, TOEDSCRUEL, 45, BELLOSSOM, 47, TANGROWTH, 0				 ; 6
+	db $FF, 46, VICTREEBEL, 46, PARASECT, 47, TOEDSCRUEL, 48, BELLOSSOM, 48, EXEGGUTOR, 50, TANGROWTH, 0 ; 7 (unused)
+	db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, ELECTRODE_H, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0	 ; 8 (postgame)
 
 KogaData:
-	db $FF, 10, VENONAT, 10, GRIMER, 11, KOFFING, 13, NIDORINO, 0								; 0 badges
-	db $FF, 19, ZUBAT, 18, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0					; 1
-	db $FF, 22, ZUBAT, 22, NIDORINO, 22, GRIMER, 23, KOFFING, 25, VENOMOTH, 0					; 2
+	db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0											; 0 badges
+	db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0								; 1
+	db $FF, 22, GOLBAT, 22, NIDORINO, 22, GRIMER, 23, KOFFING, 25, VENOMOTH, 0					; 2
 	db $FF, 28, GOLBAT, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, VENOMOTH, 0					; 3
 	db $FF, 38, TENTACRUEL, 39, VENOMOTH, 38, MUK, 39, WEEZING, 41, CROBAT, 0					; 4
 	db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0					; 5
@@ -55,8 +55,8 @@ KogaData:
 	db $FF, 66, TENTACRUEL, 67, NIDOKING, 66, TSUBOMITTO, 67, MUK, 67, WEEZING, 70, CROBAT, 0	; 8 (postgame)
 
 BlaineData:
-	db $FF, 10, GROWLITHE, 10, VULPIX, 11, CHARMANDER, 13, PONYTA, 0								; 0 badges (unused?)
-	db $FF, 19, PONYTA, 18, VULPIX, 18, GROWLITHE, 19, CHARMELEON, 21, MAGMAR, 0					; 1
+	db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0												; 0 badges (unused?)
+	db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0									; 1
 	db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0					; 2
 	db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0						; 3
 	db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0					; 4
@@ -66,15 +66,15 @@ BlaineData:
 	db $FF, 66, NINETALES, 67, RAPIDASH, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0	; 8 (postgame)
 
 SabrinaData:
-	db $FF, 10, DROWZEE, 10, SLOWPOKE, 11, EXEGGCUTE, 13, KADABRA, 0								; 0 badges
-	db $FF, 19, DROWZEE, 18, SLOWPOKE, 18, EXEGGCUTE, 19, KADABRA, 21, MR_MIME, 0					; 1
+	db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0												; 0 badges
+	db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0									; 1
 	db $FF, 22, DROWZEE, 22, SLOWPOKE, 22, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0					; 2
 	db $FF, 28, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0					; 3
 	db $FF, 38, ESPEON, 39, MR_MIME, 38, SLOWKING, 39, HYPNO, 41, ALAKAZAM, 0						; 4
 	db $FF, 40, ESPEON, 41, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0						; 5
 	db $FF, 44, ESPEON, 45, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0						; 6
 	db $FF, 46, ESPEON, 47, MR_RIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0		; 7 (unused)
-	db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, SCREAM_TAIL, 67, ALAKAZAM, 70, ARTICUNO_G, 0	; 8 (postgame)
+	db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, RAPIDASH_G, 67, ALAKAZAM, 70, ARTICUNO_G, 0	; 8 (postgame)
 
 GiovanniData: ; is not scaled as he is always fought last
 ; Rocket Hideout B4F - should be changed to Lavender Tower
@@ -85,24 +85,24 @@ GiovanniData: ; is not scaled as he is always fought last
 	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0
 
 LoreleiData:
-	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, JYNX, 55, BUU, 56, LAPRAS, 0
+	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, MR_RIME, 55, BUU, 56, LAPRAS, 0
 ; post-game rematch team (currently unused)
 	db $FF, 74, DEWGONG, 73, CLOYSTER, 74, GLACEON, 75, MR_RIME, 75, LAPRAS, 76, ARTICUNO, 0
 
 BrunoData:
-	db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, JABETTA, 56, PURAKKUSU, 58, MACHAMP, 0
+	db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
 ; post-game rematch team (currently unused)
-	db $FF, 74, STEELIX, 75, POLIWRATH, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
+	db $FF, 74, POLIWRATH, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
 
 AgathaData:
-	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, ANNIHILAPE, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
-; post-game rematch team (currently unused, marowak will be alolan)
-	db $FF, 77, ANNIHILAPE, 76, MAROWAK, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
+	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, ANNIHILAPE, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
+; post-game rematch team (currently unused)
+	db $FF, 77, ANNIHILAPE, 76, UMBREON, 76, MAROWAK_A, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
 
 LanceData:
-	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CHARIZARD, 59, CRYITHAN, 62, DRAGONITE, 0
-; post-game rematch team (currently unused, exeggutor will be alolan)
-	db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR, 79, CRYITHAN, 82, DRAGONITE, 0
+	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0
+; post-game rematch team (currently unused)
+	db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0
 
 YujirouData: ; was unused juggler
 	db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 1a691471..1003c84f 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -561,6 +561,10 @@ 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"
+NinetalesAPicFront::   INCBIN "gfx/pokemon/front/ninetalesa.pic"
+NinetalesAPicBack::    INCBIN "gfx/pokemon/back/ninetalesab.pic"
+DugtrioAPicFront::     INCBIN "gfx/pokemon/front/dugtrioa.pic"
+DugtrioAPicBack::      INCBIN "gfx/pokemon/back/dugtrioab.pic"
 PersianAPicFront::     INCBIN "gfx/pokemon/front/persiana.pic"
 PersianAPicBack::      INCBIN "gfx/pokemon/back/persianab.pic"
 GolemAPicFront::       INCBIN "gfx/pokemon/front/golema.pic"
diff --git a/gfx/pokemon/back/dugtrioab.png b/gfx/pokemon/back/dugtrioab.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f3366169f340f879c004cdd9683557e8298b76
GIT binary patch
literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn%
z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4<BY}``R0pxKOctjR6Fz_7#VaBQ2e9}Nc
z_7YEDSN7*D9K2$dd!8(`1Pb+gx;TbNTu%PM&&s1>xbK6tgT#0HKhxQbU;Y1I&lmhz
z=vW0~>Yq5q#6Q*SKzi#bxg!<d`A*%~n{`#|8Mg!5gt*k?aQ?J4TmIkW7yMYop19^q
z)Ks1{9quSg$ulz~7foYITjEyg$7mSlch-xC(eP4GxF3s=Qu;X_Uv8d%=LM#TNl8f^
z`afS$gy&7?CryU8Y-el(_Rb6gI!(32HKHUXu_V<hxhNG#F&G&b8S5ID=o(mr7#dp{
z8CjW{Ya19?85qR1^ln7akei>9nO2EggZ@oZUZ4gIxD6$lxv9k^iMa*1^;Db@xdhb1
N;OXk;vd$@?2>^JuhP?m)

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/back/ninetalesab.png b/gfx/pokemon/back/ninetalesab.png
new file mode 100644
index 0000000000000000000000000000000000000000..45cb342ecfc6f855684509e3b09a61649e74f665
GIT binary patch
literal 533
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn%
z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4<BY}``R0pxKOctjR6Fz_7#VaBQ2e9}Nc
z_7YEDSN7*D9K2$3lJ7)7RzC4`aSV~Tocx2ImFNHe_y1q<B<|V&f4SV5AMyYHTXYmY
zJ^lZGePhr5Z+{XT+ukeahQIrtzT^M@|NFO^{rxX_4#>*-IsfT@$p)+Nv;Q|s9Qm<*
zRh{sJ#Q*irH<k7`WWD*n_jJtG6LKqleAns@m33e~|3CVt_iouEKTLm4zm}}<`1Af<
z;ZfQ%{u}?f`MY}RwN(iV-o9ELwkC@8%D;bdmlv(%bGThUpTly~6}cxHlCB2z-cM+|
z7Sdm@&~|pEU;qF8jXc$BT^-dNcK@4ie|5tN?jsg|52hXEnlQ_Mwb<Gyo{tJ=-tUlL
zaPdB6*`st;3g}<e64!{5l*E!$tK_0oAjM#0U}UUoV4`ba5n^a;Wn^S!Y@lsmU}azs
z>$7VIiiX_$l+3hB+!}NQnOJ}tG~hOrWag$8mn7yE;MP;kqI?^uhr!d;&t;ucLK6TE
C$ju}G

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/front/dugtrioa.png b/gfx/pokemon/front/dugtrioa.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf2cf6853bd079dfb044d0dbea3eb4355a5beaf7
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#6p}rHd>I(3)EF2VS{N8WLJcn%
z7)pT(UnMXwSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s5<Z%{wL>4nJ@ErkR#;MwT(m+A>
z5>H=O_U9}dykeGno-DLvU|^i$>Ealoao+dRet&605%v%1nsE`Inm>C)Uz45@q3GwK
zZ5nj+>8E)!Bn0f){xQ#3<rR5L(dm_gIbUPeo-gtaGavXTybRd5VX{V2hmh?1nKDNw
z`Tu({cmKBcJe3*or#`h9$jwjx|MC3q@9Qnvev~)fv^9-w%<TUls_ZOso!RWuvrA^b
z8a77n^$?O_`7^iX`&5;=EHZq1{;#?`{ra`N-|aVD$u~-?-#7Q@^T;aAicb^s=4UR6
zJ$6EHspLdU-2;Cw%O$_!Rs7C&-0)uR-;^sg@l09~yN%W^OL!u*CU!#8>U9jF^VF_0
zpPezUME0G&kJ?SS<o0G?8SC$>c`94F)@**j_shUl$<9RHblu?#T$|b#|8VB(FIB$K
zTNb~MF+5}Efwc!_eM@89dg-@JfqF-^{OcygK=<h6&z4cMgt<fRGc3I{cQNy_1H4;V
zx)}u-r)=1&IAdlIOX!MKAG~{>PSR}Dv0`!UWf475md7aMp_IIvDOqt<!!}vBlnqBF
zo4D|Ji%ne3rXqEXLBv1!vozD=O}gUc>G$R_zT9A0&iN!b0~lqhC9V-ADTyViR>?)F
zK#IZ0z{ptFz(m);BE-<x%E-vd)Lh%Zz{<cNuBCS)iiX_$l+3hB+#2+6n(_iQXuxeK
e$;?eHE=kNSz^$j^jL0RR9tKZWKbLh*2~7ZYcL$LG

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/front/ninetalesa.png b/gfx/pokemon/front/ninetalesa.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a715c961b157aa43a806f26b5f48cf0dc335f9
GIT binary patch
literal 956
zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7Tdg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&U^Z?k>HzXM3p^r=85sDEfH31!Z9ZwB
zAbW|YuPgg=77ku9Imve-Kr5NLJzX3_G|t;zcJvTQ6k-3s&o6uER&cwYQ%MJ>*$HQ*
zQ{~?`HA>z%xNFA+Ii(Ggcl15qddpdJjpz*SUuUHwI{9w#B~ILs@QNc^cF&oE&Sp2(
zS$Z?SuKE1_?K+d~^7;SX&;I_yZNcX^jO8i{R;y;&@`n5~?lxfU{Vn^7<M{IJ6TjYC
z^GYCjY1AsE+h<-m{C=|LpompyZi1GTuJBb;mm4p955BH_B5cXn@;tuR{EnmEC9Uw-
z*Y4A8e@u7fOIN>I{?+JC`qZ$8o!VLVr1-Yacq+PM(d=KEU-yYF6>U)p@~x7)y5<m*
zs9;CHQDavhz2%ov9J${c)D`o(B`$I3dMRhtsrSZS##eaeM1#L|i<a-_dc63~YG3ae
zZdEpO6}5#fnZIMWf8?npU-7k1@e33`X7-&HJ``NHQT?cMyj0|ZIJ@arl#;5Gv+Wjd
zYyIbWn)64<f8%`%*jV$T#2ixgOP{>4@W8v+)*0*pbDsLn`hFsZcgZEm`R1CPllHy6
zy(*zNw0L%1RIhi+guTadR`Kk8w8j5gW5*1a&4xGGBIS36e$MS|tMqF23TB#De=acA
zbQ4ce95+k5^U_CYGcAge+jm;H{PeY(eywt{#Ob-qqt)3~-eSxbs&(^o6)#>gC%uD3
z>pE|$75|UhDP5hhi(mYEmi$X#+mEXnY?r4jX3RJ{XVD(F%Fa71YBQM2?2b&_^!fNK
z{!4+rRlQoO{1@g5a4@^iy0^uCH{U+#4}MA~bmpj@=*Zk9xXt;9yR4V_fsNq@*?%rQ
zx`fB?p{<#A(QJJoJMZms?^%qOofd55(EIV$X3v4_;6;5eMVgW)OFHFQ?9vouS$lh*
zIOErA8nUze&;8@ue(K8BSCW(O1i2^`x*fDXXMbY5&Amx$_jLhNs%nXAL`h0wNvc(H
zQ7VvPFfuSQ)-^EEHLwUVG`2D_vNAT%HZZU<Fo^ZpwF5;%ZhlH;S|x4`I)Y3rKn)sj
g8%i>BQ;SOya|>|msb*2W4b;Qn>FVdQ&MBb@0F)tqn*aa+

literal 0
HcmV?d00001