Merge branch 'mistress' into renewables

README.md

@@ -259,12 +259,13 @@ and more!
 
 Known Bugs
 ====
-Comprehensive list can be found on Discord.
+- If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off.
-- Occasionally, menu text sets itself to scroll.
+- Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed)
 - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
 - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
-- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
+- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle.
-- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
+- Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed)
+- The final battle against Blue uses the wrong team when Eevee is chosen.
 
 Evolution Methods for new Pokemon
 ====

constants/event_constants.asm

@@ -36,8 +36,9 @@
 	const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0
 	const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
 	const EVENT_GOT_TM42
+	const EVENT_GOT_YUJIROU_BOTTLE_CAP
 	const EVENT_BEAT_YUJIROU
-	const_skip 11
+	const_skip 10
 	const EVENT_OAK_GOT_PARCEL
 	const EVENT_GOT_OAKS_PARCEL
 	const_skip 22

crysaudio/cry_headers.asm

@@ -26,7 +26,7 @@ PokemonCries::
 	mon_cry CRY_VENONAT,    -233,  240 ; UMBREON
 	mon_cry CRY_CHIKORITA,    -1,  512 ; LEAFEON
 	mon_cry CRY_AMPHAROS,     63,  592 ; GLACEON
-	mon_cry CRY_NIDORAN_M,     0,    0 ; SYLVEON	(incomplete)
+	mon_cry CRY_NIDOQUEEN,   253,  367 ; SYLVEON
 	mon_cry CRY_RATTATA,       0,  256 ; RATTATA
 	mon_cry CRY_RATTATA,      32,  383 ; RATICATE
 	mon_cry CRY_RATTATA,      32,  383 ; RATICATE_A
@@ -45,7 +45,7 @@ PokemonCries::
 	mon_cry CRY_BLASTOISE,   255,  129 ; KAKUNA
 	mon_cry CRY_BLASTOISE,    96,  256 ; BEEDRILL
 	mon_cry CRY_MUK,         163,  187 ; GENTLARVA
-	mon_cry CRY_KRABBY,      144,  151 ; PUPAL		(needs revising)
+	mon_cry CRY_KRABBY,      144,  151 ; PUPAL
 	mon_cry CRY_KRABBY,      245,  288 ; CARAPTHOR
 	mon_cry CRY_KANGASKHAN,  163,  129 ; KOTORA
 	mon_cry CRY_KANGASKHAN,   45,  129 ; GAOTORA
@@ -113,7 +113,7 @@ PokemonCries::
 	mon_cry CRY_RATTATA,     255,  192 ; CHEEP
 	mon_cry CRY_RATTATA,      50,  383 ; JABETTA
 	mon_cry CRY_SEEL,          0,  256 ; LICKITUNG
-	mon_cry CRY_TYPHLOSION,  576,  234 ; LICKILICKY		(sounds really similar to electivire, consider revising)
+	mon_cry CRY_SEEL,        169,  639 ; LICKILICKY
 	mon_cry CRY_GROWLITHE,    32,  192 ; GROWLITHE
 	mon_cry CRY_WEEDLE,        0,  256 ; ARCANINE
 	mon_cry CRY_WEEDLE,        0,  256 ; ARCANINE_H
@@ -129,8 +129,8 @@ PokemonCries::
 	mon_cry CRY_DIGLETT,     170,  129 ; DIGLETT
 	mon_cry CRY_DIGLETT,      42,  144 ; DUGTRIO
 	mon_cry CRY_DIGLETT,      42,  144 ; DUGTRIO_A
-	mon_cry CRY_NIDORAN_M,     0,    0 ; WIGLETT	(incomplete)
+	mon_cry CRY_PSYDUCK,     640,  480 ; WIGLETT
-	mon_cry CRY_NIDORAN_M,     0,    0 ; WUGTRIO	(incomplete)
+	mon_cry CRY_DIGLETT,      36,  480 ; WUGTRIO
 	mon_cry CRY_EKANS,       255,  320 ; ONIX
 	mon_cry CRY_TYPHLOSION,  239,  247 ; STEELIX
 	mon_cry CRY_VOLTORB,     237,  256 ; VOLTORB

