From c8656b19f55b25aebc6fab1a9b87dfc508fafd30 Mon Sep 17 00:00:00 2001
From: MementoMartha <harleyrayquaza@gmail.com>
Date: Wed, 12 Oct 2022 23:25:59 +0100
Subject: [PATCH] If you can't fix 'em, add the gauntlet.

Adding the maps for Silph's Gauntlet, along with Albatross's Galarian Bird sprites. Also fixing Blottle's typing, and temporarily replacing the effects of the recover moves.
---
 data/moves/moves.asm                  |   6 ++--
 data/pokemon/base_stats/articunog.asm |  24 ++++++++++++++
 data/pokemon/base_stats/blottle.asm   |   2 +-
 data/pokemon/base_stats/moltresg.asm  |  23 +++++++++++++
 data/pokemon/base_stats/zapdosg.asm   |  24 ++++++++++++++
 data/pokemon/evos_moves.asm           |  43 +++++++++++++++++++++++-
 data/trainers/parties.asm             |  45 +++++++++++++++++---------
 gfx/pokemon/back/articunogb.png       | Bin 0 -> 558 bytes
 gfx/pokemon/back/moltresgb.png        | Bin 0 -> 557 bytes
 gfx/pokemon/back/zapdosgb.png         | Bin 0 -> 596 bytes
 gfx/pokemon/front/articunog.png       | Bin 0 -> 758 bytes
 gfx/pokemon/front/moltresg.png        | Bin 0 -> 966 bytes
 gfx/pokemon/front/zapdosg.png         | Bin 0 -> 842 bytes
 maps/SilphCo1F.blk                    |   2 +-
 maps/SilphGauntlet1F.blk              | Bin 0 -> 90 bytes
 maps/SilphGauntlet2F.blk              |   1 +
 maps/SilphGauntlet3F.blk              |   1 +
 maps/SilphGauntlet4F.blk              | Bin 0 -> 90 bytes
 maps/SilphGauntlet5F.blk              | Bin 0 -> 90 bytes
 maps/SilphGauntlet6F.blk              |   1 +
 maps/SilphGauntlet7F.blk              |   1 +
 21 files changed, 151 insertions(+), 22 deletions(-)
 create mode 100644 data/pokemon/base_stats/articunog.asm
 create mode 100644 data/pokemon/base_stats/moltresg.asm
 create mode 100644 data/pokemon/base_stats/zapdosg.asm
 create mode 100644 gfx/pokemon/back/articunogb.png
 create mode 100644 gfx/pokemon/back/moltresgb.png
 create mode 100644 gfx/pokemon/back/zapdosgb.png
 create mode 100644 gfx/pokemon/front/articunog.png
 create mode 100644 gfx/pokemon/front/moltresg.png
 create mode 100644 gfx/pokemon/front/zapdosg.png
 create mode 100644 maps/SilphGauntlet1F.blk
 create mode 100644 maps/SilphGauntlet2F.blk
 create mode 100644 maps/SilphGauntlet3F.blk
 create mode 100644 maps/SilphGauntlet4F.blk
 create mode 100644 maps/SilphGauntlet5F.blk
 create mode 100644 maps/SilphGauntlet6F.blk
 create mode 100644 maps/SilphGauntlet7F.blk

diff --git a/data/moves/moves.asm b/data/moves/moves.asm
index 86462bbc..58271065 100644
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -115,7 +115,7 @@ Moves:
 	move MIMIC,        MIMIC_EFFECT,                 0, NORMAL,       100, 10
 	move SCREECH,      DEFENSE_DOWN2_EFFECT,         0, NORMAL,        85, 40
 	move DOUBLE_TEAM,  EVASION_UP1_EFFECT,           0, NORMAL,       100, 15
-	move RECOVER,      HEAL_EFFECT,                  0, NORMAL,       100, 20
+	move RECOVER,      SPLASH_EFFECT,                0, NORMAL,       100, 20	;temporary until we fix it
 	move HARDEN,       DEFENSE_UP1_EFFECT,           0, NORMAL,       100, 30
 	move MINIMIZE,     EVASION_UP1_EFFECT,           0, NORMAL,       100, 20
 	move SMOKESCREEN,  ACCURACY_DOWN1_EFFECT,        0, NORMAL,       100, 20
