Clean up files and add entries to charmap

2018-07-24 21:18:23 -07:00
parent 731d6d59bc
commit 156fb472e1
57 changed files with 343 additions and 276 deletions
--- 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
--- 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$"

--- 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$"
--- 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$"

--- 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$"
--- 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
--- 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!”$"

--- 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$"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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$"

--- 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$"
--- 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$"
--- 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
--- 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$"