Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters

3 files changed, 31 insertions, 31 deletions

diff --git a/engine/slots/game_corner_slots.asm b/engine/slots/game_corner_slots.asm
index d95d20a3..84f3efdc 100755
--- a/engine/slots/game_corner_slots.asm
+++ b/engine/slots/game_corner_slots.asm
@@ -42,13 +42,13 @@ StartSlotMachine:
 	ret
 
 GameCornerOutOfOrderText::
-	TX_FAR _GameCornerOutOfOrderText
-	db "@"
+	text_far _GameCornerOutOfOrderText
+	text_end
 
 GameCornerOutToLunchText::
-	TX_FAR _GameCornerOutToLunchText
-	db "@"
+	text_far _GameCornerOutToLunchText
+	text_end
 
 GameCornerSomeonesKeysText::
-	TX_FAR _GameCornerSomeonesKeysText
-	db "@"
+	text_far _GameCornerSomeonesKeysText
+	text_end
diff --git a/engine/slots/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm
index 8f6e8374..a4ba4ec1 100755
--- a/engine/slots/game_corner_slots2.asm
+++ b/engine/slots/game_corner_slots2.asm
@@ -1,5 +1,5 @@
 AbleToPlaySlotsCheck:
-	ld a, [wSpriteStateData1 + 2]
+	ld a, [wSpritePlayerStateData1ImageIndex]
 	and $8
 	jr z, .done ; not able
 	ld b, COIN_CASE
@@ -23,9 +23,9 @@ AbleToPlaySlotsCheck:
 	ret
 
 GameCornerCoinCaseText::
-	TX_FAR _GameCornerCoinCaseText
-	db "@"
+	text_far _GameCornerCoinCaseText
+	text_end
 
 GameCornerNoCoinsText::
-	TX_FAR _GameCornerNoCoinsText
-	db "@"
+	text_far _GameCornerNoCoinsText
+	text_end
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index c3de5dd2..3802cdd5 100755
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -53,8 +53,8 @@ PromptUserToPlaySlots:
 	jp CloseTextDisplay
 
 PlaySlotMachineText:
-	TX_FAR _PlaySlotMachineText
-	db "@"
+	text_far _PlaySlotMachineText
+	text_end
 
 MainSlotMachineLoop:
 	call SlotMachine_PrintCreditCoins
@@ -152,24 +152,24 @@ CoinMultiplierSlotMachineText:
 	next "×1@"
 
 OutOfCoinsSlotMachineText:
-	TX_FAR _OutOfCoinsSlotMachineText
-	db "@"
+	text_far _OutOfCoinsSlotMachineText
+	text_end
 
 BetHowManySlotMachineText:
-	TX_FAR _BetHowManySlotMachineText
-	db "@"
+	text_far _BetHowManySlotMachineText
+	text_end
 
 StartSlotMachineText:
-	TX_FAR _StartSlotMachineText
-	db "@"
+	text_far _StartSlotMachineText
+	text_end
 
 NotEnoughCoinsSlotMachineText:
-	TX_FAR _NotEnoughCoinsSlotMachineText
-	db "@"
+	text_far _NotEnoughCoinsSlotMachineText
+	text_end
 
 OneMoreGoSlotMachineText:
-	TX_FAR _OneMoreGoSlotMachineText
-	db "@"
+	text_far _OneMoreGoSlotMachineText
+	text_end
 
 SlotMachine_SetFlags:
 	ld hl, wSlotMachineFlags
@@ -476,7 +476,7 @@ SlotMachine_CheckForMatches:
 	jp .done
 
 SymbolLinedUpSlotMachineText:
-	TX_ASM
+	text_asm
 	push bc
 	call SlotMachine_PrintWinningSymbol
 	ld hl, LinedUpText
@@ -488,8 +488,8 @@ SymbolLinedUpSlotMachineText:
 	ret
 
 LinedUpText:
-	TX_FAR _LinedUpText
-	db "@"
+	text_far _LinedUpText
+	text_end
 
 SlotRewardPointers:
 	dw SlotReward300Func
@@ -518,8 +518,8 @@ SlotReward15Text:
 	db "15@"
 
 NotThisTimeText:
-	TX_FAR _NotThisTimeText
-	db "@"
+	text_far _NotThisTimeText
+	text_end
 
 ; compares the slot machine tiles at bc, de, and hl
 SlotMachine_CheckForMatch:
@@ -609,9 +609,9 @@ SlotReward300Func:
 	ret
 
 YeahText:
-	TX_FAR _YeahText
-	TX_DELAY
-	db "@"
+	text_far _YeahText
+	text_pause
+	text_end
 
 SlotMachine_PrintWinningSymbol:
 ; prints winning symbol and down arrow in text box