Bug Fixes and stuff!

(kinda just clearing my commits list while I'm working on 1.3 still.)

- Lance's Room is no longer listed as a dungeon map

- Changed the layout of Cinnabar Volcano YET AGAIN, making it a little more visually appealing. If you get softlocked here, I will just sigh disapprovingly.

- Various moveset fixes:
     - Arcanine-H gets EQ and Fissure now
     - Raichu-A loses Counter
     - Raticate-A gets TBolt and Thunder
     - Swapped Bullet Punch and Iron Head around in Scizor's learnset
     - Umbreon gets Psychic
     - WigWug both now get Ice Beam and Blizzard
     - Seel and Dewgong get Water Gun by level up
     - Swapped inconsistent moveset levels for Omanyte and Omastar
     - Eevee gets Quick Attack earlier

- Fixed a typo in Slowbro-G's dex entry

- Changed the Tauros Combat Breed trader's text to remove a moveset inaccuracy

- Changed Misty's AI to now use X Specials instead of Potions

- Gave Chief's teams a slightly updated moveset

- Fixed an issue where Steel just...didn't resist Rock? How did I miss this?????

- Made Sandshrew more common in Mt Moon B2F

- Changed the Marowaks on Silph Gauntlet 4F to Guardias

- Fixed issues where receiving a Gym badge wouldn't play the correct sound in most situations

- Increased the level of the Salesman's Cubone gift from 17 to 23

- Decreased the levels of the Fossil gifts from 44 to 35

- More text fixes

-

data/maps/dungeon_maps.asm

@@ -28,8 +28,8 @@ DungeonMaps1:
 DungeonMaps2:
 	; all MT_MOON maps
 	db MT_MOON_1F, MT_MOON_B2F
-	; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
+	; all SS_ANNE and SILPH_GAUNTLET maps
-	db SS_ANNE_1F, HALL_OF_FAME
+	db SS_ANNE_1F, SILPH_GAUNTLET_7F
 	; all POKEMON_TOWER maps and Lavender Town buildings
 	db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
 	; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and

data/maps/objects/CinnabarVolcano.asm

@@ -3,17 +3,17 @@ CinnabarVolcano_Object:
 
 	def_warp_events 
 	warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
-	warp_event 16,  5, CINNABAR_VOLCANO_FLOORS, 10
+	warp_event 16,  3, CINNABAR_VOLCANO_FLOORS, 10
 
 	def_bg_events
 
 	def_object_events
-	object_event 15,  5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
+	object_event 14,  5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
-	object_event 13, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object_event 13, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-	object_event 14, 13, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+	object_event 14, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
-	object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
+	object_event 14, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
-	object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
+	object_event 15, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
-	object_event 14, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
+	object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
-	object_event 15, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+	object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
 
 	def_warps_to CINNABAR_VOLCANO

data/pokemon/base_stats/arcanineh.asm

@@ -15,9 +15,10 @@
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
-	     RAGE,         DRAGON_RAGE,  DIG,          MIMIC,        DOUBLE_TEAM,  \
+	     RAGE,         DRAGON_RAGE,  EARTHQUAKE,   FISSURE,      DIG,          \
-	     REFLECT,      BIDE,         FIRE_BLAST,   SWIFT,        SKULL_BASH,   \
+	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
-	     REST,         ROCK_SLIDE,   SUBSTITUTE
+	     FIRE_BLAST,   SWIFT,        SKULL_BASH,   REST,         ROCK_SLIDE,   \
+	     SUBSTITUTE
 	; end
 
 	db BANK(ArcanineHPicFront)

data/pokemon/base_stats/raichua.asm

@@ -15,11 +15,11 @@
 
 	; tm/hm learnset
 	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
-	     DOUBLE_EDGE,  HYPER_BEAM,   PAY_DAY,      SUBMISSION,   COUNTER,      \
+	     DOUBLE_EDGE,  HYPER_BEAM,   PAY_DAY,      SUBMISSION,   SEISMIC_TOSS, \
-	     SEISMIC_TOSS, RAGE,         THUNDERBOLT,  THUNDER,      PSYCHIC_M,    \
+	     RAGE,         THUNDERBOLT,  THUNDER,      PSYCHIC_M,    TELEPORT,     \
-	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
+	     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         SWIFT,        \
-	     SWIFT,        SKULL_BASH,   REST,         THUNDER_WAVE, PSYWAVE,	   \
+	     SKULL_BASH,   REST,         THUNDER_WAVE, PSYWAVE,	     SUBSTITUTE,   \
-		 SUBSTITUTE,   FLY,          SURF,         FLASH 	   
+	     FLY,          SURF,         FLASH 	   
 	; end
 
 	db BANK(RaichuAPicFront)

data/pokemon/base_stats/raticatea.asm

@@ -16,8 +16,8 @@
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
 	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   RAGE,         \
-	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         SWIFT,        \
+	     THUNDERBOLT,  THUNDER,      DIG,          MIMIC,        DOUBLE_TEAM,  \
-	     SKULL_BASH,   REST,         SUBSTITUTE
+	     BIDE,         SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
 	db BANK(RaticateAPicFront)

data/pokemon/base_stats/scizor.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions
 	dw ScizorPicFront, ScizorPicBack
 
-	db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset
+	db QUICK_ATTACK, BULLET_PUNCH, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset

data/pokemon/base_stats/umbreon.asm

@@ -15,8 +15,8 @@
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
-	     RAGE,         MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
+	     RAGE,         PSYCHIC_M,    MIMIC,        DOUBLE_TEAM,  REFLECT,      \
-	     SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
+	     BIDE,         SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE
 	; end
 
 	db BANK(UmbreonPicFront)

data/pokemon/base_stats/wiglett.asm

@@ -15,9 +15,9 @@
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
-	     WATER_GUN,    RAGE,         EARTHQUAKE,   FISSURE,      DIG,          \
+	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     RAGE,         EARTHQUAKE,   \
-	     MIMIC,        DOUBLE_TEAM,  BIDE,         REST,         SUBSTITUTE,   \
+	     FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         \
-	     CUT,          SURF
+	     REST,         SUBSTITUTE,   CUT,          SURF
 	; end
 
 	db BANK(WiglettPicFront)

data/pokemon/base_stats/wugtrio.asm

@@ -15,9 +15,9 @@
 
 	; tm/hm learnset
 	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  BUBBLEBEAM,   \
-	     WATER_GUN,    HYPER_BEAM,   RAGE,	       EARTHQUAKE,   FISSURE,      \
+	     WATER_GUN,    ICE_BEAM,     BLIZZARD,     HYPER_BEAM,   RAGE,	   \
-	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         REST,         \
+	     EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  \
-	     SUBSTITUTE,   CUT,          SURF
+	     BIDE,         REST,         SUBSTITUTE,   CUT,          SURF
 	; end
 
 	db BANK(WugtrioPicFront)

data/pokemon/evos_moves.asm

@@ -1018,6 +1018,7 @@ SeelEvosMoves:
 	db EV_LEVEL, 34, DEWGONG
 	db 0
 ; Learnset
+	db 10, WATER_GUN
 	db 15, POWDER_SNOW
 	db 20, GROWL
 	db 25, AURORA_BEAM
@@ -1516,8 +1517,8 @@ OmanyteEvosMoves:
 	db 21, ROCK_THROW
 	db 34, HORN_ATTACK
 	db 39, LEER
-	db 46, SPIKE_CANNON
+	db 44, SPIKE_CANNON
-	db 53, HYDRO_PUMP
+	db 49, HYDRO_PUMP
 	db 0
 
 OmastarEvosMoves:
@@ -1527,8 +1528,8 @@ OmastarEvosMoves:
 	db 21, ROCK_THROW
 	db 34, HORN_ATTACK
 	db 39, LEER
-	db 44, SPIKE_CANNON
+	db 46, SPIKE_CANNON
-	db 49, HYDRO_PUMP
+	db 53, HYDRO_PUMP
 	db 0
 
 JigglypuffEvosMoves:
@@ -1566,7 +1567,7 @@ EeveeEvosMoves:
 ; Learnset
 	db 8, SAND_ATTACK
 	db 16, GROWL
-	db 27, QUICK_ATTACK
+	db 23, QUICK_ATTACK
 	db 30, BITE
 	db 36, FOCUS_ENERGY
 	db 42, TAKE_DOWN
@@ -1794,6 +1795,7 @@ DewgongEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	DB 10, WATER_GUN
 	db 15, POWDER_SNOW
 	db 20, GROWL
 	db 25, AURORA_BEAM
@@ -2734,7 +2736,7 @@ ScizorEvosMoves:
 	db 29, SLASH
 	db 35, SWORDS_DANCE
 	db 42, AGILITY
-	db 50, BULLET_PUNCH
+	db 50, IRON_HEAD
 	db 0
 
 RhyperiorEvosMoves:

data/pokemon/new_dex_text.asm

@@ -899,7 +899,7 @@ _RapidashGDexEntry::
 	dex
 
 _SlowbroGDexEntry::
-	text "The DISTUBAN that"
+	text "The DISTURBAN that"
 	next "bit SLOWBRO has"
 	next "made it poisonous."
 	
@@ -915,7 +915,7 @@ _SlowkingGDexEntry::
 	
 	page "Mumbling eerie"
 	next "spells, it makes"
-	next "strange POTIONs"
+	next "strange potions"
 	dex
 
 _MukADexEntry::

data/text/text_7.asm

@@ -216,8 +216,8 @@ _AfterTrade6Text::
 	text "Isn't the Combat"
 	line "Breed amazing?"
 	
-	para "HI JUMP KICK is"
+	para "JUMP KICK is so"
-	line "so worth it!"
+	line "worth it!"
 	done
 
 _WannaTrade7Text::

data/trainers/ai_pointers.asm

@@ -37,7 +37,7 @@ TrainerAIPointers:
 	dbw 1, CooltrainerFAI ; cooltrainerf
 	dbw 1, BrunoAI ; bruno
 	dbw 5, BrockAI ; brock
-	dbw 2, MistyAI ; misty
+	dbw 1, MistyAI ; misty
 	dbw 1, LtSurgeAI ; surge
 	dbw 1, ErikaAI ; erika
 	dbw 2, KogaAI ; koga

data/trainers/special_moves.asm

@@ -163,8 +163,9 @@ SpecialTrainerMoves:
 	
 	db BROCK, 7		; Brock 6 badges
 	db 1, 1, SELFDESTRUCT
-	db 2, 2, SURF
+	db 2, 1, SPIKE_CANNON
-	db 2, 3, ICE_BEAM
+	db 2, 3, SURF
+	db 2, 4, ICE_BEAM
 	db 3, 1, SURF
 	db 3, 2, ROCK_THROW
 	db 3, 3, SWORDS_DANCE
@@ -357,7 +358,7 @@ SpecialTrainerMoves:
 	db 3, 3, EMBER
 	db 4, 1, CUT
 	db 4, 4, DIG
-	db 5, 4, BODY_SLAM
+	db 5, 3, BODY_SLAM
 	db 0
 
 	db RIVAL2, 10		; Pokemon Tower Rival w/Raichu
@@ -1370,12 +1371,10 @@ SpecialTrainerMoves:
 	db 2, 1, BLIZZARD
 	db 2, 2, THUNDERBOLT
 	db 2, 3, SING
-	db 2, 4, HYPER_BEAM
+	db 2, 4, SURF
-	db 3, 1, IRON_HEAD
+	db 3, 3, BULLET_PUNCH
-	db 3, 3, HYPER_BEAM
+	db 4, 1, FIRE_PUNCH
-	db 4, 1, EXPLOSION
 	db 4, 2, THUNDERBOLT
-	db 4, 4, ICE_PUNCH
 	db 5, 1, THUNDERBOLT
 	db 5, 2, ICE_BEAM
 	db 5, 3, RECOVER
@@ -1391,12 +1390,10 @@ SpecialTrainerMoves:
 	db 2, 1, BLIZZARD
 	db 2, 2, THUNDERBOLT
 	db 2, 3, SING
-	db 2, 4, HYPER_BEAM
+	db 2, 4, SURF
-	db 3, 1, IRON_HEAD
+	db 3, 3, BULLET_PUNCH
-	db 3, 3, HYPER_BEAM
+	db 4, 1, FIRE_PUNCH
-	db 4, 1, EXPLOSION
 	db 4, 2, THUNDERBOLT
-	db 4, 4, ICE_PUNCH
 	db 5, 1, THUNDERBOLT
 	db 5, 2, ICE_BEAM
 	db 5, 3, RECOVER

data/types/type_matchups.asm

@@ -110,4 +110,5 @@ TypeEffects:
 	db POISON,       FAIRY,        SUPER_EFFECTIVE
 	db STEEL,        FAIRY,        SUPER_EFFECTIVE
 	db DRAGON,       FAIRY,        NO_EFFECT
+	db ROCK,         STEEL,        NOT_VERY_EFFECTIVE
 	db -1 ; end

data/wild/maps/MtMoonB2F.asm

@@ -4,11 +4,11 @@ MtMoonB2FWildMons:
 	db  9, GEODUDE
 	db 10, BITTYBAT
 	db 10, GEODUDE
-	db 11, ZUBAT
-	db 10, PARAS
 	db 10, SANDSHREW
-	db 10, CLEFAIRY
+	db 10, PARAS
 	db 11, SANDSHREW
+	db 10, CLEFAIRY
+	db 12, SANDSHREW
 	db 12, ZUBAT
 	end_grass_wildmons
 

data/wild/maps/SilphGauntlet4F.asm

@@ -1,7 +1,7 @@
 Gauntlet4FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 48, HAUNTER
-	db 48, MAROWAK
+	db 48, GUARDIA
 	db 49, NINETALES
 	db 49, BALUMBA
 	db 49, HAUNTER

engine/battle/trainer_ai.asm

@@ -763,10 +763,7 @@ BrockAI:
 MistyAI:
 	cp 25 percent + 1
 	ret nc
-	ld a, 5
+	jp AIUseXSpecial
-	call AICheckIfHPBelowFraction
-	ret nc
-	jp AIUsePotion ; Replicates Starmie using Recover. Unlike other trainers that heal, Misty will do this 26% of the time instead of 51%.
 
 LtSurgeAI:
 	cp 20 percent + 1

maps/CinnabarVolcano.blk

@@ -1 +1 @@
-..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv	vvvvR}vvvv


	vvv}N}vvv
