Merge branch 'master' of https://github.com/pret/pokered

scripts/PewterPokecenter.asm

@@ -9,21 +9,24 @@ PewterPokecenter_TextPointers:
 	dw PewterTradeNurseText
 
 PewterHealNurseText:
-	TX_POKECENTER_NURSE
+	script_pokecenter_nurse
 
 PewterPokecenterText2:
-	TX_FAR _PewterPokecenterText2
-	db "@"
+	text_far _PewterPokecenterText2
+	text_end
 
 PewterJigglypuffText:
-	TX_ASM
-	ld a, $1
+	text_asm
+	ld a, TRUE
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, .Text
+	ld hl, .JigglypuffText
 	call PrintText
-	StopAllMusic
+
+	ld a, SFX_STOP_ALL_MUSIC
+	call PlaySound
 	ld c, 32
 	call DelayFrames
+
 	ld hl, JigglypuffFacingDirections
 	ld de, wJigglypuffFacingDirections
 	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
@@ -36,15 +39,16 @@ PewterJigglypuffText:
 	inc hl
 	jr nz, .findMatchingFacingDirectionLoop
 	dec hl
+
 	push hl
 	ld c, 0 ; BANK(Music_JigglypuffSong)
 	ld a, MUSIC_JIGGLYPUFF_SONG
 	call PlayMusic
 	pop hl
-.loop
+
+.spinMovementLoop
 	ld a, [hl]
 	ld [wSprite03StateData1ImageIndex], a
-
 ; rotate the array
 	push hl
 	ld hl, wJigglypuffFacingDirections
@@ -54,23 +58,22 @@ PewterJigglypuffText:
 	ld a, [wJigglypuffFacingDirections - 1]
 	ld [wJigglypuffFacingDirections + 3], a
 	pop hl
-
 	ld c, 24
 	call DelayFrames
 
 	push hl
 	call IsSongPlaying
 	pop hl
-	jr c, .loop
+	jr c, .spinMovementLoop
 
 	ld c, 48
 	call DelayFrames
 	call PlayDefaultMusic
 	jp TextScriptEnd
 
-.Text
-	TX_FAR _PewterJigglypuffText
-	db "@"
+.JigglypuffText:
+	text_far _PewterJigglypuffText
+	text_end
 
 JigglypuffFacingDirections:
 	db $30 | SPRITE_FACING_DOWN
@@ -80,4 +83,4 @@ JigglypuffFacingDirections:
 JigglypuffFacingDirectionsEnd:
 
 PewterTradeNurseText:
-	TX_CABLE_CLUB_RECEPTIONIST
+	script_cable_club_receptionist