@@ -145,7 +145,7 @@ Moves:
 	move CONSTRICT,    SPEED_DOWN_SIDE_EFFECT,      10, NORMAL,       100, 35
 	move AMNESIA,      SPECIAL_UP2_EFFECT,           0, PSYCHIC_TYPE, 100, 20
 	move KINESIS,      ACCURACY_DOWN1_EFFECT,        0, PSYCHIC_TYPE,  80, 15
-	move SOFTBOILED,   HEAL_EFFECT,                  0, NORMAL,       100, 10
+	move SOFTBOILED,   SPLASH_EFFECT,                0, NORMAL,       100, 10	;temporary until we fix it
 	move HI_JUMP_KICK, JUMP_KICK_EFFECT,            85, FIGHTING,      90, 20
 	move GLARE,        PARALYZE_EFFECT,              0, NORMAL,        75, 30
 	move DREAM_EATER,  DREAM_EATER_EFFECT,         100, PSYCHIC_TYPE, 100, 15
@@ -166,7 +166,7 @@ Moves:
 	move EXPLOSION,    EXPLODE_EFFECT,             170, NORMAL,       100,  5
 	move FURY_SWIPES,  TWO_TO_FIVE_ATTACKS_EFFECT,  18, NORMAL,        80, 15
 	move BONEMERANG,   ATTACK_TWICE_EFFECT,         50, GROUND,        90, 10
-	move REST,         HEAL_EFFECT,                  0, PSYCHIC_TYPE, 100, 10
+	move REST,         SPLASH_EFFECT,                0, PSYCHIC_TYPE, 100, 10	;temporary until we fix it
 	move ROCK_SLIDE,   NO_ADDITIONAL_EFFECT,        75, ROCK,          90, 10
 	move HYPER_FANG,   FLINCH_SIDE_EFFECT1,         80, NORMAL,        90, 15
 	move SHARPEN,      ATTACK_UP1_EFFECT,            0, NORMAL,       100, 30
diff --git a/data/pokemon/base_stats/articunog.asm b/data/pokemon/base_stats/articunog.asm
new file mode 100644
index 00000000..55de48cd
--- /dev/null
+++ b/data/pokemon/base_stats/articunog.asm
@@ -0,0 +1,24 @@
+	db DEX_ARTICUNO_G ; pokedex id
+
+	db  90,  85,  85,  95, 125
+	;   hp  atk  def  spd  spc
+
+	db PSYCHIC_TYPE, FLYING ; type
+	db 3 ; catch rate
+	db 215 ; base exp
+
+	INCBIN "gfx/pokemon/front/articunog.pic", 0, 1 ; sprite dimensions
+	dw ArticunoGPicFront, ArticunoGPicBack
+
+	db GUST, CONFUSION, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
+	     HYPER_BEAM,   RAGE,         PSYCHIC_M,    TELEPORT,     MIMIC,        \
+	     DOUBLE_TEAM,  REFLECT,      BIDE,         SWIFT,        SKY_ATTACK,   \
+	     REST,         PSYWAVE,      SUBSTITUTE,   FLY
+	; end
+
+	db BANK(ArticunoGPicFront)
+	assert BANK(ArticunoGPicFront) == BANK(ArticunoGPicBack)
diff --git a/data/pokemon/base_stats/blottle.asm b/data/pokemon/base_stats/blottle.asm
index 7e1e79ff..24f86b65 100644
--- a/data/pokemon/base_stats/blottle.asm
+++ b/data/pokemon/base_stats/blottle.asm
@@ -3,7 +3,7 @@
 	db  60,  35,  60,  50,  65
 	;   hp  atk  def  spd  spc
 
-	db WATER, WATER ; type
+	db WATER, FAIRY ; type
 	db 190 ; catch rate
 	db 97 ; base exp
 