>
vv}}}}Q}}}}}}QN
+..............}vvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvvvv3vvvvvvvvv45vvvvvvvv+67,vNvv8-%88vR}vvvv


	vvv}N}vvv
>
vv}}}}Q}}}}}}QN

scripts/CeladonGym.asm

@@ -184,6 +184,8 @@ ErikaPreBattleText:
 
 ReceivedRainbowBadgeText:
 	text_far _ReceivedRainbowBadgeText
+	sound_get_key_item
+	text_promptbutton
 	text_end
 
 ErikaPostBattleAdviceText:

scripts/CeladonUniversityPokecenter.asm

@@ -42,7 +42,7 @@ CuboneSalesmanText:
 	ld hl, .NoMoneyText
 	jr .printText
 .enoughMoney
-	lb bc, CUBONE, 17
+	lb bc, CUBONE, 23
 	call GivePokemon
 	jr nc, .done
 	xor a

scripts/CeruleanGym.asm

@@ -191,7 +191,7 @@ TM11NoRoomText:
 
 ReceivedCascadeBadgeText:
 	text_far _ReceivedCascadeBadgeText
-	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	sound_get_key_item
 	text_promptbutton
 	text_end
 

scripts/CinnabarGym.asm

@@ -291,8 +291,8 @@ BlainePreBattleText:
 
 ReceivedVolcanoBadgeText:
 	text_far _ReceivedVolcanoBadgeText
