Using text macros

2 files changed, 9 insertions, 11 deletions

diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index ec43e46..ea2b72d 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -57,9 +57,8 @@ TeleportFunction: ; 03:52db
 	ret

 

 .Text_CantFindDestination:

-	db "<NULL>"

-	db "とびさきが　みつかりません"

-	db "<PARA><DONE>"

+	text "とびさきが　みつかりません"

+	para_done

 

 .DoTeleport: ; 03:534b

 	ldh a, [hROMBank]

@@ -78,9 +77,8 @@ TeleportFunction: ; 03:52db
 	ret

 

 .Text_CantUseHere:

-	db "<NULL>"

-	db "ここでは　つかえません！"

-	db "<PARA><DONE>"

+	text "ここでは　つかえません！"

+	para_done

 

 .TeleportScript: ; 03:5375

 	call RefreshScreen

@@ -95,8 +93,6 @@ TeleportFunction: ; 03:52db
 	jpab Functionfcc24

 	

 .Text_ReturnToLastMonCenter:

-	db "<NULL>"

-	db "さいごに　たちよった"

-	db "<LINE>"

-	db "#センターにもどります"

-	db "<DONE>"
\ No newline at end of file
+	text "さいごに　たちよった"

+	line "#センターにもどります"

+	done
\ No newline at end of file
diff --git a/macros/text.asm b/macros/text.asm
index f95c300..bde79dc 100644
--- a/macros/text.asm
+++ b/macros/text.asm
@@ -7,6 +7,8 @@ done   EQUS "db \"<DONE>\""    ; End a text box.
 prompt EQUS "db \"<PROMPT>\""  ; Prompt the player to end a text box (initiating some other event).
 text_end EQUS "db $50"         ; End control code for text processor
                                ; different from @
+							   
+para_done EQUS "db \"<PARA>\",\"<DONE>\"" ;Start a new paragraph and End a text box
 
 ; TODO: determine if these are in
 ; Pokedex text commands are only used with pokered.