diff options
| -rwxr-xr-x | engine/events/overworld.asm | 6 | ||||
| -rw-r--r-- | macros/text.asm | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index ea2b72d..da7c15b 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -58,7 +58,8 @@ TeleportFunction: ; 03:52db .Text_CantFindDestination:
text "とびさきが みつかりません"
- para_done
+ para ""
+ done
.DoTeleport: ; 03:534b
ldh a, [hROMBank]
@@ -78,7 +79,8 @@ TeleportFunction: ; 03:52db .Text_CantUseHere:
text "ここでは つかえません！"
- para_done
+ para ""
+ done
.TeleportScript: ; 03:5375
call RefreshScreen
diff --git a/macros/text.asm b/macros/text.asm index bde79dc..fd88918 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -1,14 +1,20 @@ text EQUS "db $00," ; Start writing text. next EQUS "db \"<NEXT>\"," ; Move a line down. line EQUS "db \"<LINE>\"," ; Start writing at the bottom line. -para EQUS "db \"<PARA>\"," ; Start a new paragraph. cont EQUS "db \"<CONT>\"," ; Scroll to the next line. 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 + +; Start a new paragraph +para: MACRO + if _NARG == 0 + db "<PARA>" + else + db "<PARA>", \1 ; Rest of text + endc +ENDM ; TODO: determine if these are in ; Pokedex text commands are only used with pokered. |