-	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	sound_get_key_item
-	text_waitbutton
+	text_promptbutton
 	text_end
 
 BlainePostBattleAdviceText:

scripts/CinnabarLabFossilRoom.asm

@@ -76,7 +76,7 @@ Lab4Text1:
 	SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON
 	ld a, [wFossilMon]
 	ld b, a
-	ld c, 44
+	ld c, 35
 	call GivePokemon
 	jr nc, .asm_75d93
 	ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON

scripts/FuchsiaGym.asm

@@ -185,6 +185,8 @@ KogaBeforeBattleText:
 
 ReceivedSoulBadgeText:
 	text_far _ReceivedSoulBadgeText
+	sound_get_key_item
+	text_promptbutton
 	text_end
 
 KogaPostBattleAdviceText:
@@ -197,7 +199,7 @@ KogaSoulBadgeInfoText:
 
 ReceivedTM06Text:
 	text_far _ReceivedTM06Text
-	sound_get_key_item
+	sound_get_item_1
 
 TM06ExplanationText:
 	text_far _TM06ExplanationText

scripts/PewterGym.asm

@@ -196,7 +196,7 @@ TM34NoRoomText:
 
 ReceivedBoulderBadgeText:
 	text_far _ReceivedBoulderBadgeText
-	sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
+	sound_get_key_item
 	text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
 	text_end
 

