summaryrefslogtreecommitdiff
path: root/extras/crystal.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-05-23 17:38:15 -0500
committerBryan Bishop <kanzure@gmail.com>2012-05-23 17:38:15 -0500
commit0c778f2930d91dbfde77b75c0147240c713a5085 (patch)
treea9d5776d0428c33cb600e68254352937c2920e4f /extras/crystal.py
parent6c8db52d3b834b5bcaefd307aa5a01abc71b2ee6 (diff)
use PokedexText to parse text-script-like text without the first bash command
Diffstat (limited to 'extras/crystal.py')
-rw-r--r--extras/crystal.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/extras/crystal.py b/extras/crystal.py
index b7b29e721..b0b95b261 100644
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -2319,6 +2319,7 @@ class MainText(TextCommand):
"Write text. Structure: [00][Text][0x50 (ends code)]"
id = 0x0
macro_name = "do_text"
+ use_zero = True
def parse(self):
offset = self.address
@@ -2351,7 +2352,10 @@ class MainText(TextCommand):
if self.size < 2 or len(self.bytes) < 1:
raise Exception, "$0 text command can't end itself with no follow-on bytes"
- output = "db $0"
+ if use_zero:
+ output = "db $0"
+ else:
+ output += "db "
# db $0, $57 or db $0, $50 or w/e
if self.size == 2 and len(self.bytes) == 1:
@@ -2503,6 +2507,9 @@ class MainText(TextCommand):
return output
+class PokedexText(MainText):
+ use_zero = False
+
class WriteTextFromRAM(TextCommand):
"""
Write text from ram. Structure: [01][Ram address (2byte)]