summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_frontier_2.s2
-rw-r--r--data/maps/MtChimney/scripts.inc2
-rw-r--r--data/maps/Route101/scripts.inc2
-rw-r--r--data/maps/Route102/scripts.inc4
-rw-r--r--data/maps/Route103/scripts.inc2
-rw-r--r--data/maps/Route104/scripts.inc4
-rw-r--r--data/maps/Route110/scripts.inc8
-rw-r--r--data/maps/Route111/scripts.inc8
-rw-r--r--data/maps/Route112/scripts.inc4
-rw-r--r--data/maps/Route113/scripts.inc4
-rw-r--r--data/maps/Route115/scripts.inc2
-rw-r--r--data/maps/Route116/scripts.inc2
-rw-r--r--data/maps/Route117/scripts.inc4
-rw-r--r--data/maps/Route118/scripts.inc4
-rw-r--r--data/maps/Route119/scripts.inc2
-rw-r--r--data/maps/Route120/scripts.inc6
-rw-r--r--data/maps/Route123/scripts.inc6
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc16
-rw-r--r--data/pokemon_summary_screen.s2
-rw-r--r--data/pokenav.s6
-rw-r--r--data/rom_8011DC0.s6
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/strings.s78
-rw-r--r--data/text_input_strings.s20
24 files changed, 98 insertions, 98 deletions
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index 1fbf2a2e1..bbb2a2c62 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -498,7 +498,7 @@ gUnknown_08610970:: @ 8610970
.string "LAMONT$", 8
.string "XAV$", 8
.string "ORFEO$", 8
- .string "J{0xf3}RGEN$", 8 @accent?
+ .string "JÜRGEN$", 8
.string "JORGE$", 8
.byte 0x90, 0xE5
.2byte 0x19
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 28135bb1e..5abd7c176 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -765,7 +765,7 @@ MtChimney_Text_22FFC0: @ 822FFC0
.string "It makes no response whatsoever.$"
MtChimney_Text_22FFFA: @ 822FFFA
- .string "{0x7A} JAGGED PATH\n"
+ .string "{DOWN_ARROW} JAGGED PATH\n"
.string "LAVARIDGE TOWN AHEAD$"
MtChimney_Text_23001D: @ 823001D
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 9593ae59e..97e832761 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -297,5 +297,5 @@ Route101_Text_1EC04A: @ 81EC04A
Route101_Text_1EC0C8: @ 81EC0C8
.string "ROUTE 101\n"
- .string "{0x79} OLDALE TOWN$"
+ .string "{UP_ARROW} OLDALE TOWN$"
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc
index cd817df35..d25794242 100644
--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -112,8 +112,8 @@ Route102_Text_1EC32E: @ 81EC32E
Route102_Text_1EC35B: @ 81EC35B
.string "ROUTE 102\n"
- .string "{0x7C} OLDALE TOWN$"
+ .string "{RIGHT_ARROW} OLDALE TOWN$"
Route102_Text_1EC373: @ 81EC373
.string "ROUTE 102\n"
- .string "{0x7B} PETALBURG CITY$"
+ .string "{LEFT_ARROW} PETALBURG CITY$"
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 8bf597902..14e119cd6 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -364,5 +364,5 @@ Route103_Text_1ECBB5: @ 81ECBB5
Route103_Text_1ECC1A: @ 81ECC1A
.string "ROUTE 103\n"
- .string "{0x7A} OLDALE TOWN$"
+ .string "{DOWN_ARROW} OLDALE TOWN$"
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 83cfe5d92..4755494b6 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -1115,11 +1115,11 @@ Route104_Text_1EDA8C: @ 81EDA8C
Route104_Text_1EDAA1: @ 81EDAA1
.string "ROUTE 1O4\n"
- .string "{0x7C} PETALBURG CITY$"
+ .string "{RIGHT_ARROW} PETALBURG CITY$"
Route104_Text_1EDABC: @ 81EDABC
.string "ROUTE 1O4\n"
- .string "{0x79} RUSTBORO CITY$"
+ .string "{UP_ARROW} RUSTBORO CITY$"
Route104_Text_1EDAD6: @ 81EDAD6
.string "PRETTY PETAL FLOWER SHOP$"
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 40d6a2e69..84d50b454 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -951,7 +951,7 @@ Route110_Text_1F0755: @ 81F0755
Route110_Text_1F0812: @ 81F0812
.string "ROUTE 110\n"
- .string "{0x7A} SLATEPORT CITY$"
+ .string "{DOWN_ARROW} SLATEPORT CITY$"
Route110_Text_1F082D: @ 81F082D
.string "SEASIDE CYCLING ROAD$"
@@ -965,14 +965,14 @@ Route110_Text_1F0842: @ 81F0842
Route110_Text_1F08CD: @ 81F08CD
.string "ROUTE 110\n"
- .string "{0x7B} ROUTE 103$"
+ .string "{LEFT_ARROW} ROUTE 103$"
Route110_Text_1F08E3: @ 81F08E3
.string "SEASIDE PARKING$"
Route110_Text_1F08F3: @ 81F08F3
.string "ROUTE 110\n"
- .string "{0x79} MAUVILLE CITY$"
+ .string "{UP_ARROW} MAUVILLE CITY$"
Route110_Text_1F090D: @ 81F090D
.string "TRAINER TIPS\p"
@@ -987,7 +987,7 @@ Route110_Text_1F0992: @ 81F0992
.string "by pressing SELECT.$"
Route110_Text_1F09DB: @ 81F09DB
- .string "“Three steps {0x7C} and two steps {0x79}\n"
+ .string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n"
.string "to reach the wondrous TRICK HOUSE.”$"
Route110_Text_1F0A1E: @ 81F0A1E
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index fcbf32c91..6be0eba1d 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -676,7 +676,7 @@ Route111_Text_1F186E: @ 81F186E
Route111_Text_1F18CE: @ 81F18CE
.string "ROUTE 111\n"
- .string "{0x7A} MAUVILLE CITY$"
+ .string "{DOWN_ARROW} MAUVILLE CITY$"
Route111_Text_1F18E8: @ 81F18E8
.string "“Our family’s hearts beat as one!”\n"
@@ -684,11 +684,11 @@ Route111_Text_1F18E8: @ 81F18E8
Route111_Text_1F1921: @ 81F1921
.string "ROUTE 111\n"
- .string "{0x7B} ROUTE 112$"
+ .string "{LEFT_ARROW} ROUTE 112$"
Route111_Text_1F1937: @ 81F1937
.string "ROUTE 111\n"
- .string "{0x7B} ROUTE 113$"
+ .string "{LEFT_ARROW} ROUTE 113$"
Route111_Text_1F194D: @ 81F194D
.string "OLD LADY’S REST STOP\n"
@@ -750,7 +750,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
.string "the bike shop in MAUVILLE.$"
Route111_Text_1F1D61: @ 81F1D61
- .string "{0x7C} TRAINER HILL ENTRANCE\p"
+ .string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
.string "“Scale the heights, you hot-blooded\n"
.string "TRAINERS!”$"
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index 0ad5ee47c..4f7e20b94 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -133,7 +133,7 @@ Route112_Text_1F204E: @ 81F204E
Route112_Text_1F20C1: @ 81F20C1
.string "MT. CHIMNEY CABLE CAR\n"
- .string "“A short walk {0x79} way!”$"
+ .string "“A short walk {UP_ARROW} way!”$"
Route112_Text_1F20ED: @ 81F20ED
.string "MT. CHIMNEY\p"
@@ -142,5 +142,5 @@ Route112_Text_1F20ED: @ 81F20ED
Route112_Text_1F2138: @ 81F2138
.string "ROUTE 112\n"
- .string "{0x7B} LAVARIDGE TOWN$"
+ .string "{LEFT_ARROW} LAVARIDGE TOWN$"
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 63dc6c47f..ce2c4b47d 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -157,11 +157,11 @@ Route113_Text_1F23CA: @ 81F23CA
Route113_Text_1F2440: @ 81F2440
.string "ROUTE 113\n"
- .string "{0x7C} ROUTE 111$"
+ .string "{RIGHT_ARROW} ROUTE 111$"
Route113_Text_1F2456: @ 81F2456
.string "ROUTE 113\n"
- .string "{0x7B} FALLARBOR TOWN$"
+ .string "{LEFT_ARROW} FALLARBOR TOWN$"
Route113_Text_1F2471: @ 81F2471
.string "TRAINER TIPS\p"
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 2d4f7c2e3..967f2f9ce 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -154,7 +154,7 @@ Route115_Text_1F2B55: @ 81F2B55
Route115_Text_1F2BC9: @ 81F2BC9
.string "ROUTE 115\n"
- .string "{0x7A} RUSTBORO CITY$"
+ .string "{DOWN_ARROW} RUSTBORO CITY$"
Route115_Text_1F2BE3: @ 81F2BE3
.string "METEOR FALLS\n"
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 68a32c3b5..854411ac1 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -482,7 +482,7 @@ Route116_Text_1F375E: @ 81F375E
Route116_Text_1F379D: @ 81F379D
.string "ROUTE 116\n"
- .string "{0x7B} RUSTBORO CITY$"
+ .string "{LEFT_ARROW} RUSTBORO CITY$"
Route116_Text_1F37B7: @ 81F37B7
.string "RUSTURF TUNNEL\n"
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 55a7b910e..eb04664bd 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -220,11 +220,11 @@ Route117_Text_1F3D41: @ 81F3D41
Route117_Text_1F3D58: @ 81F3D58
.string "ROUTE 117\n"
- .string "{0x7B} VERDANTURF TOWN$"
+ .string "{LEFT_ARROW} VERDANTURF TOWN$"
Route117_Text_1F3D74: @ 81F3D74
.string "ROUTE 117\n"
- .string "{0x7C} MAUVILLE CITY$"
+ .string "{RIGHT_ARROW} MAUVILLE CITY$"
Route117_Text_1F3D8E: @ 81F3D8E
.string "POKéMON DAY CARE\n"
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 818111b81..09fad07e7 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -310,9 +310,9 @@ Route118_Text_1F4367: @ 81F4367
Route118_Text_1F43F4: @ 81F43F4
.string "ROUTE 118\n"
- .string "{0x7B} MAUVILLE CITY$"
+ .string "{LEFT_ARROW} MAUVILLE CITY$"
Route118_Text_1F440E: @ 81F440E
.string "ROUTE 118\n"
- .string "{0x79} ROUTE 119$"
+ .string "{UP_ARROW} ROUTE 119$"
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index a4b6a5fb1..778d925e6 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -622,7 +622,7 @@ Route119_Text_1F52B9: @ 81F52B9
Route119_Text_1F530E: @ 81F530E
.string "ROUTE 119\n"
- .string "{0x7C} FORTREE CITY$"
+ .string "{RIGHT_ARROW} FORTREE CITY$"
Route119_Text_1F5327: @ 81F5327
.string "WEATHER INSTITUTE$"
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 7d6876aeb..50e5742d1 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -459,8 +459,8 @@ Route119_Text_1F5D63: @ 81F5D63
Route120_Text_1F5DCB: @ 81F5DCB
.string "ROUTE 120\n"
- .string "{0x7B} FORTREE CITY$"
+ .string "{LEFT_ARROW} FORTREE CITY$"
Route120_Text_1F5DE4: @ 81F5DE4
- .string "{0x7C} ROUTE 121\n"
- .string "{0x7B} ROUTE 120$"
+ .string "{RIGHT_ARROW} ROUTE 121\n"
+ .string "{LEFT_ARROW} ROUTE 120$"
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index b622a931b..43e48b627 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -201,11 +201,11 @@ Route123_Text_1F64CF: @ 81F64CF
.string "POKéMON. I’m like a tree doctor.$"
Route123_Text_1F6511: @ 81F6511
- .string "{0x7C} ROUTE 123\n"
- .string "{0x7B} ROUTE 118$"
+ .string "{RIGHT_ARROW} ROUTE 123\n"
+ .string "{LEFT_ARROW} ROUTE 118$"
Route123_Text_1F6529: @ 81F6529
- .string "{0x79} MT. PYRE\n"
+ .string "{UP_ARROW} MT. PYRE\n"
.string "“Forbidden to the faint of heart.”$"
Route123_Text_1F6557: @ 81F6557
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 0892b216a..7e64ecaff 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -339,11 +339,11 @@ Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8
.string "Well, if you change your mind, come back.$"
Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
- .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
- .string "{CLEAR_TO}{0x0f}RED SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}FIRE STONE{CLEAR_TO}{0xc8}\p"
- .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
- .string "{CLEAR_TO}{0x06}YELLOW SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x73}THUNDERSTONE{CLEAR_TO}{0xc8}\p"
- .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
- .string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p"
- .string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
- .string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$"
+ .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
+ .string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p"
+ .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
+ .string "{CLEAR_TO 0x06}YELLOW SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x73}THUNDERSTONE{CLEAR_TO 0xc8}\p"
+ .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
+ .string "{CLEAR_TO 0x0c}BLUE SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x79}WATER STONE{CLEAR_TO 0xc8}\p"
+ .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
+ .string "{CLEAR_TO 0x08}GREEN SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}LEAF STONE$"
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
index 85c30bc6f..51e515ccb 100644
--- a/data/pokemon_summary_screen.s
+++ b/data/pokemon_summary_screen.s
@@ -137,7 +137,7 @@ gUnknown_0861CE8E:: @ 861CE8E
.string "{SPECIAL_F7 0x02}$"
gUnknown_0861CE97:: @ 861CE97
- .string "{UNK_CTRL_F9 0x06}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
+ .string "{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
.align 2
gOamData_861CEA0:: @ 861CEA0
diff --git a/data/pokenav.s b/data/pokenav.s
index 9a89e2251..12fd4304a 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -1813,7 +1813,7 @@ gUnknown_086235C8:: @ 86235C8
.align 2
gUnknown_086235D4:: @ 86235D4
- .string "{0x77}$"
+ .string "{UNK_SPACER}$"
.align 2
gUnknown_086235D8:: @ 86235D8
@@ -1860,7 +1860,7 @@ gUnknown_086237E8:: @ 86237E8
.align 2
gUnknown_086237F4:: @ 86237F4
- .string "{0x77}$"
+ .string "{UNK_SPACER}$"
.align 2
gUnknown_086237F8:: @ 86237F8
@@ -1942,7 +1942,7 @@ gUnknown_08624BD8:: @ 8624BD8
.align 2
gUnknown_08624BE4:: @ 8624BE4
- .string "{0x77}$"
+ .string "{UNK_SPACER}$"
.align 2
gUnknown_08624BE8:: @ 8624BE8
diff --git a/data/rom_8011DC0.s b/data/rom_8011DC0.s
index 2d7e09958..2f596606b 100644
--- a/data/rom_8011DC0.s
+++ b/data/rom_8011DC0.s
@@ -53,7 +53,7 @@ gText_Colon:: @ 82ED8C8
.align 2
gText_UnkCtrlCodeF907:: @ 82ED8CC
- .string "{UNK_CTRL_F907}$"
+ .string "{ID}$"
.align 2
gText_PleaseStartOver:: @ 82ED8D0
@@ -194,7 +194,7 @@ gUnknown_082EDB60:: @ 82EDB60
.align 2
gUnknown_082EDBC4:: @ 82EDBC4
- .string "{UNK_CTRL_F801}CANCEL$"
+ .string "{B_BUTTON}CANCEL$"
.align 2
.string "ため\nさんかしゃ ぼしゅうちゅう です！$" @ "tame\nsankasha boshuuchuu desu!"
@@ -889,7 +889,7 @@ gUnknown_082EF7D0:: @ 82EF7D0
.align 2
gUnknown_082EF7DC:: @ 82EF7DC
- .string "{UNK_CTRL_F80A}CHOOSE {UNK_CTRL_F800}JOIN {UNK_CTRL_F801}CANCEL$"
+ .string "{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL$"
.align 2
gUnknown_082EF7F8:: @ 82EF7F8
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index adf02ddd0..96e36dcf9 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1906,7 +1906,7 @@ MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1
.string "Command DODRIO’s three heads to\n"
.string "catch falling BERRIES.\p"
.string "Press right, up, or left on the\n"
- .string "{0xF9}Ç Control Pad to move the heads.\p"
+ .string "{PLUS} Control Pad to move the heads.\p"
.string "To play this game, you must have\n"
.string "a DODRIO.$"
diff --git a/data/strings.s b/data/strings.s
index 631eb8c19..ead89776e 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -140,27 +140,27 @@ gUnknown_085E852C:: @ 85E852C
.align 2
gUnknown_085E8538:: @ 85E8538
- .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$"
+ .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK$"
.align 2
gUnknown_085E8544:: @ 85E8544
- .string "{UNK_CTRL_F800}NEXT$"
+ .string "{A_BUTTON}NEXT$"
.align 2
gUnknown_085E854C:: @ 85E854C
- .string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
+ .string "{A_BUTTON}NEXT {B_BUTTON}BACK$"
.align 2
gText_PickNextCancel:: @ 85E855C
- .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}NEXT {UNK_CTRL_F801}CANCEL$"
+ .string "{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL$"
.align 2
gText_PickCancel:: @ 85E8574
- .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}{UNK_CTRL_F801}CANCEL$"
+ .string "{DPAD_UPDOWN}PICK {A_BUTTON}{B_BUTTON}CANCEL$"
.align 2
gText_UnkCtrlF800Exit:: @ 85E8588
- .string "{UNK_CTRL_F800}EXIT$"
+ .string "{A_BUTTON}EXIT$"
gText_BirchBoy:: @ 85E858F
.string "BOY$"
@@ -616,7 +616,7 @@ gText_LevelSymbol:: @ 85E8D4D
.string "{LV}$"
gText_UnkCtrlF908Clear01:: @ 85E8D4F
- .string "{UNK_CTRL_F908}{CLEAR 0x01}$"
+ .string "{NO}{CLEAR 0x01}$"
gUnknown_085E8D55:: @ 85E8D55
.string "+$"
@@ -625,7 +625,7 @@ gUnknown_085E8D57:: @ 85E8D57
.string "{RIGHT_ARROW}$"
gText_UnkCtrlF907F908:: @ 85E8D59
- .string "{UNK_CTRL_F907}{UNK_CTRL_F908}$"
+ .string "{ID}{NO}$"
gText_Space:: @ 85E8D5E
.string " $"
@@ -807,7 +807,7 @@ gPocketNamesStringsTable:: @ 85E91FC
.align 2
gText_UnkF908Var1Clear7Var2:: @ 85E9210
- .string "{UNK_CTRL_F908}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$"
+ .string "{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$"
gText_ClearTo11Var1Clear5Var2:: @ 85E921A
.string "{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}$"
@@ -824,7 +824,7 @@ gText_Var1DotVar2:: @ 85E9233
.include "data/text/berry_firmness_strings.inc"
gText_UnkF908Var1Var2:: @ 85E9263
- .string "{UNK_CTRL_F908}{STR_VAR_1} {STR_VAR_2}$"
+ .string "{NO}{STR_VAR_1} {STR_VAR_2}$"
gText_BerryTag:: @ 85E926B
.string "BERRY TAG$"
@@ -1453,28 +1453,28 @@ gText_HMMovesCantBeForgotten2:: @ 85EA4CB
.string "HM moves can’t be\nforgotten now.$"
gText_XNatureMetAtYZ:: @ 85EA4EC
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
gText_XNatureHatchedAtYZ:: @ 85EA516
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
gText_XNatureObtainedInTrade:: @ 85EA544
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade.$"
gText_XNatureFatefulEncounter:: @ 85EA56A
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
gText_XNatureProbablyMetAt:: @ 85EA5A8
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
gText_XNature:: @ 85EA5DB
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature$"
gText_XNatureMetSomewhereAt:: @ 85EA5EB
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
gText_XNatureHatchedSomewhereAt:: @ 85EA617
- .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
+ .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
gText_OddEggFoundByCouple:: @ 85EA647
.string "An odd POKéMON EGG found\nby the DAY CARE couple.$"
@@ -2815,37 +2815,37 @@ gUnknown_085EBED5:: @ 85EBED5
.string "{CLEAR 0x80}$"
gUnknown_085EBED9:: @ 85EBED9
- .string "{UNK_CTRL_F800}ZOOM {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}ZOOM {B_BUTTON}CANCEL$"
gUnknown_085EBEE9:: @ 85EBEE9
- .string "{UNK_CTRL_F800}FULL {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}FULL {B_BUTTON}CANCEL$"
gUnknown_085EBEF9:: @ 85EBEF9
- .string "{UNK_CTRL_F800}CONDITION {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}CONDITION {B_BUTTON}CANCEL$"
gUnknown_085EBF0E:: @ 85EBF0E
- .string "{UNK_CTRL_F800}MARKINGS {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}MARKINGS {B_BUTTON}CANCEL$"
gUnknown_085EBF22:: @ 85EBF22
- .string "{UNK_CTRL_F800}SELECT MARK {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL$"
gUnknown_085EBF39:: @ 85EBF39
- .string "{UNK_CTRL_F800}MENU {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}MENU {B_BUTTON}CANCEL$"
gUnknown_085EBF49:: @ 85EBF49
- .string "{UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}OK {B_BUTTON}CANCEL$"
gUnknown_085EBF57:: @ 85EBF57
- .string "{UNK_CTRL_F801}CANCEL$"
+ .string "{B_BUTTON}CANCEL$"
gUnknown_085EBF60:: @ 85EBF60
- .string "{UNK_CTRL_F800}RIBBONS {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}RIBBONS {B_BUTTON}CANCEL$"
gUnknown_085EBF73:: @ 85EBF73
- .string "{UNK_CTRL_F800}CHECK {UNK_CTRL_F801}CANCEL$"
+ .string "{A_BUTTON}CHECK {B_BUTTON}CANCEL$"
gUnknown_085EBF84:: @ 85EBF84
- .string "{UNK_CTRL_F801}CANCEL$"
+ .string "{B_BUTTON}CANCEL$"
gText_NatureSlash:: @ 85EBF8D
.string "NATURE/$"
@@ -3738,7 +3738,7 @@ gText_Sorry:: @ 85ED434
.string "SORRY$"
gText_YayUnkF9F9:: @ 85ED43A
- .string "YAY{UNK_CTRL_F9F9}$"
+ .string "YAY{EMOJI_BIGSMILE}$"
gText_ThankYou:: @ 85ED440
.string "THANK YOU$"
@@ -4049,7 +4049,7 @@ gText_BerryPickingResults:: @ 85EDD49
.string "Announcing BERRY-PICKING results!$"
gText_10P30P50P50P:: @ 85EDD6B
- .string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{UNK_CTRL_F9DD}50P$"
+ .string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{EMOJI_MINUS}50P$"
gText_AnnouncingRankings:: @ 85EDD86
.string "Announcing rankings!$"
@@ -4154,14 +4154,14 @@ gJPText_MysteryGift:: @ 85EDFBF
.string "ふしぎなもらいもの$" @ "fushiginamoraimono" ("Mystery Gift" in Japanese)
gJPText_DecideStop:: @ 85EDFC9
- .string "{UNK_CTRL_F800}けってい {UNK_CTRL_F801}やめる$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese)
+ .string "{A_BUTTON}けってい {B_BUTTON}やめる$" @ "{A_BUTTON}kettei {B_BUTTON}yameru" ("{A_BUTTON}decide {B_BUTTON}stop" in Japanese)
gUnknown_085EDFD6:: @ 85EDFD6
- .string "カードeリーダー{UNK_CTRL_F9 0x04}　で\n"
+ .string "カードeリーダー{PLUS}　で\n"
.string "ふしぎなもらいものを　よみこみます$"
gUnknown_085EDFF5:: @ 85EDFF5
- .string "カードeリーダー{UNK_CTRL_F9 0x04}の　メニューから\n"
+ .string "カードeリーダー{PLUS}の　メニューから\n"
.string "‘つうしん’を　えらび$"
gUnknown_085EE014:: @ 85EE014
@@ -4169,7 +4169,7 @@ gUnknown_085EE014:: @ 85EE014
.string "を　せんたく　してください$"
gUnknown_085EE035:: @ 85EE035
- .string "カードeリーダー{UNK_CTRL_F9 0x04}の　‘つうしん’を\n"
+ .string "カードeリーダー{PLUS}の　‘つうしん’を\n"
.string "えらんで　Aボタンを　おしてください$"
gUnknown_085EE05C:: @ 85EE05C
@@ -4180,7 +4180,7 @@ gUnknown_085EE06B:: @ 85EE06B
.string "ちゅうし　しました$"
gUnknown_085EE080:: @ 85EE080
- .string "カードeリーダー{UNK_CTRL_F9 0x04}と\n"
+ .string "カードeリーダー{PLUS}と\n"
.string "つうしん　できません$"
gUnknown_085EE097:: @ 85EE097
@@ -4195,7 +4195,7 @@ gUnknown_085EE0BF:: @ 85EE0BF
.string "はじめから　やりなおして　ください$"
gUnknown_085EE0DC:: @ 85EE0DC
- .string "カードeリーダー{UNK_CTRL_F9 0x04}　に\n"
+ .string "カードeリーダー{PLUS}　に\n"
.string "カードを　よみこませて　ください$"
gUnknown_085EE0FA:: @ 85EE0FA
@@ -4631,7 +4631,7 @@ gUnknown_085EEA6B:: @ 85EEA6B
.string "SP. DEF$"
gText_UnkCtrlF904:: @ 85EEA73
- .string "{UNK_CTRL_F904}$"
+ .string "{PLUS}$"
gText_Dash:: @ 85EEA76
.string "-$"
@@ -4658,7 +4658,7 @@ gText_TellHimTheWords:: @ 85EEAE2
.string "Tell him the words.$"
gText_MoveOkBack:: @ 85EEAF6
- .string "{UNK_CTRL_F80C}MOVE {UNK_CTRL_F800}OK {UNK_CTRL_F801}BACK$"
+ .string "{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK$"
gText_CallCantBeMadeHere:: @ 85EEB0B
.string "A call can’t be made from here.$"
@@ -5080,11 +5080,11 @@ gText_MysteryGift:: @ 85EF654
.align 2
gText_PickOKExit:: @ 85EF664
- .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}EXIT$"
+ .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT$"
.align 2
gText_PickOKCancel:: @ 85EF678
- .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$"
+ .string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$"
gText_PlayersBattleResults:: @ 85EF68D
.string "{PLAYER}’s BATTLE RESULTS$"
diff --git a/data/text_input_strings.s b/data/text_input_strings.s
index 7219051a7..37d31642b 100644
--- a/data/text_input_strings.s
+++ b/data/text_input_strings.s
@@ -116,31 +116,31 @@ gUnknown_0862BA6B:: @ 862BA6B
.string "$$$$$$$$"
gUnknown_0862BA79:: @ 862BA79
- .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$"
+ .string "{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}$"
gUnknown_0862BA84:: @ 862BA84
- .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$"
+ .string "{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}$"
gUnknown_0862BA8F:: @ 862BA8F
- .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$"
+ .string "{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}$"
gUnknown_0862BA9A:: @ 862BA9A
- .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$"
+ .string "♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}$"
gUnknown_0862BAA3:: @ 862BAA3
- .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$"
+ .string "{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}$"
gUnknown_0862BAAE:: @ 862BAAE
- .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$"
+ .string "{EMOJI_AT}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}$"
gUnknown_0862BAB9:: @ 862BAB9
- .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$"
+ .string "{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}$"
gUnknown_0862BAC4:: @ 862BAC4
- .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$"
+ .string "{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}$"
gUnknown_0862BACF:: @ 862BACF
- .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$"
+ .string "{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}$"
gUnknown_0862BADA:: @ 862BADA
- .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $"
+ .string "{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE};: $"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 10:46:21 +0000