scripts/SaffronGym.asm

@@ -185,7 +185,7 @@ SabrinaPreBattleText:
 
 ReceivedMarshBadgeText:
 	text_far _ReceivedMarshBadgeText
-	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	sound_get_key_item
 	text_promptbutton
 	text_end
 

scripts/SilphGauntlet3F.asm

@@ -31,7 +31,7 @@ SilphGauntlet3FTrainerHeader2:
 SilphGauntlet3FTrainerHeader3:
 	trainer EVENT_BEAT_GAUNTLET_ENGINEER, 1, SilphGauntlet3FBattleText4, SilphGauntlet3FEndBattleText4, SilphGauntlet3FAfterBattleText4
 SilphGauntlet3FTrainerHeader4:
-	trainer EVENT_BEAT_GAUNTLET_ROCKER, 1, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
+	trainer EVENT_BEAT_GAUNTLET_ROCKER, 2, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
 SilphGauntlet3FTrainerHeader5:
 	trainer EVENT_BEAT_GAUNTLET_FISHER, 2, SilphGauntlet3FBattleText6, SilphGauntlet3FEndBattleText6, SilphGauntlet3FAfterBattleText6
 	db -1 ; end

scripts/VermilionGym.asm

@@ -202,7 +202,7 @@ LTSurgeThunderBadgeInfoText:
 
 ReceivedTM24Text:
 	text_far _ReceivedTM24Text
