Pewter Gym and Museum 2F

2 files changed, 51 insertions, 5 deletions

diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm
index 0f8a63ec..56d113ae 100755
--- a/scripts/museum2f.asm
+++ b/scripts/museum2f.asm
@@ -1,5 +1,6 @@
 Museum2FScript: ; 5c317 (17:4317)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 Museum2FTextPointers: ; 5c31a (17:431a)
 	dw Museum2FText1
@@ -27,9 +28,40 @@ Museum2FText4: ; 5c337 (17:4337)
 	db "@"
 
 Museum2FText5: ; 5c33c (17:433c)
+	TX_ASM
+	ld a, [wd472]
+	bit 7, a
+	jr nz, .asm_5c1f6
+	ld hl, Museum2FText_5c20e
+	call PrintText
+	jr .asm_5c20b
+
+.asm_5c1f6
+	ld a, [wPikachuHappiness]
+	cp 101
+	jr c, .asm_5c205
+	ld hl, Museum2FText_5c218
+	call PrintText
+	jr .asm_5c20b
+
+.asm_5c205
+	ld hl, Museum2FText_5c213
+	call PrintText
+.asm_5c20b
+	jp TextScriptEnd
+
+Museum2FText_5c20e:
 	TX_FAR _Museum2FText5
 	db "@"
 
+Museum2FText_5c213:
+	TX_FAR _Museum2FPikachuText1
+	db "@"
+
+Museum2FText_5c218:
+	TX_FAR _Museum2FPikachuText2
+	db "@"
+
 Museum2FText6: ; 5c341 (17:4341)
 	TX_FAR _Museum2FText6
 	db "@"
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index 1e6e5476..3e9ab693 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -14,7 +14,8 @@ PewterGymScript: ; 5c387 (17:4387)
 PewterGymScript_5c3a4: ; 5c3a4 (17:43a4)
 	ld hl, Gym1CityName
 	ld de, Gym1LeaderName
-	jp LoadGymLeaderAndCityName
+	call LoadGymLeaderAndCityName
+	ret
 
 Gym1CityName: ; 5c3ad (17:43ad)
 	db "PEWTER CITY@"
@@ -41,7 +42,6 @@ PewterGymScript3: ; 5c3d2 (17:43d2)
 	jp z, PewterGymScript_5c3bf
 	ld a, $f0
 	ld [wJoyIgnore], a
-
 PewterGymScript_5c3df: ; 5c3df (17:43df)
 	ld a, $4
 	ld [hSpriteIndexOrTextID], a
@@ -55,6 +55,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM34
 	jr .asm_5c408
+
 .BagFull
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
@@ -149,7 +150,7 @@ PewterGymText4: ; 5c4a8 (17:44a8)
 
 PewterGymText5: ; 5c4ad (17:44ad)
 	TX_FAR _ReceivedTM34Text
-	db $0B
+	TX_SFX_ITEM
 	TX_FAR _TM34ExplanationText
 	db "@"
 
@@ -159,7 +160,7 @@ PewterGymText6: ; 5c4b7 (17:44b7)
 
 PewterGymText_5c4bc: ; 5c4bc (17:44bc)
 	TX_FAR _PewterGymText_5c4bc
-	db $0B
+	TX_SFX_ITEM
 	TX_FAR _PewterGymText_5c4c1
 	db "@"
 
@@ -192,6 +193,9 @@ PewterGymText3: ; 5c4df (17:44df)
 	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .asm_5c4fe
+	ld a, [wd472]
+	bit 7, a
+	jp nz, .asm_5c3fa
 	ld hl, PewterGymText_5c51a
 	call PrintText
 	jr .asm_5c504
@@ -208,6 +212,11 @@ PewterGymText3: ; 5c4df (17:44df)
 .asm_5c512
 	jp TextScriptEnd
 
+.asm_5c3fa
+	ld hl, PewterGymText_5c41c
+	call PrintText
+	jp TextScriptEnd
+
 PewterGymText_5c515: ; 5c515 (17:4515)
 	TX_FAR _PewterGymText_5c515
 	db "@"
@@ -227,3 +236,8 @@ PewterGymText_5c524: ; 5c524 (17:4524)
 PewterGymText_5c529: ; 5c529 (17:4529)
 	TX_FAR _PewterGymText_5c529
 	db "@"
+
+PewterGymText_5c41c:
+	TX_FAR _PewterGymGuyText
+	db "@"
+