summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/macros/text.asm30
-rw-r--r--src/text/text1.asm16
-rw-r--r--src/text/text2.asm148
-rw-r--r--src/text/text3.asm6
-rw-r--r--src/text/text9.asm24
5 files changed, 66 insertions, 158 deletions
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 4a4211a..dd47c02 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -22,35 +22,63 @@ ENDM
textfw0: MACRO
rept _NARG
+if STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+ db \1
+else
db STRCAT("FW0_", \1)
+endc
shift
endr
ENDM
textfw1: MACRO
rept _NARG
+if (\1) == " "
+ db STRCAT("FW0_", \1)
+elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+ db \1
+else
db TX_FULLWIDTH1, STRCAT("FW1_", \1)
+endc
shift
endr
ENDM
textfw2: MACRO
rept _NARG
+if (\1) == " "
+ db STRCAT("FW0_", \1)
+elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+ db \1
+else
db TX_FULLWIDTH2, STRCAT("FW2_", \1)
+endc
shift
endr
ENDM
textfw3: MACRO
rept _NARG
+if (\1) == " "
+ db STRCAT("FW0_", \1)
+elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+ db \1
+else
db TX_FULLWIDTH3, STRCAT("FW3_", \1)
+endc
shift
endr
ENDM
textfw4: MACRO
rept _NARG
- db TX_FULLWIDTH2, STRCAT("FW4_", \1)
+if (\1) == " "
+ db STRCAT("FW0_", \1)
+elif STRSUB(\1, 1, 1) == "<" && STRLEN(\1) > 1
+ db \1
+else
+ db TX_FULLWIDTH4, STRCAT("FW4_", \1)
+endc
shift
endr
ENDM
diff --git a/src/text/text1.asm b/src/text/text1.asm
index ce5da88..4c7e74c 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -306,27 +306,27 @@ Text0046: ; 3681b (d:681b)
done
Text0047: ; 36848 (d:6848)
- db "<GRASS>"
+ textfw0 "<GRASS>"
done
Text0048: ; 3684b (d:684b)
- db "<FIRE>"
+ textfw0 "<FIRE>"
done
Text0049: ; 3684e (d:684e)
- db "<WATER>"
+ textfw0 "<WATER>"
done
Text004a: ; 36851 (d:6851)
- db "<LIGHTNING>"
+ textfw0 "<LIGHTNING>"
done
Text004b: ; 36854 (d:6854)
- db "<FIGHTING>"
+ textfw0 "<FIGHTING>"
done
Text004c: ; 36857 (d:6857)
- db "<PSYCHIC>"
+ textfw0 "<PSYCHIC>"
done
Text004d: ; 3685a (d:685a)
@@ -605,9 +605,9 @@ Text0086: ; 36f31 (d:6f31)
Text0087: ; 36f43 (d:6f43)
textfw3 "B"
- db "<RAMNUM>"
+ textfw0 "<RAMNUM>"
textfw3 "S"
- db "<RAMNUM>"
+ textfw0 "<RAMNUM>"
done
DuelistIsThinkingText: ; 36f4a (d:6f4a)
diff --git a/src/text/text2.asm b/src/text/text2.asm
index 5705f38..cc41751 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -1260,7 +1260,7 @@ Text01da: ; 3b3bb (e:73bb)
done
Text01db: ; 3b3fe (e:73fe)
- text "<RAMNAME>'s turn ", TX_RAM3
+ text "<RAMNAME>'s turn <RAMNUM>"
done
Text01dc: ; 3b40a (e:740a)
@@ -1484,19 +1484,11 @@ Text0212: ; 3b76e (e:776e)
done
Text0213: ; 3b77c (e:777c)
- textfw3 "S", "W", "I", "T", "C", "H"
- textfw0 " "
- textfw3 "T", "O",
- textfw0 " "
- textfw3 "U", "P", "P", "E", "R"
+ textfw3 "S", "W", "I", "T", "C", "H", " ", "T", "O", " ", "U", "P", "P", "E", "R"
done
Text0214: ; 3b799 (e:7799)
- textfw3 "S", "W", "I", "T", "C", "H"
- textfw0 " "
- textfw3 "T", "O",
- textfw0 " "
- textfw3 "L", "O", "W", "E", "R"
+ textfw3 "S", "W", "I", "T", "C", "H", " ", "T", "O", " ", "L", "O", "W", "E", "R"
done
Text0215: ; 3b7b6 (e:77b6)
@@ -1553,10 +1545,8 @@ Text021f: ; 3b819 (e:7819)
textfw0 "お", " ", "こ", " ", "そ", " ", "と", " ", "の", " ", "ほ", " ", "も", " ", "ん", " ", "ろ"
line ""
textfw0 "ゃ", " ", "ゅ", " ", "ょ", " ", "っ", " ", "を", " "
- textfw3 "“"
- textfw0 " "
- textfw3 "º(2)"
- textfw0 " ", "-(2)"
+ textfw3 "“", " ", "º(2)", " "
+ textfw0 "-(2)"
done
Text0220: ; 3b886 (e:7886)
@@ -1571,136 +1561,38 @@ Text0220: ; 3b886 (e:7886)
textfw0 "オ", " ", "コ", " ", "ソ", " ", "ト", " ", "ノ", " ", "ホ", " ", "モ", " ", "ン", " ", "ロ"
line ""
textfw0 "ャ", " ", "ュ", " ", "ョ", " ", "ッ", " ", "ヲ", " "
- textfw3 "“"
- textfw0 " "
- textfw3 "º(2)"
- textfw0 " ", "-(2)"
+ textfw3 "“", " ", "º(2)", " "
+ textfw0 "-(2)"
done
Text0221: ; 3b8f2 (e:78f2)
- textfw3 "A"
- textfw0 " "
- textfw3 "B"
- textfw0 " "
- textfw3 "C"
- textfw0 " "
- textfw3 "D"
- textfw0 " "
- textfw3 "E"
- textfw0 " "
- textfw3 "F"
- textfw0 " "
- textfw3 "G"
- textfw0 " "
- textfw3 "H"
- textfw0 " "
- textfw3 "I"
+ textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
line ""
- textfw3 "J"
- textfw0 " "
- textfw3 "K"
- textfw0 " "
- textfw3 "L"
- textfw0 " "
- textfw3 "M"
- textfw0 " "
- textfw3 "N"
- textfw0 " "
- textfw3 "O"
- textfw0 " "
- textfw3 "P"
- textfw0 " "
- textfw3 "Q"
- textfw0 " "
- textfw3 "R"
+ textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
line ""
- textfw3 "S"
- textfw0 " "
- textfw3 "T"
- textfw0 " "
- textfw3 "U"
- textfw0 " "
- textfw3 "V"
- textfw0 " "
- textfw3 "W"
- textfw0 " "
- textfw3 "X"
- textfw0 " "
- textfw3 "Y"
- textfw0 " "
- textfw3 "Z"
- textfw0 " ", "!"
+ textfw3 "S", " ", "T", " ", "U", " ", "V", " ", "W", " ", "X", " ", "Y", " ", "Z", " "
+ textfw0 "!"
line ""
textfw0 "?", " "
- textfw3 "&"
- textfw0 " ", "+", " ", "-", " ", "·", " ", "0", " ", "1", " ", "2", " ", "3"
+ textfw3 "&", " "
+ textfw0 "+", " ", "-", " ", "·", " ", "0", " ", "1", " ", "2", " ", "3"
line ""
- textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " "
- db "<No>"
- textfw0 " "
- db "<Lv>"
- textfw0 " ", " "
+ textfw0 "4", " ", "5", " ", "6", " ", "7", " ", "8", " ", "9", " ", "<No>", " ", "<Lv>", " ", " "
line ""
textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
done
Text0222: ; 3b97b (e:797b)
- textfw3 "A"
- textfw0 " "
- textfw3 "B"
- textfw0 " "
- textfw3 "C"
- textfw0 " "
- textfw3 "D"
- textfw0 " "
- textfw3 "E"
- textfw0 " "
- textfw3 "F"
- textfw0 " "
- textfw3 "G"
- textfw0 " "
- textfw3 "H"
- textfw0 " "
- textfw3 "I"
+ textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
line ""
- textfw3 "J"
- textfw0 " "
- textfw3 "K"
- textfw0 " "
- textfw3 "L"
- textfw0 " "
- textfw3 "M"
- textfw0 " "
- textfw3 "N"
- textfw0 " "
- textfw3 "O"
- textfw0 " "
- textfw3 "P"
- textfw0 " "
- textfw3 "Q"
- textfw0 " "
- textfw3 "R"
+ textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
line ""
- textfw3 "S"
- textfw0 " "
- textfw3 "T"
- textfw0 " "
- textfw3 "U"
- textfw0 " "
- textfw3 "V"
- textfw0 " "
- textfw3 "W"
- textfw0 " "
- textfw3 "X"
- textfw0 " "
- textfw3 "Y"
- textfw0 " "
- textfw3 "Z"
- textfw0 " ", "!"
+ textfw3 "S", " ", "T", " ", "U", " ", "V", " ", "W", " ", "X", " ", "Y", " ", "Z", " "
+ textfw0 "!"
line ""
textfw0 "?", " "
- textfw3 "&"
- textfw0 " ", "+", " ", "-", " "
+ textfw3 "&", " "
+ textfw0 "+", " ", "-", " "
textfw3 "'"
textfw0 " ", "0", " ", "1", " ", "2", " ", "3"
line ""
diff --git a/src/text/text3.asm b/src/text/text3.asm
index f705781..04d0b05 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1066,7 +1066,7 @@ Text033e: ; 3e834 (f:6834)
done
Text033f: ; 3e85f (f:685f)
- text "Name ", TX_RAM1
+ text "Name <RAMNAME>"
done
Text0340: ; 3e867 (f:6867)
@@ -1295,7 +1295,7 @@ Text0370: ; 3ecb9 (f:6cb9)
text " <RAMNAME> <RAMTEXT>"
line " Master Medals Won "
half2full
- db "<RAMNUM>"
+ textfw0 "<RAMNUM>"
text ""
line " Album "
half2full
@@ -1530,7 +1530,7 @@ Text0394: ; 3f4d6 (f:74d6)
done
Text0395: ; 3f4f3 (f:74f3)
- text "<RAMTEXT> ", TX_RAM2
+ text "<RAMTEXT> <RAMTEXT>"
done
Text0396: ; 3f4f9 (f:74f9)
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 2088d0e..b354edb 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1155,39 +1155,27 @@ Text07f5: ; 5736a (15:736a)
done
Text07f6: ; 5736d (15:736d)
- textfw3 "["
- db "<FIRE>"
- textfw3 "]"
+ textfw3 "[", "<FIRE>", "]"
done
Text07f7: ; 57374 (15:7374)
- textfw3 "["
- db "<LIGHTNING>"
- textfw3 "]"
+ textfw3 "[", "<LIGHTNING>", "]"
done
Text07f8: ; 5737b (15:737b)
- textfw3 "["
- db "<WATER>"
- textfw3 "]"
+ textfw3 "[", "<WATER>", "]"
done
Text07f9: ; 57382 (15:7382)
- textfw3 "["
- db "<FIGHTING>"
- textfw3 "]"
+ textfw3 "[", "<FIGHTING>", "]"
done
Text07fa: ; 57389 (15:7389)
- textfw3 "["
- db "<PSYCHIC>"
- textfw3 "]"
+ textfw3 "[", "<PSYCHIC>", "]"
done
Text07fb: ; 57390 (15:7390)
- textfw3 "["
- db "<GRASS>"
- textfw3 "]"
+ textfw3 "[", "<GRASS>", "]"
done
GrassEnergyName: ; 57397 (15:7397)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 23:34:04 +0000