-	sound_get_key_item
+	sound_get_item_1
 	text_far _TM24ExplanationText
 	text_end
 
@@ -212,6 +212,8 @@ TM24NoRoomText:
 
 ReceivedThunderBadgeText:
 	text_far _ReceivedThunderBadgeText
+	sound_get_key_item
+	text_promptbutton
 	text_end
 
 VermilionGymTrainerText1:

scripts/VictoryRoad2F.asm

@@ -222,18 +222,16 @@ DoubleEdgeGuy:
 
 TM10PreReceiveText:
 	text "You should be"
-	line "proud of"
+	line "proud of your-"
-	cont "yourself,"
+	cont "self, having"
-	cont "having battled"
+	cont "battled your way"
-	cont "your way through"
+	cont "through VICTORY"
-	cont "VICTORY ROAD so"
+	cont "ROAD so bravely."
-	cont "courageously."
 	
-	para "In recognition"
+	para "In recognition of"
-	line "of your feat,"
+	line "your feat, I can"
-	cont "I can teach your"
+	cont "teach your #-"
-	cont "#MON"
+	cont "MON DOUBLE-EDGE."
-	cont "DOUBLE-EDGE."
 	prompt
 
 ReceivedTM10Text:
@@ -253,7 +251,8 @@ TM10ExplanationText:
 
 TM10Refused:
 	text "I'll teach your"
-	line "#MON anytime."
+	line "#MON at any"
+	cont "time."
 	done
 
 DoubleEdgeNoRoomText:

scripts/ViridianGym.asm

@@ -274,7 +274,8 @@ GiovanniPreBattleText:
 
 ReceivedEarthBadgeText:
 	text_far _ReceivedEarthBadgeText
-	sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
+	sound_get_key_item
+	text_promptbutton
 	text_end
 
 GiovanniPostBattleAdviceText:

text/SafariZoneGate.asm

@@ -55,7 +55,7 @@ _SafariZoneEntranceText_753bb::
 	done
 
 _SafariZoneEntranceText_753c0::
-	text "Good Luck!"
+	text "Good luck!"
 	done
 
 _SafariZoneEntranceText_753c5::

text/SilphGauntlet1F.asm

@@ -89,8 +89,8 @@ _SilphGauntlet1FEndBattleText5::
 _SilphGauntlet1FAfterBattleText5::
 	text "BELLIGNAN loves"
 	line "eating bugs, so"
-	cont "it's perfect"
+	cont "it's a perfect"
-	cont "for me!"
+	cont "#MON for me!"
 	done
 
 _SilphGauntlet1FBattleText6::

text/SilphGauntlet2F.asm

@@ -69,8 +69,8 @@ _SilphGauntlet2FEndBattleText4::
 
 _SilphGauntlet2FAfterBattleText4::
 	text "The second I heard"
