Pewter Pokecenter

2 files changed, 19 insertions, 65 deletions

diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm
index 48205029..6f62a79f 100755
--- a/scripts/billshouse2.asm
+++ b/scripts/billshouse2.asm
@@ -87,7 +87,7 @@ Func_f24ae: ; f24ae
 	ld a, [wCurMap]
 	cp BILLS_HOUSE
 	jr nz, .asm_f24d2
-	call Func_154a
+	call CheckPikachuAsleep
 	jr z, .asm_f24d2
 	ld a, [W_BILLSHOUSECURSCRIPT]
 	cp $5
@@ -120,7 +120,7 @@ Func_f24d5:
 	ld a, $1
 	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
-	call Func_153a
+	call SetPikachuAsleep
 	callab InitializePikachuTextID
 	ret
 
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm
index 46d4d509..90f5e2b9 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -1,12 +1,17 @@
 PewterPokecenterScript: ; 5c587 (17:4587)
+	ld hl, wPreventBlackout
+	set 7, [hl]
 	call Serial_TryEstablishingExternallyClockedConnection
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 PewterPokecenterTextPointers: ; 5c58d (17:458d)
 	dw PewterPokecenterText1
 	dw PewterPokecenterText2
 	dw PewterPokecenterText3
 	dw PewterPokecenterText4
+	dw PewterPokecenterText5
+	dw PewterPokecenterText6
 
 PewterPokecenterText1: ; 5c595 (17:4595)
 	db $ff
@@ -17,69 +22,18 @@ PewterPokecenterText2: ; 5c596 (17:4596)
 
 PewterPokecenterText3: ; 5c59b (17:459b)
 	TX_ASM
-	ld a, $1
-	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, PewterPokecenterText5
-	call PrintText
-	ld a, $ff
-	call PlaySound
-	ld c, 32
-	call DelayFrames
-	ld hl, JigglypuffFacingDirections
-	ld de, wJigglypuffFacingDirections
-	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
-	call CopyData
-
-	ld a, [wSpriteStateData1 + 3 * $10 + $2]
-	ld hl, wJigglypuffFacingDirections
-.findMatchingFacingDirectionLoop
-	cp [hl]
-	inc hl
-	jr nz, .findMatchingFacingDirectionLoop
-	dec hl
-	push hl
-	ld c, BANK(Music_JigglypuffSong)
-	ld a, MUSIC_JIGGLYPUFF_SONG
-	call PlayMusic
-	pop hl
-.loop
-	ld a, [hl]
-	ld [wSpriteStateData1 + 3 * $10 + $2], a
-
-; rotate the array
-	push hl
-	ld hl, wJigglypuffFacingDirections
-	ld de, wJigglypuffFacingDirections - 1
-	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
-	call CopyData
-	ld a, [wJigglypuffFacingDirections - 1]
-	ld [wJigglypuffFacingDirections + 3], a
-	pop hl
-
-	ld c, 24
-	call DelayFrames
-
-	ld a, [wChannelSoundIDs]
-	ld b, a
-	ld a, [wChannelSoundIDs + CH1]
-	or b
-	jr nz, .loop
-
-	ld c, 48
-	call DelayFrames
-	call PlayDefaultMusic
+	callba Func_f1da4
 	jp TextScriptEnd
 
-PewterPokecenterText5: ; 5c603 (17:4603)
-	TX_FAR _PewterPokecenterText5
-	db "@"
-
-JigglypuffFacingDirections: ; 5c608 (17:4608)
-	db $30 | SPRITE_FACING_DOWN
-	db $30 | SPRITE_FACING_LEFT
-	db $30 | SPRITE_FACING_UP
-	db $30 | SPRITE_FACING_RIGHT
-JigglypuffFacingDirectionsEnd:
-
 PewterPokecenterText4: ; 5c60c (17:460c)
 	db $f6
+
+PewterPokecenterText5: ; 5c603 (17:4603)
+	TX_ASM
+	callba Func_f1d98
+	jp TextScriptEnd
+
+PewterPokecenterText6:
+	TX_ASM
+	callab Func_f0f12
+	jp TextScriptEnd