diff --git a/data/pokemon/base_stats/moltresg.asm b/data/pokemon/base_stats/moltresg.asm
new file mode 100644
index 00000000..7e4fcb39
--- /dev/null
+++ b/data/pokemon/base_stats/moltresg.asm
@@ -0,0 +1,23 @@
+	db DEX_MOLTRES_G ; pokedex id
+
+	db  90,  85,  90,  90, 125
+	;   hp  atk  def  spd  spc
+
+	db DARK, FLYING ; type
+	db 3 ; catch rate
+	db 217 ; base exp
+
+	INCBIN "gfx/pokemon/front/moltresg.pic", 0, 1 ; sprite dimensions
+	dw MoltresGPicFront, MoltresGPicBack
+
+	db GUST, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
+	     RAGE,         MIMIC,        DOUBLE_TEAM,  BIDE,         SWIFT,        \
+	     SKY_ATTACK,   REST,         SUBSTITUTE,   FLY
+	; end
+
+	db BANK(MoltresGPicFront)
+	assert BANK(MoltresGPicFront) == BANK(MoltresGPicBack)
diff --git a/data/pokemon/base_stats/zapdosg.asm b/data/pokemon/base_stats/zapdosg.asm
new file mode 100644
index 00000000..3dec79a5
--- /dev/null
+++ b/data/pokemon/base_stats/zapdosg.asm
@@ -0,0 +1,24 @@
+	db DEX_ZAPDOS_G ; pokedex id
+
+	db  90, 125,  90, 100,  75
+	;   hp  atk  def  spd  spc
+
+	db FIGHTING, FLYING ; type
+	db 3 ; catch rate
+	db 216 ; base exp
+
+	INCBIN "gfx/pokemon/front/zapdosg.pic", 0, 1 ; sprite dimensions
+	dw ZapdosGPicFront, ZapdosGPicBack
+
+	db PECK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_SLOW ; growth rate
+
+	; tm/hm learnset
+	tmhm WHIRLWIND,    MEGA_KICK,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
+	     HYPER_BEAM,   COUNTER,      RAGE,         MIMIC,        DOUBLE_TEAM,  \
+	     BIDE,         SWIFT,        SKY_ATTACK,   REST,         SUBSTITUTE,   \
+		 FLY
+	; end
+
+	db BANK(ZapdosGPicFront)
+	assert BANK(ZapdosGPicFront) == BANK(ZapdosGPicBack)
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index 6b88818c..2943b97a 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -2822,4 +2822,45 @@ PorygonZEvosMoves:
 	db 0
 ; Learnset
 	db 50, AMNESIA	; will replace with nasty plot
-	db 0
\ No newline at end of file
+	db 0
+
+;ArticunoGEvosMoves:
+; Evolutions
+;	db 0
+; Learnset
+;	db 40, REFLECT
+;	db 45, HYPNOSIS
+;	db 51, PSYBEAM
+;	db 55, AGILITY
+;	db 60, LIGHT_SCREEN
+;	db 65, RECOVER
+;	db 70, DREAM_EATER
+;	db 0
+
+;ZapdosGEvosMoves:
+; Evolutions
+;	db 0
+; Learnset
+;	db 40, DOUBLE_KICK
+;	db 45, LIGHT_SCREEN
+;	db 51, LOW_KICK
+;	db 55, AGILITY
+;	db 58, JUMP_KICK
+;	db 62, DRILL_PECK
+;	db 66, ROLLING_KICK
+;	db 70, HI_JUMP_KICK
+;	db 0
+
+;MoltresGEvosMoves:
+; Evolutions
+;	db 0
+; Learnset
+;	db 40, BITE		; Fake Tears
+;	db 45, WING_ATTACK
+;	db 51, BRUTAL_SWING
+;	db 55, AGILITY
+;	db 58, FEINT_ATTACK
+;	db 62, AMNESIA		; Nasty Plot
+;	db 66, NIGHT_SLASH	; False Surrender
+;	db 70, SKY_ATTACK
+;	db 0
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 0ba67cad..0ab475cf 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -500,7 +500,7 @@ Green1Data:
 ProfOakData:
 ; Unused
 	db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 69, NIDOKING, 70, TOTARTLE, 0
-	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 60, NIDOKING, 70, VENUSAUR, 0
+	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 69, NIDOKING, 70, VENUSAUR, 0
 	db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0
 
 ChiefData:
@@ -640,16 +640,18 @@ CooltrainerFData:
 
 BrunoData:
 	db $FF, 54, PRIMEAPE, 55, STEELIX, 55, POLIWRATH, 56, HITMONTOP, 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
 
 BrockData:
 	db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, KLEAVOR, 67, NIDOREIGN, 70, GYAOON, 0
+	; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, NIDOREIGN, 67, KLEAVOR, 70, GYAOON, 0
 
 MistyData:
 	db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, JAGG, 67, BLASTOISE, 70, GYARADOS, 0
+	; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0
 
 LtSurgeData:
 	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
@@ -659,22 +661,22 @@ LtSurgeData:
 ErikaData:
 	db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, VICTREEBEL, 66, DEER, 67, LEAFEON, 70, TANGROWTH, 0
+	; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, EXEGGUTOR, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0
 
 KogaData:
 	db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, TSUBOMITTO, 70, CROBAT, 0
+	; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, VICTREEBEL, 70, CROBAT, 0
 
 BlaineData:
 	db $FF, 45, RAPIDASH, 44, NINETALES, 45, ARCANINE, 44, FLAREON, 47, MAGMORTAR, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, FLAREON, 67, MAGMORTAR, 70, MOLTRES,  0
+	; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES,  0
 
 SabrinaData:
-	db $FF, 39, JYNX, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0
+	db $FF, 39, ESPEON, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, JYNX, 67, HYPNO, 67, MR_MIME, 66, SLOWKING, 67, EXEGGUTOR, 70, ALAKAZAM, 0
+	; db $FF, 66, ESPEON, 67, MR_MIME, 67, HYPNO, 66, SLOWKING, 67, ALAKAZAM, 70, ARTICUNO_G, 0
 
 GentlemanData:
 ; SS Anne 1F Rooms
@@ -701,17 +703,23 @@ Green2Data:
 	db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
 	db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
 ; Route 22
-	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
-	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
-	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
+	db $FF, 47, MADAAMU, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
+	db $FF, 47, MADAAMU, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
+	db $FF, 47, MADAAMU, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
 
 Green3Data:
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
-	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
+	db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
+	db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
+	db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
+; post-game rematch teams (currently unused)
+	; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, GOROCHU, 81, ARCANINE, 83, SNORLAX, 85, TOTARTLE, 0
+	; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, GYARADOS, 83, MAGMORTAR, 85, VENUSAUR, 0
+	; db $FF, 81, SCIZOR, 79, GOROCHU, 81, RHYPERIOR, 81, EXEGGUTOR, 83, CRYITHAN, 85, CHARIZARD, 0
 
 LoreleiData:
-	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 55, JYNX, 55, BUU, 56, LAPRAS, 0
+	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, JYNX, 55, BUU, 56, LAPRAS, 0
+; post-game rematch team (currently unused)
+	; db $FF, 74, BUU, 73, DEWGONG, 74, GLACEON, 75, CLOYSTER, 75, LAPRAS, 76, ARTICUNO, 0
 
 ChannelerData:
 ; Unused
@@ -723,7 +731,7 @@ ChannelerData:
 	db 23, MIKON, GASTLY, 0
 	db 24, VULPIX, 0
 ; Unused - this will be used in the Silph Gauntlet
-	db 65, MAROWAK, NINETALES, GUARDIA, BARUNDA, MUK, GENGAR, 0
+	db 65, GUARDIA, NINETALES, BARUNDA, HYPNO, MUK, GENGAR, 0
 ; Pokémon Tower 3F
 	db 25, GASTLY, HAUNTER, 0
 ; Pokémon Tower 4F, now unused 
@@ -754,6 +762,11 @@ ChannelerData:
 
 AgathaData:
 	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