data/maps/hide_show_data.asm

@@ -591,13 +591,13 @@ MtMoonSquareHS:
 DaycareHS:
 	db DAYCARE, $03, SHOW                     ; HS_DAYCARE_BULBASAUR
 BrunswickGladeHS:
-	db BRUNSWICK_GLADE, $01, HIDE            ; HS_GLADE_GZAP_1
+	db BRUNSWICK_GLADE, $05, HIDE            ; HS_GLADE_GZAP_1
-	db BRUNSWICK_GLADE, $02, HIDE            ; HS_GLADE_GZAP_2
+	db BRUNSWICK_GLADE, $06, HIDE            ; HS_GLADE_GZAP_2
-	db BRUNSWICK_GLADE, $03, HIDE            ; HS_GLADE_GZAP_3
+	db BRUNSWICK_GLADE, $07, HIDE            ; HS_GLADE_GZAP_3
-	db BRUNSWICK_GLADE, $04, HIDE            ; HS_GLADE_ITEM1
+	db BRUNSWICK_GLADE, $08, SHOW            ; HS_GLADE_ITEM1
-	db BRUNSWICK_GLADE, $05, HIDE            ; HS_GLADE_ITEM2
+	db BRUNSWICK_GLADE, $09, SHOW            ; HS_GLADE_ITEM2
-	db BRUNSWICK_GLADE, $06, HIDE            ; HS_GLADE_ITEM3
+	db BRUNSWICK_GLADE, $0A, SHOW            ; HS_GLADE_ITEM3
-	db BRUNSWICK_GLADE, $07, HIDE            ; HS_GLADE_ITEM4
+	db BRUNSWICK_GLADE, $0B, SHOW            ; HS_GLADE_ITEM4
 CinnabarVolcanoFloorsHS:
 	db CINNABAR_VOLCANO_FLOORS, $05, SHOW
 	assert_table_length NUM_HS_OBJECTS

data/maps/objects/BrunswickGlade.asm

@@ -11,16 +11,16 @@ BrunswickGlade_Object:
 	bg_event 14, 24, 12 ; Sign
 
 	def_object_events
-	object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
+	object_event 16,  8, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer
-	object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
+	object_event  7, 28, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 6 ; Fuji reference Trainer
-	object_event  9,  3, SPRITE_BIRD, STAY, UP, 3
+	object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 3, OPP_BEAUTY, 19 ; Ariana reference Trainer
-	object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1
+	object_event 31,  4, SPRITE_COOLTRAINER_M, STAY, DOWN, 4, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer
-	object_event  5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2
+	object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 5
-	object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3
+	object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 6
-	object_event  9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4
+	object_event  9,  3, SPRITE_BIRD, STAY, UP, 7
-	object_event 16,  8, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer
+	object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER ; itemball1
-	object_event  7, 28, SPRITE_GENTLEMAN, STAY, UP, 9, OPP_GENTLEMAN, 6 ; Fuji reference Trainer
+	object_event  5, 21, SPRITE_POKE_BALL, STAY, NONE, 9, LEAF_STONE ; itemball2
-	object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 10, OPP_BEAUTY, 19 ; Ariana reference Trainer
+	object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 10, REVIVE ; itemball3
-	object_event 31,  4, SPRITE_COOLTRAINER_M, STAY, DOWN, 11, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer
+	object_event  9, 33, SPRITE_POKE_BALL, STAY, NONE, 11, HYPER_POTION ; itemball4
 
 	def_warps_to BRUNSWICK_GLADE

data/maps/objects/CelesteHillCave.asm

@@ -13,7 +13,7 @@ CelesteHillCave_Object:
 	def_bg_events
 
 	def_object_events
-	object_event 22, 14, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
+	object_event 22, 15, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
-	object_event 21,  5, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
+	object_event 23,  4, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
 
 	def_warps_to CELESTE_HILL_CAVE

data/maps/objects/CelesteHillOutside.asm

@@ -15,7 +15,7 @@ CelesteHillOutside_Object:
 
 	def_object_events
 	object_event 30, 16, SPRITE_BEAUTY, STAY, LEFT, 1, OPP_BEAUTY, 18 ; Selphy reference Trainer
-	object_event 19, 31, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer
+	object_event  1, 16, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer
 	object_event 11, 16, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN,  7; Fan Club Chairman reference Trainer
 	
 

data/trainers/parties.asm

@@ -699,7 +699,7 @@ CooltrainerFData:
 ;	db 45, NIDORINA, NIDOQUEEN, 0
 ;	db 43, PERSIAN, NINETALES, RAICHU, 0
 ; Brunswick Glade/grotto etc, whatever desired 
-	db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf 
+	db 60, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf 
 
 ; "Dignified" Pokemon associated with the privileged class.
 GentlemanData:
@@ -713,7 +713,7 @@ GentlemanData:
 ; SS Anne 2F Rooms
 	db 17, KOLTA, GROWLITHE, 0
 ; Celeste Hill?
-	db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji
+	db 56, NIDOKING, GOLDUCK, GUARDIA, DODRIO, BEEDRILL, 0 ; Fuji
 	db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
 
 ChannelerData:

data/trainers/special_moves.asm

@@ -876,7 +876,7 @@ SpecialTrainerMoves:
 	db 6, 3, QUICK_ATTACK
 	db 0
 
-	db RIVAL2, 20		; Route 22 Rival w/Raichu
+	db RIVAL2, 20		; Route 22 Rival w/Gorochu
 	db 1, 1, SAND_ATTACK
 	db 1, 2, SLASH
 	db 1, 4, SWORDS_DANCE
@@ -1029,7 +1029,7 @@ SpecialTrainerMoves:
 	db 6, 3, QUICK_ATTACK
 	db 0
 
-	db RIVAL3, 5		; Champion Rival w/Raichu
+	db RIVAL3, 5		; Champion Rival w/Gorochu
 	db 1, 1, SAND_ATTACK
 	db 1, 2, SLASH
 	db 1, 4, SWORDS_DANCE
@@ -1363,4 +1363,191 @@ SpecialTrainerMoves:
 	db 6, 4, ICE_BEAM
 	db 0
 	
