Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters

1 files changed, 60 insertions, 60 deletions

diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 61dd03f6..0c3e10cf 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -50,7 +50,7 @@ CeruleanCityScript0:
 .asm_194e6
 	ld [wPlayerMovingDirection], a
 	ld a, b
-	ld [wSpriteStateData1 + 2 * $10 + $9], a
+	ld [wSprite02StateData1FacingDirection], a
 	call Delay3
 	ld a, $2
 	ld [hSpriteIndexOrTextID], a
@@ -247,7 +247,7 @@ CeruleanCity_TextPointers:
 	dw CeruleanCityText17
 
 CeruleanCityText1:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_CERULEAN_RIVAL
 	; do pre-battle text
 	jr z, .PreBattleText
@@ -262,23 +262,23 @@ CeruleanCityText1:
 	jp TextScriptEnd
 
 CeruleanCityText_19668:
-	TX_FAR _CeruleanCityText_19668
-	db "@"
+	text_far _CeruleanCityText_19668
+	text_end
 
 CeruleanCityText_1966d:
-	TX_FAR _CeruleanCityText_1966d
-	db "@"
+	text_far _CeruleanCityText_1966d
+	text_end
 
 CeruleanCityText_19672:
-	TX_FAR _CeruleanCityText_19672
-	db "@"
+	text_far _CeruleanCityText_19672
+	text_end
 
 CeruleanCityText_19677:
-	TX_FAR _CeruleanCityText_19677
-	db "@"
+	text_far _CeruleanCityText_19677
+	text_end
 
 CeruleanCityText2:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	jr nz, .asm_4ca20
 	ld hl, CeruleanCityText_196d9
@@ -315,47 +315,47 @@ CeruleanCityText2:
 	jp TextScriptEnd
 
 CeruleanCityText_196d9:
-	TX_FAR _CeruleanCityText_196d9
-	db "@"
+	text_far _CeruleanCityText_196d9
+	text_end
 
 ReceivedTM28Text:
-	TX_FAR _ReceivedTM28Text
-	TX_SFX_ITEM_1
-	TX_FAR _ReceivedTM28Text2
-	TX_WAIT
-	db "@"
+	text_far _ReceivedTM28Text
+	sound_get_item_1
+	text_far _ReceivedTM28Text2
+	text_linkpromptbutton
+	text_end
 
 TM28NoRoomText:
-	TX_FAR _TM28NoRoomText
-	db "@"
+	text_far _TM28NoRoomText
+	text_end
 
 CeruleanCityText_196ee:
-	TX_FAR _CeruleanCityText_196ee
-	db "@"
+	text_far _CeruleanCityText_196ee
+	text_end
 
 CeruleanCityText_196f3:
-	TX_FAR _CeruleanCityText_196f3
-	db "@"
+	text_far _CeruleanCityText_196f3
+	text_end
 
 CeruleanCityText3:
-	TX_FAR _CeruleanCityText3
-	db "@"
+	text_far _CeruleanCityText3
+	text_end
 
 CeruleanCityText4:
-	TX_FAR _CeruleanCityText4
-	db "@"
+	text_far _CeruleanCityText4
+	text_end
 
 CeruleanCityText5:
-	TX_FAR _CeruleanCityText5
-	db "@"
+	text_far _CeruleanCityText5
+	text_end
 
 CeruleanCityText11:
 CeruleanCityText6:
-	TX_FAR _CeruleanCityText6
-	db "@"
+	text_far _CeruleanCityText6
+	text_end
 
 CeruleanCityText7:
-	TX_ASM
+	text_asm
 	ld a, [hRandomAdd]
 	cp 180
 	jr c, .asm_e9fc9
@@ -375,19 +375,19 @@ CeruleanCityText7:
 	jp TextScriptEnd
 
 CeruleanCityText_19730:
-	TX_FAR _CeruleanCityText_19730
-	db "@"
+	text_far _CeruleanCityText_19730
+	text_end
 
 CeruleanCityText_19735:
-	TX_FAR _CeruleanCityText_19735
-	db "@"
+	text_far _CeruleanCityText_19735
+	text_end
 
 CeruleanCityText_1973a:
-	TX_FAR _CeruleanCityText_1973a
-	db "@"
+	text_far _CeruleanCityText_1973a
+	text_end
 
 CeruleanCityText8:
-	TX_ASM
+	text_asm
 	ld a, [hRandomAdd]
 	cp 180
 	jr c, .asm_e28da
@@ -413,41 +413,41 @@ CeruleanCityText8:
 	jp TextScriptEnd
 
 CeruleanCityText_1976f:
-	TX_FAR _CeruleanCityText_1976f
-	db "@"
+	text_far _CeruleanCityText_1976f
+	text_end
 
 CeruleanCityText_19774:
-	TX_FAR _CeruleanCityText_19774
-	db "@"
+	text_far _CeruleanCityText_19774
+	text_end
 
 CeruleanCityText_19779:
-	TX_FAR _CeruleanCityText_19779
-	db "@"
+	text_far _CeruleanCityText_19779
+	text_end
 
 CeruleanCityText_1977e:
-	TX_FAR _CeruleanCityText_1977e
-	db "@"
+	text_far _CeruleanCityText_1977e
+	text_end
 
 CeruleanCityText9:
-	TX_FAR _CeruleanCityText9
-	db "@"
+	text_far _CeruleanCityText9
+	text_end
 
 CeruleanCityText10:
-	TX_FAR _CeruleanCityText10
-	db "@"
+	text_far _CeruleanCityText10
+	text_end
 
 CeruleanCityText12:
-	TX_FAR _CeruleanCityText12
-	db "@"
+	text_far _CeruleanCityText12
+	text_end
 
 CeruleanCityText13:
-	TX_FAR _CeruleanCityText13
-	db "@"
+	text_far _CeruleanCityText13
+	text_end
 
 CeruleanCityText16:
-	TX_FAR _CeruleanCityText16
-	db "@"
+	text_far _CeruleanCityText16
+	text_end
 
 CeruleanCityText17:
-	TX_FAR _CeruleanCityText17
-	db "@"
+	text_far _CeruleanCityText17
+	text_end