+; post-game rematch team (currently unused)
+	; db $FF, 77, CROAKOZUNA, 76, TSUBOMITTO, 76, UMBREON, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
 
 LanceData:
 	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0
+; post-game rematch team (currently unused)
+	; db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, CHARIZARD, 79, CRYITHAN, 82, DRAGONITE, 0
+
diff --git a/gfx/pokemon/back/articunogb.png b/gfx/pokemon/back/articunogb.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d47552106af79d05b0e6c7f82c047cb52924793
GIT binary patch
literal 558
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk@BpAX3RW*PVOS+@4BLl<6e(pbstRTr`k04(L
zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVYP7-hXC4kjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*`IN-38*P$c9nbr3Nhvv`Gqi^UsOH|$WbkEjVMV;
zEJ?LWE=mPb3`Pb<M!JRux&~$;hGtgA7FI?U+6D$z1_qb(*Gxgtkei>9nO2EKgE>S)
zs8z~ApoXZ_2+uTMUj{88n}dOsQHX&V$YKOS21Y3cke7ih1}{cwI6H_@1FD7z=tp6M
zdZ0QG@Bm_v9xyE*^xXu=UgzoJ7-DgH?_@`@!wMWO>DPseJoP*ok7_;e4oejj{+TEs
z@F`)2_YGEt=8gm3UNDw2q=cwBHMKdZKGNpkzrx7mZgYtBL8fPl+Df54f}fHFQWLI~
zwmLACwEs;NVx7QrC3&9ECC2DUE$j;>PB{NCpCO0o(h~zlt-Dza7i1Sy@0MLKogvG7
z?Ujey4{9&JkZ9Qu<M})N=j9hkKaQWsKcJNGQuZHP#O%3ld$UjeW2j-AvHx@HW5wUV
Q2xegLboFyt=akR{0EOF`3jhEB

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5b9c17d04ff0a2e0282d9ed16fc21ec3cb63d0b
GIT binary patch
literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s5<Z%{w
zL>4nJ@ErkR#;MwT(m+A>5>H=O_Gesd0vb~HxgS0P3Nhvv`Gqi^UsOH|$WbkEjVMV;
zEJ?LWE=mPb3`Pb<M!JRux&~$;hGteK23AJK+6D$z1_rN=td&I3kei>9nO2FZ!N3Hf
zK}K3945%S0HNrE^*Ox&H$mU>RWfWpy2C^7|kbzN(0pw*Mi@}Rg8qN-4)PSl11{9Mp
zLOoC&2zUT7NDr8n5BhEbWUuvfaSV~TTzlS->yUv2>x1dn9w}W@?e3oZJi~$gI7g+Z
zI{$;pSFaQ*c-KEry~F%SA)<bANTEQ@<?S{V{7U84f`T0vo^Y-;`>FFNjlm_xE@MM;
ze}Y?#a*jh*<kJ9Fo3mGXPd8l4kozvUcv&7FBmV}u9OfD~^DB($uFH1_M!2s2;+4?F
z5UgUcW)Fj}ugG$SNgt*vJl-^YnOKZ+W6Xm4iG7=ze>eVpRJ-%E{2qq3uM;!O!q2+^
P9nRqC>gTe~DWM4fEfAJU

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/back/zapdosgb.png b/gfx/pokemon/back/zapdosgb.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a3b75893d19f5565d990a4aabfa0e7cdba2de31
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s5<Z%{w
zL>4nJ@ErkR#;MwT(m+A>5>H=O_Gesd0vduIH!ZS&LX7!Eej$wK7nRQfa#TxPBT7;d
zOH!?pi&B9UgOP!ek*=YEu7O#Ip_!G5ft8`Lwt<0_fkBG*Dv)Ck8glbfGSezCH5iye
zH0;Vze+1MJl^Wrh=IhI#1!QwDurdlUFauePK*+!-#Q^d$kj3D|C=F)^F={~700W9i
z7@;1h4g@@a7^DYG%Ljco0kW@nx;TbNT&_KD$j2Bc!1iGIqz<n|g)QQ9-CQ=gxQZO|
zTYPic-WG0;unz7G(uUO>Q(Z*1Eh=Evn(`^-5C7Jc`_BBCd2)qIfSb$IGahr=l~-j5
zO_picyxHU+-{M+>3f9yIg0ElwVA>O*uV$D~^Xw&;fc?I@z#BHZy}KtD)U&M+-u#|X
z^z5Fz<l@GehtGIinHZgsxJ5Q8kmHVL@fGGx?`Eywd+~0L$I^+J*E;Wr7|perSbq4c
zj8Wg-t@DGObxO{fF-$Fgn|&(dRc*n3w|JQ!>_4x{?_t~+vNdYuS%X-h{}?=7{an^L
HB{Ts5x<Rej

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/front/articunog.png b/gfx/pokemon/front/articunog.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed628377208bdaafc1d8fbfbfc4949f80ccac400
GIT binary patch
literal 758
zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s
zJR*x382FBWFymBhK53vJdx@v7EBiApHUSmG`%K~MfI^J<MSdZS=NFaF0<!OTx;Tbt
zocFzaKKpWk2*U^Q%aYIdS0!}uBz7!+s&aVo58sQy`oh!J^Q^Bj{C`B?Wo7Hc(|S?Y
zr+th4BOb-Vo_t|m*~dqf%X5SUD{p_^n?GyW&KCYk`^otV>1v0cvQD?Vd{5})^1rH|
z1QKdHe@N|T;f`Be5izM{add`7`>qL(xBuF4u4LPK8-KygFF5-bE<3oo<3_&iljJv2
z56vI0xO(I4;kmk;X7a6phXbqw&pD<3Hn!d7)D?8xmMP$qWD@`F_b<vWXS~xtKG(kB
z{?m0!4z0V}V>;udh-~!C$KUItyl$+&-g^0UTS3O+i5F+;e-7zr*c<!ws_e@vlRT?;
z>3?qh;BZ6p$LIX6_^Em`mX`~%dxdu$4}KXku~+4^+{ZcRQzzsdebBmOU1H3XNyp8<
zvNE2Roa5rOUPV6lRKUNcKN?5R30WTU3;3vYsABJ<e9auKb6s|-@rn8?JoxWa6+eq>
zn!iJ3?Tu$`kry_5`o4Q0{yKeIB=e;3mG?W$>{8BW{X4Skm*dYQ1F3WG9DlHF&VAV5
zd@xa_n&F0jOZLhjzq7q(q#hV-eSiGkwlCao#U@NW?fvA)$0aF?*e9%9@_yRW4GDA1
z|8`B<q0s(Kb$)f@>8Wm$k9_ca;MI6er||Le&-Ksk8)k4bM5IQ#03%(s#5JNMC9x#c
zD!C{XNHG{07#Zmr8t59Bg&3My83U22wt<0_fkEQzzm+H&a`RI%(<*Um5IE*~6sUp0
M)78&qol`;+0KR%a)&Kwi

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/front/moltresg.png b/gfx/pokemon/front/moltresg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c453f96e57d058c4381f8d4642e4c617a7ae8cb
GIT binary patch
literal 966
zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s
zJR*x382FBWFymBhK53vJdx@v7EBiApHUU|KWsR?zfI^J<MSdZS=NFaF0&-MKTq8<S
z5=&C8l8aJ-6oZk0k&&*Ufv$mBh@qL4k)@T1g|>l#6%g?VzD3cHo1c=IR*9*>&=jH}
zDec%-poXZ_2+uTMUj{88n}dOsQHX&V$YKOS21Y3cke7ih1}{cwI6H_@1F8lXP)x!I
z^+0tX-~q%SJz!cs=(`C}m7AxFV~ECi*GrDsR~$sxKh!T<V$%3XPKv);>ymCsf0OxA
z<t-YnFK(rkmFnvra=Rn<?bXsHZ(To#Y_&|O-k^|q_I9&;;&z33B1IpaZ(MHL$nGhV
zzA5|c(~qam%>J$}>G3ti{M(ZyPSY>Sek%2SpDC76r!ggX@ls2(mv^VuWxvbl%e%D9
z<d5N;g=!sPpM__xtJt^frmtMhOVI@$>&2#K?GfM&cAFP+=I0ves^1%4x)?Lx7g{S4
zTD8v7Y^G|BL~YgjnPw3>MIq;3>{(vH=)L7wkCK;1A+PDf{v4~<mmD?*2|InVat(}b
zUt_UODe#V<Rj6vtzMzR3In#X(_g=2tqM38->76L)1CmFTG=n48$tJj(nu~7UJ#B^Q
z2A?TgM1mvEGOVbMwF-YyFz*xBtHAy1tGLSq$~LrAUH-gFXy;caoimzTf?q{_AF_4t
z-r)T3Z`j_p8;`mf-&ow6_)DYxVZcPE_+plBS=NNCp0qaAvLmM5^Y}Wq&tg*zIzHk2
zwKV?cd>8yqovr*)^e^G3qKwwh%THH#Ph_9mHtT+jUjO3KGcnWF-2MLF<etHq7ytVo
z?b!CK`94$6q@Uk{#NIL8`QUBGC14^Ge79xNcFV`24-eg(d8RdSUGbmfHixwjujo|Q
zFD?7AgYoy`U?bPPhj&J*2Il?a;=2BzM03uUrlfG=d1p*_ePnvQ#nZ=0%D>P4c47L5
zy-QMV=jExN^)EVgR%iWW3BRAeVzl1<4$f0CTCW!5S7{kgUiM-BtK!Xjv*T7aito)9
eJ2bsA`_%q}<@;VbKD%23N@kv}elF{r5}E+>Q*Q78

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/front/zapdosg.png b/gfx/pokemon/front/zapdosg.png
new file mode 100644
index 0000000000000000000000000000000000000000..821e17b194c11a97c436211374b09b04ca0e7614
GIT binary patch
literal 842
zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s
zJR*x382FBWFymBhK53vJdx@v7EBiApHUU|wS}Wxcpb%qzkzWYo`9<ZkfF>Atx;Tbt
zoUgs?=r8Oj!u}zA`_fxe#GDP=xVz*|%;SjJB3O1i>(E-)web!a8{!uot(fSN;pE#T
zetX@)m;aS3vVv?qcy69JJDGF(GWN~7rZRWVS{QSO=)Fsv9RKZX{rx>RRqI|Z`oFn;
zrl04X*vC!AbF9^u7Vk=Y=eECh5mU{EiuxmEFF&7uEI7BI{qDo%&r32>uRe1B^F2~}
z$=T~3kGCajY%6`Smgl_8uRnYW;@=LPob>2{>WzvTiMPM9+5HoFo4=);UOwA@bK;er
z$mca%6Ynp1;y(Yci?T^!f0cE5P08&gyu9ys=6bXRwcYGJ_<_eWeZxMH1kWjbyRyRm
z&RV`v?(;O=qw?8@4cV><CQf4CeOTf`RNJx@_8XTou09^J@%rjpo)2Vat-A4dv%l+%
z1Je{Mf2|IEzft=@jJ00HCr+NP91(u^CrZCL=oIO$%yjeWLJ!u!B|U91tC@Y>miRwS
zH+gi=ZbR&Hht)O@qms_`vzlu!TIQp4vsYvzuaxlTkU)0VoU2Ep5`x|KUf8I*NNI)r
z^gY@d+Jb?${;xc|LyJ~DFMQM4c9H9;=UWceN&c@d`+Rh6Dp89GyIo$M-x={y?#I!a
z38uYgmA<X&^4^@OwdStIn)E9#?pzPo4DsG;dbRt<hr|hU(m7{+dKu%NdgsE{sp}(M
ztIHHmtBcLz{--(P)}n*^Z8G+Ca+fVKdEdeK?#$7rh3a9xzQ>}s+0?$T*lnb~e}B(^
z+ww;rFY-IStNA^@{-J*MUH;#b=ko)TEQ4x^YeY#(Vo9o1a#1RfVlXl=GSW3P&^0g%
zF*LI>va~WZ(>5@$GB8lOoN@(4LvDUbW?Cf{4W<wcNomKv0yQvry85}Sb4q9e03HEh
Ac>n+a

literal 0
HcmV?d00001

diff --git a/maps/SilphCo1F.blk b/maps/SilphCo1F.blk
index fca3d471..b1683c58 100644
--- a/maps/SilphCo1F.blk
+++ b/maps/SilphCo1F.blk
@@ -1 +1 @@
-<===========}>~""#	FD[[FD
 [[[[[[9	FD[[FD
	FDFDFHIIIX,WIIIIIIIJ
\ No newline at end of file
+<===<=}=>===}>~""#HXWJ	FDFD
[[	FD [[[[[[[9FD
[[	FDFDFHIIIX,WIIIIIIIJ
\ No newline at end of file
diff --git a/maps/SilphGauntlet1F.blk b/maps/SilphGauntlet1F.blk
new file mode 100644
index 0000000000000000000000000000000000000000..47be4d2065d0a3e33de504b87a4b3cb46a338534
GIT binary patch
literal 90
zcmZQ#0)tc_$zTcw9!yNu3_xIN$^c?9F|jc+ngdzZ4C!zd1C#|+24OK+f&ox98~^}P
C4hHf7

literal 0
HcmV?d00001

diff --git a/maps/SilphGauntlet2F.blk b/maps/SilphGauntlet2F.blk
new file mode 100644
index 00000000..49d2e29f
--- /dev/null
+++ b/maps/SilphGauntlet2F.blk
@@ -0,0 +1 @@
+..............@AB...
(


-
....








..





|

-


















\ No newline at end of file
diff --git a/maps/SilphGauntlet3F.blk b/maps/SilphGauntlet3F.blk
new file mode 100644
index 00000000..c7e2c4ee
--- /dev/null
+++ b/maps/SilphGauntlet3F.blk
@@ -0,0 +1 @@
+





7878787<;9;9;9;9
\ No newline at end of file
diff --git a/maps/SilphGauntlet4F.blk b/maps/SilphGauntlet4F.blk
new file mode 100644
index 0000000000000000000000000000000000000000..331b6f32098d7da052837e8ecaaabb17b5cda257
GIT binary patch
literal 90
zcmZSNVgmzqMlN4rA0QC-V;AHL<dc=<3*b|*<O@__V6a4I@x{hKW%&XFKrES5J`jsf
QSdP&^RyH(AR#uJ?03?wOBme*a

literal 0
HcmV?d00001

diff --git a/maps/SilphGauntlet5F.blk b/maps/SilphGauntlet5F.blk
new file mode 100644
index 0000000000000000000000000000000000000000..2ec734e8cd4d17518616a9943af82f7a5583d2e7
GIT binary patch
literal 90
zcmY#aR~J`PQxjKL(@JO1)M3zJ&@<NpkqmVV4CXerAYd00WbWYTZ13pk6cr6*Ik~vI
hx&c`(?rw~XjO;*GeQF&eD=Vvkk-0hu01Z@A0|56{5pDng

literal 0
HcmV?d00001

diff --git a/maps/SilphGauntlet6F.blk b/maps/SilphGauntlet6F.blk
new file mode 100644
index 00000000..b383d9cc
--- /dev/null
+++ b/maps/SilphGauntlet6F.blk
@@ -0,0 +1 @@
+@AAB@aaB@aaBD!qpqpFDSRSRFHIIJHIIJHwEJ@aaB@aaB@*+BDqp/F\]DSRF\]PwEJHIIJHwEJ@*+B@aaB@*+B\qpqp]\SRSR]HIIJHIIJHIIJ
\ No newline at end of file
diff --git a/maps/SilphGauntlet7F.blk b/maps/SilphGauntlet7F.blk
new file mode 100644
index 00000000..95c142f6
--- /dev/null
+++ b/maps/SilphGauntlet7F.blk
@@ -0,0 +1 @@
+35$8*$*$9*&&&&.
\ No newline at end of file