-	line "of the #MON"
+	line "of the #MON I"
-	cont "I could meet here,"
+	cont "could meet here,"
 	cont "I was stoked!"
 	
 	para "I could never have"

text/SilphGauntlet3F.asm

@@ -71,12 +71,10 @@ _SilphGauntlet3FEndBattleText4::
 _SilphGauntlet3FAfterBattleText4::
 	text "CHIEF called me"
 	line "here to fix some"
-	cont "lights."
+	cont "lights, but they"
-	
+	cont "don't seem to be"
-	para "But..."
+	cont "malfunctioning"
-	
+	cont "at all..."
-	para "They're working"
-	line "just fine..?"
 	done
 
 _SilphGauntlet3FBattleText5:: ; Rolling Stones reference, Jumpin' Jack Flash (1968).

text/SilphGauntlet5F.asm

@@ -13,7 +13,7 @@ _SilphGauntlet5FAfterBattleText1::
 	text "You have what it"
 	line "takes to beat"
 	cont "the strongest of"
-	cont "TRAINERs."
+	cont "trainers."
 	
 	para "You have my"
 	line "support!"
@@ -93,7 +93,7 @@ _SilphGauntlet5FAfterBattleText5::
 
 _SilphGauntlet5FBattleText6::
 	text "Once, I was the"
-	line "CHAMPION!"
+	line "champion!"
 	done
 
 _SilphGauntlet5FEndBattleText6::
@@ -102,9 +102,9 @@ _SilphGauntlet5FEndBattleText6::
 	prompt
 
 _SilphGauntlet5FAfterBattleText6::
-	text "Many TRAINERs have"
+	text "Many trainers have"
 	line "held the title of"
-	cont "CHAMPION!"
+	cont "champion before!"
 	
 	para "In fact, I've"
 	line "recognised a few"

text/SilphGauntlet6F.asm

@@ -139,23 +139,6 @@ _SilphGauntlet6FAfterBattleText4::
 	cont "on it!"
 	done
 
-; An alternate quote.
-; It's a bit too fanficy and I think Erika getting zooted off Vileplume violates her lore a bit.
-; Maybe it could be used somewhere else?
-;	text "Hmm? Why am I"
-;	line "always asleep?"
-;	
-;	para "VILEPLUME'S"
-;	line "SLEEP POWDER..."
-;	
-;	para "Before I drift"
-;	line "off, it gives"
-;	cont "a euphoric"
-;	cont "feeling..."
-;	
-;	para "Zzz..."
-
-
 _SilphGauntlet6FBattleText5::
 	text "Fwahahaha!"
 	
@@ -188,9 +171,10 @@ _SilphGauntlet6FAfterBattleText5::
 	done
 
 _SilphGauntlet6FBattleText6::
-	text "After defeating"
+	text "When the DOJO's"
-	line "the KARATE KING,"
+	line "MASTER fell to"
-	cont "I felt nigh-"
+	cont "my #MON, I"
+	cont "felt nearly"
 	cont "unstoppable..."
 	
 	para "But you humbled"

text/SilphGauntlet7F.asm

@@ -181,7 +181,7 @@ _ChiefPainting2::
 	
 _ChiefMonologueRematch::
 	text "CHIEF: What?"
-	line "you're back?"
+	line "You're back?"
 	
 	para "Hmm...you're"
 	line "looking for a"

text/VermilionGym.asm

@@ -24,16 +24,15 @@ _LTSurgePreBattleText:: ; Yellow text, which works better with his rematch text.
 _SurgeRematchPreBattleText::
 	text "Hey there, kid!"
 	line "Pretty shocking"
-	cont "you made it"
+	cont "that you made it"
 	cont "through the"
 	cont "#MON LEAGUE!"
 	
-	para "I can't think"
+	para "I can't think of"
-	line "of a stronger"
+	line "anyone stronger"
-	cont "TRAINER I've"
+	cont "since I first"
-	cont "battled since"
+	cont "arrived here in"
-	cont "first arriving"
+	cont "KANTO..."
-	cont "in KANTO..."
 	
 	para "Let's have a"
 	line "rematch, eh?"

text/VermilionGym_2.asm

@@ -152,6 +152,6 @@ _VermilionGymGuidePostBattleText::
 	done
 
 _SurgeRematchDefeatedText::
-	text "Absolutely"
+	text "Hah!"
-	line "shocking!"
+	line "Shocking!"
 	prompt