Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters

9 files changed, 56 insertions, 55 deletions

diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 4ba50615..d8e593a5 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -180,17 +180,17 @@ Credits:
 	ld a, [de]
 	inc de
 	push de
-	cp $ff
+	cp CRED_TEXT_FADE_MON
 	jr z, .fadeInTextAndShowMon
-	cp $fe
+	cp CRED_TEXT_MON
 	jr z, .showTextAndShowMon
-	cp $fd
+	cp CRED_TEXT_FADE
 	jr z, .fadeInText
-	cp $fc
+	cp CRED_TEXT
 	jr z, .showText
-	cp $fb
+	cp CRED_COPYRIGHT
 	jr z, .showCopyrightText
-	cp $fa
+	cp CRED_THE_END
 	jr z, .showTheEnd
 	push hl
 	push hl
@@ -205,7 +205,7 @@ Credits:
 	ld a, [de]
 	inc de
 	ld c, a
-	ld b, $ff
+	ld b, -1
 	pop hl
 	add hl, bc
 	call PlaceString
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index d874b2fd..f0553eb6 100755
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -257,12 +257,12 @@ HoFMoneyText:
 	db "MONEY@"
 
 DexSeenOwnedText:
-	TX_FAR _DexSeenOwnedText
-	db "@"
+	text_far _DexSeenOwnedText
+	text_end
 
 DexRatingText:
-	TX_FAR _DexRatingText
-	db "@"
+	text_far _DexRatingText
+	text_end
 
 HoFRecordMonInfo:
 	ld hl, wHallOfFame
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index a8151ab4..21f1a885 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -97,7 +97,7 @@ PlayIntroScene:
 ; hip
 	ld a, SFX_INTRO_HIP
 	call PlaySound
-	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE
+	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation3
 	call AnimateIntroNidorino
@@ -129,7 +129,7 @@ PlayIntroScene:
 	call CheckForUserInterruption
 	ret c
 
-	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE
+	ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation6
 	call AnimateIntroNidorino
@@ -140,7 +140,7 @@ PlayIntroScene:
 ; lunge
 	ld a, SFX_INTRO_LUNGE
 	call PlaySound
-	ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / BYTES_PER_TILE
+	ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / LEN_2BPP_TILE
 	ld [wIntroNidorinoBaseTile], a
 	ld de, IntroNidorinoAnimation7
 	jp AnimateIntroNidorino
diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm
index b47cd6c4..b214ec32 100755
--- a/engine/movie/oak_speech/clear_save.asm
+++ b/engine/movie/oak_speech/clear_save.asm
@@ -19,5 +19,5 @@ DoClearSaveDialogue:
 	jp Init
 
 ClearSaveDataText:
-	TX_FAR _ClearSaveDataText
-	db "@"
+	text_far _ClearSaveDataText
+	text_end
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 578cf3b2..0dd0c2dc 100755
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -9,8 +9,8 @@ SetDefaultNames:
 	ld bc, wBoxDataEnd - wPlayerName
 	xor a
 	call FillMemory
-	ld hl, wSpriteStateData1
-	ld bc, $200
+	ld hl, wSpriteDataStart
+	ld bc, wSpriteDataEnd - wSpriteDataStart
 	xor a
 	call FillMemory
 	pop af
@@ -153,22 +153,22 @@ OakSpeech:
 	call GBFadeOutToWhite
 	jp ClearScreen
 OakSpeechText1:
-	TX_FAR _OakSpeechText1
-	db "@"
+	text_far _OakSpeechText1
+	text_end
 OakSpeechText2:
-	TX_FAR _OakSpeechText2A
-	TX_CRY_NIDORINA
-	TX_FAR _OakSpeechText2B
-	db "@"
+	text_far _OakSpeechText2A
+	sound_cry_nidorina
+	text_far _OakSpeechText2B
+	text_end
 IntroducePlayerText:
-	TX_FAR _IntroducePlayerText
-	db "@"
+	text_far _IntroducePlayerText
+	text_end
 IntroduceRivalText:
-	TX_FAR _IntroduceRivalText
-	db "@"
+	text_far _IntroduceRivalText
+	text_end
 OakSpeechText3:
-	TX_FAR _OakSpeechText3
-	db "@"
+	text_far _OakSpeechText3
+	text_end
 
 FadeInIntroPic:
 	ld hl, IntroFadePalettes
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 8c4a896b..743d0d13 100755
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -28,8 +28,8 @@ ChoosePlayerName:
 	jp PrintText
 
 YourNameIsText:
-	TX_FAR _YourNameIsText
-	db "@"
+	text_far _YourNameIsText
+	text_end
 
 ChooseRivalName:
 	call OakSpeechSlidePicRight
@@ -61,8 +61,8 @@ ChooseRivalName:
 	jp PrintText
 
 HisNameIsText:
-	TX_FAR _HisNameIsText
-	db "@"
+	text_far _HisNameIsText
+	text_end
 
 OakSpeechSlidePicLeft:
 	push de
@@ -215,5 +215,5 @@ GetDefaultName:
 
 INCLUDE "data/player_names_list.asm"
 
-TextTerminator_6b20:
-	db "@"
+LinkMenuEmptyText:
+	text_end
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 9cbe5494..5ee9b77f 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -189,7 +189,7 @@ ENDC
 
 ; scroll game version in from the right
 	call PrintGameVersionOnTitleScreen
-	ld a, SCREEN_HEIGHT_PIXELS
+	ld a, SCREEN_HEIGHT_PX
 	ld [hWY], a
 	ld d, 144
 .scrollTitleScreenGameVersionLoop
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 6af6f2e3..8b596e5e 100755
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -785,8 +785,8 @@ PrintTradeWentToText:
 	jp Trade_SlideTextBoxOffScreen
 
 TradeWentToText:
-	TX_FAR _TradeWentToText
-	db "@"
+	text_far _TradeWentToText
+	text_end
 
 PrintTradeForSendsText:
 	ld hl, TradeForText
@@ -797,12 +797,12 @@ PrintTradeForSendsText:
 	jp Trade_Delay80
 
 TradeForText:
-	TX_FAR _TradeForText
-	db "@"
+	text_far _TradeForText
+	text_end
 
 TradeSendsText:
-	TX_FAR _TradeSendsText
-	db "@"
+	text_far _TradeSendsText
+	text_end
 
 PrintTradeFarewellText:
 	ld hl, TradeWavesFarewellText
@@ -814,12 +814,12 @@ PrintTradeFarewellText:
 	jp Trade_SlideTextBoxOffScreen
 
 TradeWavesFarewellText:
-	TX_FAR _TradeWavesFarewellText
-	db "@"
+	text_far _TradeWavesFarewellText
+	text_end
 
 TradeTransferredText:
-	TX_FAR _TradeTransferredText
-	db "@"
+	text_far _TradeTransferredText
+	text_end
 
 PrintTradeTakeCareText:
 	ld hl, TradeTakeCareText
@@ -827,8 +827,8 @@ PrintTradeTakeCareText:
 	jp Trade_Delay80
 
 TradeTakeCareText:
-	TX_FAR _TradeTakeCareText
-	db "@"
+	text_far _TradeTakeCareText
+	text_end
 
 PrintTradeWillTradeText:
 	ld hl, TradeWillTradeText
@@ -839,12 +839,12 @@ PrintTradeWillTradeText:
 	jp Trade_Delay80
 
 TradeWillTradeText:
-	TX_FAR _TradeWillTradeText
-	db "@"
+	text_far _TradeWillTradeText
+	text_end
 
 TradeforText:
-	TX_FAR _TradeforText
-	db "@"
+	text_far _TradeforText
+	text_end
 
 Trade_ShowAnimation:
 	ld [wAnimationID], a
diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm
index 2c79e077..6b744fd8 100755
--- a/engine/movie/trade2.asm
+++ b/engine/movie/trade2.asm
@@ -43,6 +43,7 @@ Trade_PrintEnemyMonInfoText:
 	jp PrintNumber
 
 Trade_MonInfoText:
-	db "──№⠄",$4E
+	db   "──№<DOT>"
+	next ""
 	next "OT/"
-	next $73,"№⠄","@"
+	next "<ID>№<DOT>@"