Merge branch 'mistress' into renewables

scripts/BrunswickGlade.asm

@@ -6,6 +6,10 @@ BrunswickGlade_TextPointers:
 	dw GZapRun2
 	dw GZapRun3
 	dw BrunswickGladeSign1
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
 
 GZapRun1:
 	text_far _BirdBattleText

scripts/BrunswickTrail.asm

@@ -21,6 +21,7 @@ BrunswickTrail_TextPointers:
 	dw GZapFound
 	dw Lover1
 	dw Lover2
+	dw PickUpItemText
 
 BrunswickTrailTrainerHeaders:
 	def_trainers

scripts/CeladonMansion3F.asm

@@ -6,6 +6,7 @@ CeladonMansion3F_TextPointers:
 	dw GraphicArtistText
 	dw WriterText
 	dw DirectorText
+	dw MorimotoFight
 	dw GameFreakPCText1
 	dw GameFreakPCText2
 	dw GameFreakPCText3
@@ -67,3 +68,60 @@ GameFreakPCText3:
 GameFreakSignText:
 	text_far _CeladonMansion3Text8
 	text_end
+
+MorimotoFight:
+	text_asm
+	ld hl, CeladonMansionMorimotoGreeting
+	call PrintText
+
+	call YesNoChoice ; Do they want in?
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .refused
+	
+	ld hl, CeladonMansionMorimotoFight
+	call PrintText
+	ld c, BANK(Music_MeetMaleTrainer)
+	ld a, MUSIC_MEET_MALE_TRAINER
+	call PlayMusic
+	ld hl, wd72d
+	set 6, [hl]
+	set 7, [hl]
+	
+	call Delay3
+	ld a, OPP_COOLTRAINER_M
+	ld [wCurOpponent], a
+	ld a, 11
+	ld [wTrainerNo], a
+	ld a, 1
+	ld [wIsTrainerBattle], a
+	ld hl, CeladonMansionMorimotoDefeated
+	ld de, CeladonMansionMorimotoWin
+	call SaveEndBattleTextPointers
+	jr .done
+.refused
+	ld hl, CeladonMansionMorimotoNo
+	call PrintText
+	; fallthrough
+.done
+	jp TextScriptEnd
+
+CeladonMansionMorimotoGreeting:
+	text_far _CeladonMansionMorimotoGreeting
+	text_end
+
+CeladonMansionMorimotoFight:
+	text_far _CeladonMansionMorimotoFight
+	text_end
+
+CeladonMansionMorimotoNo:
+	text_far _CeladonMansionMorimotoNo
+	text_end
+
+CeladonMansionMorimotoDefeated:
+	text_far _CeladonMansionMorimotoDefeated
+	text_end
+
+CeladonMansionMorimotoWin:
+	text_far _CeladonMansionMorimotoWin
+	text_end

scripts/HallOfFame.asm

@@ -214,6 +214,7 @@ ShowThis:
 
 ObjectsToShow:
 	db HS_ROUTE_1_OAK ; Oak post-game fight
+	db HS_MORIMOTO ; LGPE Morimoto Boss Fight
 	db -1 ; end
 
 ObjectsToHide: