From 591752d5ee3bfccf1b003d03f85e21623ebd56ce Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 14:35:16 -0400
Subject: Pewter Gym and Museum 2F

---
 scripts/museum2f.asm | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'scripts/museum2f.asm')

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 "@"
-- 
cgit v1.3.1-sl0p