+	db JESSIE_JAMES, 5	; J&J postgame
+	db 1, 1, BUBBLEBEAM
+	db 1, 2, THUNDERBOLT
+	db 1, 4, HYPNOSIS
+	db 2, 3, WRAP
+	db 2, 4, EARTHQUAKE
+	db 3, 1, WRAP
+	db 3, 2, BODY_SLAM
+	db 3, 3, EXPLOSION
+	db 3, 4, EARTHQUAKE
+	db 4, 1, SLUDGE
+	db 4, 2, THUNDERBOLT
+	db 4, 3, FIRE_BLAST
+	db 5, 3, BODY_SLAM
+	db 6, 1, FIRE_BLAST
+	db 6, 2, THUNDERBOLT
+	db 0
+	
+	db LORELEI, 2	; Lorelei rematch
+	db 1, 1, SURF
+	db 1, 3, BODY_SLAM
+	db 1, 4, BLIZZARD
+	db 2, 1, EXPLOSION
+	db 2, 3, ICE_BEAM
+	db 3, 1, HYPNOSIS
+	db 3, 4, SUBSTITUTE
+	db 4, 1, LOVELY_KISS
+	db 4, 2, COUNTER
+	db 4, 3, PSYCHIC_M
+	db 5, 1, BODY_SLAM
+	db 5, 2, REST
+	db 5, 4, GROWTH
+	db 6, 1, HYPER_BEAM
+	db 6, 2, THUNDERBOLT
+	db 6, 3, BLIZZARD
+	db 0
+	
+	db BRUNO, 2		; Bruno rematch
+	db 1, 3, MEDITATE
+	db 2, 1, EARTHQUAKE
+	db 2, 3, ROCK_SLIDE
+	db 2, 4, EXPLOSION
+	db 3, 1, BODY_SLAM
+	db 3, 2, BRUTAL_SWING
+	db 3, 3, SWORDS_DANCE
+	db 4, 1, THUNDERBOLT
+	db 5, 2, BODY_SLAM
+	db 5, 3, HI_JUMP_KICK
+	db 5, 4, DIG
+	db 6, 1, BODY_SLAM
+	db 6, 3, EARTHQUAKE
+	db 6, 4, ROCK_SLIDE
+	db 0
+
+	db AGATHA, 2	; Agatha rematch
+	db 1, 1, MEGA_PUNCH
+	db 1, 4, ROCK_SLIDE
+	db 2, 1, MEGA_DRAIN
+	db 2, 3, CONFUSE_RAY
+	db 2, 4, FLY
+	db 3, 1, SWORDS_DANCE
+	db 3, 2, FIRE_BLAST
+	db 3, 3, EARTHQUAKE
+	db 3, 4, BLIZZARD
+	db 4, 3, WRAP
+	db 4, 4, EARTHQUAKE
+	db 5, 1, GROWTH
+	db 5, 3, TOXIC
+	db 6, 1, THUNDERBOLT
+	db 6, 2, ICE_PUNCH
+	db 6, 4, PSYCHIC_M
+	db 0
+
+	db LANCE, 2		; Lance rematch
+	db 1, 1, SWORDS_DANCE
+	db 1, 2, THUNDERBOLT
+	db 1, 4, EARTHQUAKE
+	db 2, 1, BLIZZARD
+	db 2, 2, THUNDERBOLT 
+	db 3, 1, PSYCHIC_M
+	db 3, 2, EARTHQUAKE
+	db 3, 3, EXPLOSION
+	db 4, 1, REST
+	db 4, 2, ICE_BEAM
+	db 5, 1, SURF
+	db 5, 3, THUNDERBOLT
+	db 6, 1, BLIZZARD
+	db 6, 2, FIRE_BLAST
+	db 6, 4, AGILITY
+	db 0
+
+	db RIVAL3, 6	; Champion Rival rematch w/Totartle
+	db 1, 1, SMART_STRIKE
+	db 1, 2, EARTHQUAKE
+	db 2, 1, THUNDERPUNCH
+	db 2, 4, ICE_PUNCH
+	db 3, 1, SURF
+	db 3, 3, THUNDERBOLT
+	db 4, 1, FIRE_BLAST
+	db 4, 2, DIG
+	db 4, 3, AGILITY
+	db 4, 4, BODY_SLAM
+	db 5, 1, PSYCHIC_M
+	db 5, 2, SLEEP_POWDER
+	db 5, 4, SOLARBEAM
+	db 6, 1, BODY_SLAM
+	db 6, 2, HYDRO_PUMP
+	db 0
+
+	db RIVAL3, 7	; Champion Rival rematch w/Venusaur
+	db 1, 1, SMART_STRIKE
+	db 1, 2, EARTHQUAKE
+	db 2, 1, FIRE_PUNCH
+	db 2, 4, THUNDERPUNCH
+	db 3, 1, SURF
+	db 3, 3, THUNDERBOLT
+	db 4, 1, BLIZZARD
+	db 4, 2, THUNDERBOLT
+	db 5, 1, FIRE_BLAST
+	db 5, 2, DIG
+	db 5, 3, AGILITY
+	db 5, 4, BODY_SLAM
+	db 6, 2, RAZOR_LEAF
+	db 6, 3, BODY_SLAM
+	db 6, 4, SLEEP_POWDER
+	db 0
+
+	db RIVAL3, 8	; Champion Rival rematch w/Charizard
+	db 1, 1, SMART_STRIKE
+	db 1, 2, EARTHQUAKE
+	db 2, 1, ICE_PUNCH
+	db 2, 4, FIRE_PUNCH
+	db 3, 1, SURF
+	db 3, 3, THUNDERBOLT
+	db 4, 1, PSYCHIC_M
+	db 4, 2, SLEEP_POWDER
+	db 4, 4, SOLARBEAM
+	db 5, 1, BLIZZARD
+	db 5, 2, THUNDERBOLT
+	db 6, 1, FLY
+	db 6, 2, SLASH
+	db 6, 4, EARTHQUAKE
+	db 0
+	
+	db RIVAL3, 9	; Champion Rival rematch w/Umbreon
+	db 1, 1, BODY_SLAM
+	db 1, 2, EARTHQUAKE
+	db 1, 3, BLIZZARD
+	db 1, 4, FIRE_BLAST
+	db 2, 1, FIRE_PUNCH
+	db 2, 4, ICE_PUNCH
+	db 3, 2, SOLARBEAM
+	db 3, 3, MEGA_DRAIN
+	db 3, 4, AMNESIA
+	db 4, 1, THUNDER_WAVE
+	db 4, 3, THUNDERBOLT
+	db 5, 1, HYPNOSIS
+	db 5, 2, REFLECT
+	db 5, 3, BODY_SLAM
+	db 5, 4, FIRE_BLAST
+	db 6, 1, BODY_SLAM
+	db 6, 3, GROWTH
+	db 0
+
+	db RIVAL3, 10	; Champion Rival rematch w/Gorochu
+	db 1, 1, BODY_SLAM
+	db 1, 2, EARTHQUAKE
+	db 1, 3, BLIZZARD
+	db 1, 4, FIRE_BLAST
+	db 2, 1, ICE_PUNCH
+	db 2, 4, THUNDERPUNCH
+	db 3, 2, SOLARBEAM
+	db 3, 3, MEGA_DRAIN
+	db 3, 4, AMNESIA
+	db 4, 1, HYPNOSIS
+	db 4, 2, REFLECT
+	db 4, 3, BODY_SLAM
+	db 4, 4, FIRE_BLAST
+	db 5, 1, EXPLOSION
+	db 5, 3, SURF
+	db 5, 4, BLIZZARD
+	db 6, 1, THUNDERBOLT
+	db 6, 2, BODY_SLAM
+	db 6, 3, THUNDER_WAVE
+	db 6, 4, SURF
+	db 0
+	
 	db -1 ; end

scripts/BattleTent.asm

@@ -615,6 +615,7 @@ BattleTentGuy_After:
 	call PrintText
 	ld a, [wBTRewards]
 	ld b, RARE_CANDY
+	ld c, a
 	call GiveItem
 	jr nc, .bag_full ; could use money instead here
 	ld hl, ReceivedRewardText
@@ -626,6 +627,7 @@ BattleTentGuy_After:
 	ld [wBTRewards], a
 	;ld b, POWER_FEED
 	ld b, BOTTLE_CAP
+	ld c, a
 	call GiveItem
 	jr nc, .bag_full
 	ld hl, ReceivedRewardText
@@ -889,7 +891,7 @@ BattleTentGuy2_Heal:
 	done
 
 ReceivedRewardPreamble:
-	text "Take these"
+	text "Take these,"
 	line "on the house!"
 	prompt
 	text_end

scripts/BrunswickGlade.asm

@@ -13,6 +13,10 @@ BrunswickGlade_ScriptPointers:
 	dw EndTrainerBattle
 
 BrunswickGlade_TextPointers:
+	dw BrunswickGladeTrainer1
+	dw BrunswickGladeTrainer2
+	dw BrunswickGladeTrainer3
+	dw BrunswickGladeTrainer4
 	dw GZapRun1
 	dw GZapRun2
 	dw GZapRun3
@@ -20,20 +24,16 @@ BrunswickGlade_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
-	dw BrunswickGladeTrainer1
-	dw BrunswickGladeTrainer2
-	dw BrunswickGladeTrainer3
-	dw BrunswickGladeTrainer4
 	dw BrunswickGladeSign1
 
 BrunswickGladeTrainerHeaders:
 	def_trainers
 BrunswickGladeTrainerHeader0:
 	trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F, 1, BrunswickGladeBattleText1, BrunswickGladeEndBattleText1, BrunswickGladeAfterBattleText1
-BrunswickGladeTrainerHeader2: ; don't ask
-	trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
 BrunswickGladeTrainerHeader1:
-	trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
+	trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
+BrunswickGladeTrainerHeader2:
+	trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
 BrunswickGladeTrainerHeader3:
 	trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M, 3, BrunswickGladeBattleText4, BrunswickGladeEndBattleText4, BrunswickGladeAfterBattleText4
 	db -1 ; end

scripts/FightingDojo.asm

@@ -128,8 +128,6 @@ FightingDojoText1: ; gym scaling can be removed to make space
 	ld [wTrainerNo], a
 	ld a, 1
 	ld [wIsTrainerBattle], a
-	ld a, $1
-	ld [wGymLeaderNo], a
 	jr .asm_9dba4
 .normalProcessing
 	CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
@@ -164,15 +162,12 @@ FightingDojoText1: ; gym scaling can be removed to make space
 	ld [wTrainerNo], a
 	ld a, 1
 	ld [wIsTrainerBattle], a
-	ld a, $1
-	ld [wGymLeaderNo], a ; play gym music
 	
 	;ends here
 	
 	ld a, $3
 	ld [wFightingDojoCurScript], a
 	ld [wCurMapScript], a
-	SetEvent EVENT_DEFEATED_FIGHTING_DOJO
 	jr .asm_9dba4
 .continue1
 	ld hl, FightingDojoText_5ce9d
@@ -181,6 +176,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
 .continue2
 	ld hl, FightingDojoText8
 	call PrintText
+	SetEvent EVENT_DEFEATED_FIGHTING_DOJO
 .asm_9dba4
 	jp TextScriptEnd
 

scripts/ViridianPreGym.asm

@@ -23,15 +23,27 @@ ViridianPreGym_ScriptPointers:
 ViridianGymYujirouPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, ViridianGymResetScripts
+	jp z, ViridianPreGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
-;	SetEvents EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 ; Needs to be set here for the correct text to pop up.
+ViridianPreGymScriptReceiveBottleCap:
-;	ld a, $3
+	ld a, $b
-;	ld [hSpriteIndex], a
+	ldh [hSpriteIndexOrTextID], a
-;	call DisplayTextID
+	call DisplayTextID
-;	xor a
+	SetEvent EVENT_BEAT_YUJIROU
-;	ld [wViridianPreGymCurScript], a
+	lb bc, BOTTLE_CAP, 1
+	call GiveItem
+	jr nc, .BagFull
+	ld a, $c
+	ldh [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	SetEvent EVENT_GOT_YUJIROU_BOTTLE_CAP
+	jp ViridianPreGymResetScripts
+.BagFull
+	ld a, $d
+	ldh [hSpriteIndexOrTextID], a
+	call DisplayTextID
+	jp ViridianPreGymResetScripts
 
 ViridianPreGym_TextPointers:
 	dw ViridianPreGymText1
@@ -44,6 +56,9 @@ ViridianPreGym_TextPointers:
 	dw ViridianPreGymSign4
 	dw ViridianPreGymStatue1
 	dw ViridianPreGymStatue2
+	dw BeforeReceivedBottleCapText
+	dw ReceivedBottleCapText
+	dw BottleCapNoRoomText
 
 ViridianPreGymTrainerHeaders:
 	def_trainers
@@ -55,44 +70,15 @@ ViridianPreGymTrainerHeader1:
 
 YujirouText:
 	text_asm
+	CheckEvent EVENT_BEAT_YUJIROU
+	jp z, .yujirouNotBeaten
 	CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff
 	jr nz, .rematchMode
-	CheckEvent EVENT_BEAT_YUJIROU
+	CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP
-	jp nz, .YujirouBeaten
+	jr nz, .yujirouBeaten
-	ld hl, YujirouIntro
+	call z, ViridianPreGymScriptReceiveBottleCap
-	call PrintText
+	call DisableWaitingAfterTextDisplay
-	
+	jp .done ; needed due to the rematch script length.
-	ld c, BANK(Music_MeetMaleTrainer)
-	ld a, MUSIC_MEET_MALE_TRAINER
-	call PlayMusic
-	
-	ld hl, wd72d
-	set 6, [hl]
-	set 7, [hl]
-	ld hl, YujirouLoseText
-	ld de, YujirouWinText
-	call SaveEndBattleTextPointers
-	ldh a, [hSpriteIndex]
-	ld [wSpriteIndex], a
-	call EngageMapTrainer
-	
-	; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
-	ld a, OPP_YUJIROU
-	ld [wCurOpponent], a
-	
-	ld hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help.
-	ld b, 1
-	call CountSetBits
-	ld a, [wNumSetBits]
-	inc a
-	ld [wTrainerNo], a
-	
-	ld a, 1
-	ld [wIsTrainerBattle], a
-	ld a, $3
-	ld [wViridianPreGymCurScript], a
-	ld [wCurMapScript], a
-	jr .done
 .rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.
 	ld hl, YujirouIntro2
 	call PrintText
@@ -105,7 +91,7 @@ YujirouText:
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
 	ld hl, YujirouLoseText2
-	ld de, YujirouWinText
+	ld de, YujirouLoseText2
 	call SaveEndBattleTextPointers
 	call EngageMapTrainer
 	ld a, OPP_YUJIROU
@@ -114,12 +100,46 @@ YujirouText:
 	ld [wTrainerNo], a
 	ld a, 1
 	ld [wIsTrainerBattle], a
-	ld a, $1
-	ld [wGymLeaderNo], a
 	jr .done
-.YujirouBeaten
+.yujirouBeaten
 	ld hl, YujirouAfterBattleText
 	call PrintText
+	jr .done
+.yujirouNotBeaten
+	ld hl, YujirouIntro
+	call PrintText
+	ld hl, wd72d
+	set 6, [hl]
+	set 7, [hl]
+	ld hl, YujirouLoseText
+	ld de, YujirouLoseText
+	call SaveEndBattleTextPointers
+	ldh a, [hSpriteIndex]
+	ld [wSpriteIndex], a
+	call EngageMapTrainer
+
+
+	; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
+	ld a, OPP_YUJIROU
+	ld [wCurOpponent], a
+	
+	ld hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help.
+	ld b, 1
+	call CountSetBits
+	ld a, [wNumSetBits]
+	inc a
+
+	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a
+
+	;ends here
+
+	xor a
+	ldh [hJoyHeld], a
+	ld a, $3
+	ld [wViridianPreGymCurScript], a
+	ld [wCurMapScript], a
 .done
 	jp TextScriptEnd
 
@@ -131,14 +151,24 @@ YujirouLoseText::
 	text_far _YujirouLoseText
 	text_end
 
-YujirouWinText::
-	text_far _YujirouWinText
-	text_end
-
 YujirouAfterBattleText::
 	text_far _YujirouAfterBattleText
 	text_end
 
+BeforeReceivedBottleCapText:
+	text_far _BeforeReceivedBottleCapText
+	text_end
+
+ReceivedBottleCapText:
+	text_far _ReceivedBottleCapText
+	sound_get_item_1
+	text_far _BottleCapExplanationText
+	text_end
+
+BottleCapNoRoomText:
+	text_far _BottleCapNoRoomText
+	text_end
+
 YujirouIntro2::
 	text_far _YujirouIntro2
 	text_end

text/BrunswickGlade.asm

@@ -20,7 +20,8 @@ _BrunswickGladeBattleText1:: ; Leaf
 	done
 
 _BrunswickGladeEndBattleText1::
-	text "Dang it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
+	text "Dang"
+	line "it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
 	prompt
 
 _BrunswickGladeAfterBattleText1::
@@ -34,30 +35,7 @@ _BrunswickGladeAfterBattleText1::
 	cont "everywhere!"
 	done
 
-_BrunswickGladeBattleText2:: ; Ariana - uses stad2 quotes
+_BrunswickGladeBattleText2:: ; Fuji
-	text "That sharp gaze..."
-	
-	para "You seem rather"
-	line "competent."
-	done
-
-_BrunswickGladeEndBattleText2::
-	text "I can't"
-	line "look them in"
-	cont "the face after"
-	cont "this!"
-	prompt
-
-_BrunswickGladeAfterBattleText2::
-	text "Have you thought"
-	line "about working"
-	cont "for TEAM ROCKET?"
-	
-	para "No? Forget I"
-	line "said anything."
-	done
-
-_BrunswickGladeBattleText3:: ; Fuji
 	text "You seem to have"
 	line "raised your #-"
 	cont "MON with love"
@@ -67,11 +45,11 @@ _BrunswickGladeBattleText3:: ; Fuji
 	line "they battle!"
 	done
 
-_BrunswickGladeEndBattleText3::
+_BrunswickGladeEndBattleText2::
 	text "Hm..."
 	prompt
 
-_BrunswickGladeAfterBattleText3::
+_BrunswickGladeAfterBattleText2::
 	text "I've made many"
 	line "mistakes in my"
 	cont "life."
@@ -83,6 +61,29 @@ _BrunswickGladeAfterBattleText3::
 	cont "matters."
 	done
 
+_BrunswickGladeBattleText3:: ; Ariana - uses stad2 quotes
+	text "That sharp gaze..."
+	
+	para "You seem rather"
+	line "competent."
+	done
+
+_BrunswickGladeEndBattleText3::
+	text "I can't"
+	line "look them in"
+	cont "the face after"
+	cont "this!"
+	prompt
+
+_BrunswickGladeAfterBattleText3::
+	text "Have you thought"
+	line "about working"
+	cont "for TEAM ROCKET?"
+	
+	para "No? Forget I"
+	line "said anything."
+	done
+
 _BrunswickGladeBattleText4:: ; Trace
 	text "Whoa!"
 	
@@ -92,7 +93,7 @@ _BrunswickGladeBattleText4:: ; Trace
 	done
 
 _BrunswickGladeEndBattleText4::
-	text "Whoa!"
+	text "Wow!"
 	line "Seriously?"
 	prompt
 

text/CeladonMansion3F.asm

@@ -99,7 +99,7 @@ _CeladonMansionMorimotoNo:: ; USUM
 _CeladonMansionMorimotoDefeated:: ; LGPE, compressed
 	text "When"
 	line "it comes down"
-	line "to it, you are"
+	cont "to it, you are"
 	cont "still the best!"
 	prompt
 

text/FightingDojo.asm

@@ -35,10 +35,9 @@ _FightingDojoText_5ce98::
 	done
 
 _FightingDojoText_5ce9d::
-	text "Ho!"
+	text "Hyah!"
-
+	line "Stay and train at"
-	para "Stay and train at"
+	cont "karate with us!"
-	line "Karate with us!"
 	done
 
 _FightingDojoBattleText1::
@@ -139,7 +138,7 @@ _OiMateText::
 	done
 
 _KoichiRematchPreBattleText::
-	text "Ho, <PLAYER>!"
+	text "<PLAYER>!"
 	
 	para "Did you return"
 	line "to spar with us"

text/ViridianPreGym.asm

@@ -17,12 +17,19 @@ _YujirouLoseText::
 	line "I lost?!"
 	prompt
 
-_YujirouWinText::
-	text "Ha!"
-	line "Small fry!"
-	prompt
-
 _YujirouAfterBattleText::
+	text "I won't give up!"
+	line "I'll train with"
+	cont "my #MON until"
+	cont "we're the best"
+	cont "there is!"
+	
+	para "One day, we will"
+	line "beat you!"
+	
+	done
+
+_BeforeReceivedBottleCapText::
 	text "I lost..."
 	
 	para "..."
@@ -35,7 +42,34 @@ _YujirouAfterBattleText::
 	
 	para "One day, we will"
 	line "beat you!"
-	
+
+	para "Oh yeah! You can"
+	line "have this for"
+	cont "winning!"
+	done
+
+_ReceivedBottleCapText::
+	text "<PLAYER> received"
+	line "BOTTLE CAP!@"
+	text_end
+
+_BottleCapExplanationText::
+	text_start
+
+	para "I know it's not"
+	line "a real BADGE..."
+	cont "but look at how"
+	cont "shiny it is!"
+
+	para "Maybe it'll come"
+	line "in handy some"
+	cont "other time."
+	done
+
+_BottleCapNoRoomText::
+	text "Wait, you've got"
+	line "way too many"
+	cont "items already!"
 	done
 
 _YujirouIntro2::
@@ -95,8 +129,8 @@ _ViridianPreGymBattleText2::
 	done
 
 _ViridianPreGymEndBattleText2::
-	text "CLEFAIRY!"
+	text "No!"
-	line "No!"
+	line "CLEFAIRY!"
 	prompt
 
 _ViridianPreGymAfterBattleText2::