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

-

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
-	text_waitbutton
+	sound_get_key_item
+	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"
-	cont "yourself,"
-	cont "having battled"
-	cont "your way through"
-	cont "VICTORY ROAD so"
-	cont "courageously."
+	line "proud of your-"
+	cont "self, having"
+	cont "battled your way"
+	cont "through VICTORY"
+	cont "ROAD so bravely."
 	
-	para "In recognition"
-	line "of your feat,"
-	cont "I can teach your"
-	cont "#MON"
-	cont "DOUBLE-EDGE."
+	para "In recognition of"
+	line "your feat, I can"
+	cont "teach your #-"
+	cont "MON 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: