Merge

hg-commit-id: d3bdced550f6

1 files changed, 77 insertions, 149 deletions

diff --git a/main.asm b/main.asm
index 89951106..59ef53c9 100644
--- a/main.asm
+++ b/main.asm
@@ -3329,7 +3329,7 @@ PrintBCDNumber: ; 15CD
 	jr z,.loop\@
 	bit 7,b
 	jr nz,.loop\@
-	ld [hl],$f0 ; currency symbol
+	ld [hl],"¥"
 	inc hl
 .loop\@
 	ld a,[de]
@@ -3368,7 +3368,7 @@ PrintBCDDigit: ; 1604
 ; if bit 7 is set, then no numbers have been printed yet
 	bit 5,b ; print the currency symbol?
 	jr z,.skipCurrencySymbol\@
-	ld [hl],$f0 ; currency symbol
+	ld [hl],"¥"
 	inc hl
 	res 5,b
 .skipCurrencySymbol\@
@@ -5258,66 +5258,25 @@ TextScriptEnd: ; 24D7 24d7
 
 UnnamedText_24db: ; 0x24db
 	TX_FAR _UnnamedText_24db
-	db $50
+	db "@"
 ; 0x24db + 5 bytes
 
 UnnamedText_24e0: ; 0x24e0
 	TX_FAR _UnnamedText_24e0
-	db $50
+	db "@"
 ; 0x24e0 + 5 bytes
 
-VictoryRoad3Text10:
-VictoryRoad3Text9:
-VictoryRoad3Text8:
-VictoryRoad3Text7:
-VictoryRoad2Text13:
-VictoryRoad2Text12:
-VictoryRoad2Text11:
-SeafoamIslands1Text2:
-SeafoamIslands1Text1:
-SeafoamIslands5Text2:
-SeafoamIslands5Text1:
-SeafoamIslands4Text6:
-SeafoamIslands4Text5:
-SeafoamIslands4Text4:
-SeafoamIslands4Text3:
-SeafoamIslands4Text2:
-SeafoamIslands4Text1:
-SeafoamIslands3Text2:
-SeafoamIslands3Text1:
-SeafoamIslands2Text2:
-SeafoamIslands2Text1:
-FuchsiaHouse2Text3:
-VictoryRoad1Text7:
-VictoryRoad1Text6:
-VictoryRoad1Text5: ; 0x24e5
-	TX_FAR _VictoryRoad1Text5
-	db $50
-
-SaffronCityText19:
-CinnabarIslandText4:
-FuchsiaCityText14:
-VermilionCityText9:
-LavenderTownText6:
-CeruleanCityText14:
-PewterCityText8:
-ViridianCityText11: ; 0x24ea
-	TX_FAR _ViridianCityText11
-	db $50
-
-PewterCityText9:
-CeruleanCityText15:
-LavenderTownText7:
-VermilionCityText10:
-CeladonCityText12:
-FuchsiaCityText15:
-CinnabarIslandText5:
-SaffronCityText23:
-Route4Text4:
-Route10Text8:
-ViridianCityText12: ; 0x24ef
-	TX_FAR _ViridianCityText12
-	db $50
+BoulderText: ; 0x24e5
+	TX_FAR _BoulderText
+	db "@"
+
+MartSignText: ; 0x24ea
+	TX_FAR _MartSignText
+	db "@"
+
+PokeCenterSignText: ; 0x24ef
+	TX_FAR _PokeCenterSignText
+	db "@"
 
 Route2Text1:
 Route4Text3:
@@ -6175,7 +6134,7 @@ DisplayChooseQuantityMenu: ; 2D57
 	ret
 
 InitialQuantityText: ; 2E30
-	db $f1,"01@"
+	db "×01@"
 
 SpacesBetweenQuantityAndPriceText: ; 2E34
 	db "      @"
@@ -6340,7 +6299,7 @@ PrintListMenuEntries: ; 2E5A
 	push hl
 	ld bc,20 + 8 ; 1 row down and 8 columns right
 	add hl,bc
-	ld a,$f1
+	ld a,"×"
 	ldi [hl],a
 	ld a,[$d11e]
 	push af
@@ -21261,7 +21220,7 @@ CeladonCityObject: ; 0x18022 (size=189)
 	db $9 ; signs
 	db $f, $1b, $a ; CeladonCityText10
 	db $f, $13, $b ; CeladonCityText11
-	db $9, $2a, $c ; CeladonCityText12
+	db $9, $2a, $c ; PokeCenterSignText
 	db $1d, $d, $d ; CeladonCityText13
 	db $9, $15, $e ; CeladonCityText14
 	db $d, $c, $f ; CeladonCityText15
@@ -21395,8 +21354,8 @@ ViridianCityObject: ; 0x18384 (size=104)
 	db $11, $11, $8 ; ViridianCityText8
 	db $1, $13, $9 ; ViridianCityText9
 	db $1d, $15, $a ; ViridianCityText10
-	db $13, $1e, $b ; ViridianCityText11
-	db $19, $18, $c ; ViridianCityText12
+	db $13, $1e, $b ; MartSignText
+	db $19, $18, $c ; PokeCenterSignText
 	db $7, $1b, $d ; ViridianCityText13
 
 	db $7 ; people
@@ -21462,8 +21421,8 @@ PewterCityObject: ; 0x18577 (size=111)
 	db $7 ; signs
 	db $1d, $13, $6 ; PewterCityText6
 	db $13, $21, $7 ; PewterCityText7
-	db $11, $18, $8 ; PewterCityText8
-	db $19, $e, $9 ; PewterCityText9
+	db $11, $18, $8 ; MartSignText
+	db $19, $e, $9 ; PokeCenterSignText
 	db $9, $f, $a ; PewterCityText10
 	db $11, $b, $b ; PewterCityText11
 	db $17, $19, $c ; PewterCityText12
@@ -21545,8 +21504,8 @@ CeruleanCityObject: ; 0x18786 (size=170)
 	db $6 ; signs
 	db $13, $17, $c ; CeruleanCityText12
 	db $1d, $11, $d ; CeruleanCityText13
-	db $19, $1a, $e ; CeruleanCityText14
-	db $11, $14, $f ; CeruleanCityText15
+	db $19, $1a, $e ; MartSignText
+	db $11, $14, $f ; PokeCenterSignText
 	db $19, $b, $10 ; CeruleanCityText16
 	db $15, $1b, $11 ; CeruleanCityText17
 
@@ -21621,8 +21580,8 @@ VermilionCityObject: ; 0x189ba (size=133)
 	db $7 ; signs
 	db $3, $1b, $7 ; VermilionCityText7
 	db $d, $25, $8 ; VermilionCityText8
-	db $d, $18, $9 ; VermilionCityText9
-	db $3, $c, $a ; VermilionCityText10
+	db $d, $18, $9 ; MartSignText
+	db $3, $c, $a ; PokeCenterSignText
 	db $d, $7, $b ; VermilionCityText11
 	db $13, $7, $c ; VermilionCityText12
 	db $f, $1d, $d ; VermilionCityText13
@@ -21700,8 +21659,8 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
 	db $17, $f, $b ; FuchsiaCityText11
 	db $f, $19, $c ; FuchsiaCityText12
 	db $5, $11, $d ; FuchsiaCityText13
-	db $d, $6, $e ; FuchsiaCityText14
-	db $1b, $14, $f ; FuchsiaCityText15
+	db $d, $6, $e ; MartSignText
+	db $1b, $14, $f ; PokeCenterSignText
 	db $1d, $1b, $10 ; FuchsiaCityText16
 	db $f, $15, $11 ; FuchsiaCityText17
 	db $1d, $5, $12 ; FuchsiaCityText18
@@ -21983,7 +21942,7 @@ ViridianCityScript0: ; 0x19005
 INCBIN "baserom.gbc",$1900b,$d9
 
 ViridianCityTexts: ; 0x190e4
-	dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, ViridianCityText11, ViridianCityText12, ViridianCityText13, ViridianCityText14, ViridianCityText15
+	dw ViridianCityText1, ViridianCityText2, ViridianCityText3, ViridianCityText4, ViridianCityText5, ViridianCityText6, ViridianCityText7, ViridianCityText8, ViridianCityText9, ViridianCityText10, MartSignText, PokeCenterSignText, ViridianCityText13, ViridianCityText14, ViridianCityText15
 
 ViridianCityText1: ; 0x19102
 	TX_FAR _ViridianCityText1
@@ -22214,7 +22173,7 @@ PewterCityScript0: ; 0x19251
 INCBIN "baserom.gbc",$1925e,$12d
 
 PewterCityTexts: ; 0x1938b
-	dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, PewterCityText8, PewterCityText9, PewterCityText10, PewterCityText11, PewterCityText12, PewterCityText13, PewterCityText14
+	dw PewterCityText1, PewterCityText2, PewterCityText3, PewterCityText4, PewterCityText5, PewterCityText6, PewterCityText7, MartSignText, PokeCenterSignText, PewterCityText10, PewterCityText11, PewterCityText12, PewterCityText13, PewterCityText14
 
 PewterCityText1: ; 0x193a7
 	TX_FAR _PewterCityText1
@@ -22547,7 +22506,7 @@ CeruleanCityScript3: ; 0x19610
 ; 0x1962d
 
 CeruleanCityTexts: ; 0x1962d
-	dw CeruleanCityText1, CeruleanCityText2, CeruleanCityText3, CeruleanCityText4, CeruleanCityText5, CeruleanCityText6, CeruleanCityText7, CeruleanCityText8, CeruleanCityText9, CeruleanCityText10, CeruleanCityText11, CeruleanCityText12, CeruleanCityText13, CeruleanCityText14, CeruleanCityText15, CeruleanCityText16, CeruleanCityText17
+	dw CeruleanCityText1, CeruleanCityText2, CeruleanCityText3, CeruleanCityText4, CeruleanCityText5, CeruleanCityText6, CeruleanCityText7, CeruleanCityText8, CeruleanCityText9, CeruleanCityText10, CeruleanCityText11, CeruleanCityText12, CeruleanCityText13, MartSignText, PokeCenterSignText, CeruleanCityText16, CeruleanCityText17
 
 CeruleanCityText1: ; 0x1964f
 	db $08 ; asm
@@ -22846,7 +22805,7 @@ VermilionCityScript1: ; 0x1985f
 ; 0x1986f
 
 VermilionCityTexts: ; 0x1986f
-	dw VermilionCityText1, VermilionCityText2, VermilionCityText3, VermilionCityText4, VermilionCityText5, VermilionCityText6, VermilionCityText7, VermilionCityText8, VermilionCityText9, VermilionCityText10, VermilionCityText11, VermilionCityText12, VermilionCityText13
+	dw VermilionCityText1, VermilionCityText2, VermilionCityText3, VermilionCityText4, VermilionCityText5, VermilionCityText6, VermilionCityText7, VermilionCityText8, MartSignText, PokeCenterSignText, VermilionCityText11, VermilionCityText12, VermilionCityText13
 
 VermilionCityText1: ; 0x19889
 	TX_FAR _VermilionCityText1
@@ -22994,7 +22953,7 @@ CeladonCityScript: ; 0x19956
 ; 0x19966
 
 CeladonCityTexts: ; 0x19966
-	dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, CeladonCityText12, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
+	dw CeladonCityText1, CeladonCityText2, CeladonCityText3, CeladonCityText4, CeladonCityText5, CeladonCityText6, CeladonCityText7, CeladonCityText8, CeladonCityText9, CeladonCityText10, CeladonCityText11, PokeCenterSignText, CeladonCityText13, CeladonCityText14, CeladonCityText15, CeladonCityText16, CeladonCityText17, CeladonCityText18
 
 CeladonCityText1: ; 0x1998a
 	TX_FAR _CeladonCityText1
@@ -23113,7 +23072,7 @@ FuchsiaCityScript: ; 0x19a2b
 ; 0x19a2e
 
 FuchsiaCityTexts: ; 0x19a2e
-	dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, FuchsiaCityText14, FuchsiaCityText15, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24
+	dw FuchsiaCityText1, FuchsiaCityText2, FuchsiaCityText3, FuchsiaCityText4, FuchsiaCityText5, FuchsiaCityText6, FuchsiaCityText7, FuchsiaCityText8, FuchsiaCityText9, FuchsiaCityText10, FuchsiaCityText11, FuchsiaCityText12, FuchsiaCityText13, MartSignText, PokeCenterSignText, FuchsiaCityText16, FuchsiaCityText17, FuchsiaCityText18, FuchsiaCityText19, FuchsiaCityText20, FuchsiaCityText21, FuchsiaCityText22, FuchsiaCityText23, FuchsiaCityText24
 
 FuchsiaCityText1: ; 0x19a5e
 	TX_FAR _FuchsiaCityText1
@@ -24178,8 +24137,8 @@ CinnabarIslandObject: ; 0x1c022 (size=71)
 
 	db $5 ; signs
 	db $5, $9, $3 ; CinnabarIslandText3
-	db $b, $10, $4 ; CinnabarIslandText4
-	db $b, $c, $5 ; CinnabarIslandText5
+	db $b, $10, $4 ; MartSignText
+	db $b, $c, $5 ; PokeCenterSignText
 	db $b, $9, $6 ; CinnabarIslandText6
 	db $3, $d, $7 ; CinnabarIslandText7
 
@@ -24534,7 +24493,7 @@ CinnabarIslandScript1: ; 0x1ca73
 ; 0x1ca81
 
 CinnabarIslandTexts: ; 0x1ca81
-	dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, CinnabarIslandText4, CinnabarIslandText5, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8
+	dw CinnabarIslandText1, CinnabarIslandText2, CinnabarIslandText3, MartSignText, PokeCenterSignText, CinnabarIslandText6, CinnabarIslandText7, CinnabarIslandText8
 
 CinnabarIslandText8: ; 0x1ca91
 	TX_FAR _CinnabarIslandText8
@@ -43097,8 +43056,8 @@ LavenderTownObject: ; 0x4402d (size=88)
 	db $6 ; signs
 	db $9, $b, $4 ; LavenderTownText4
 	db $3, $9, $5 ; LavenderTownText5
-	db $d, $10, $6 ; LavenderTownText6
-	db $5, $4, $7 ; LavenderTownText7
+	db $d, $10, $6 ; MartSignText
+	db $5, $4, $7 ; PokeCenterSignText
 	db $9, $5, $8 ; LavenderTownText8
 	db $7, $11, $9 ; LavenderTownText9
 
@@ -43129,7 +43088,7 @@ LavenderTownScript: ; 0x4410b
 ; 0x4410e
 
 LavenderTownTexts: ; 0x4410e
-	dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, LavenderTownText6, LavenderTownText7, LavenderTownText8, LavenderTownText9
+	dw LavenderTownText1, LavenderTownText2, LavenderTownText3, LavenderTownText4, LavenderTownText5, MartSignText, PokeCenterSignText, LavenderTownText8, LavenderTownText9
 
 LavenderTownText1: ; 0x44120
 	db $08 ; asm
@@ -43752,7 +43711,7 @@ SeafoamIslands1Script_Unknown44846: ; 0x44846
 INCBIN "baserom.gbc",$44846,$5
 
 SeafoamIslands1Texts: ; 0x4484b
-	dw SeafoamIslands1Text1, SeafoamIslands1Text2
+	dw BoulderText, BoulderText
 
 SeafoamIslands1Object: ; 0x4484f (size=72)
 	db $7d ; border tile
@@ -43847,7 +43806,7 @@ VictoryRoad3Script_Unknown44996: ; 0x44996
 INCBIN "baserom.gbc",$44996,$8e
 
 VictoryRoad3Texts: ; 0x44a24
-	dw VictoryRoad3Text1, VictoryRoad3Text2, VictoryRoad3Text3, VictoryRoad3Text4, VictoryRoad3Text5, VictoryRoad3Text6, VictoryRoad3Text7, VictoryRoad3Text8, VictoryRoad3Text9, VictoryRoad3Text10
+	dw VictoryRoad3Text1, VictoryRoad3Text2, VictoryRoad3Text3, VictoryRoad3Text4, VictoryRoad3Text5, VictoryRoad3Text6, BoulderText, BoulderText, BoulderText, BoulderText
 
 VictoryRoad3TrainerHeaders:
 VictoryRoad3TrainerHeader0: ; 0x44a38
@@ -45616,7 +45575,7 @@ SeafoamIslands2Script_Unknown4636d: ; 0x4636d
 INCBIN "baserom.gbc",$4636d,$5
 
 SeafoamIslands2Texts: ; 0x46372
-	dw SeafoamIslands2Text1, SeafoamIslands2Text2
+	dw BoulderText, BoulderText
 
 SeafoamIslands2Object: ; 0x46376 (size=72)
 	db $7d ; border tile
@@ -45701,7 +45660,7 @@ SeafoamIslands3Script_Unknown464a9: ; 0x464a9
 INCBIN "baserom.gbc",$464a9,$5
 
 SeafoamIslands3Texts: ; 0x464ae
-	dw SeafoamIslands3Text1, SeafoamIslands3Text2
+	dw BoulderText, BoulderText
 
 SeafoamIslands3Object: ; 0x464b2 (size=72)
 	db $7d ; border tile
@@ -45845,7 +45804,7 @@ SeafoamIslands4Script3: ; 0x4668f
 ; 0x4669a
 
 SeafoamIslands4Texts: ; 0x4669a
-	dw SeafoamIslands4Text1, SeafoamIslands4Text2, SeafoamIslands4Text3, SeafoamIslands4Text4, SeafoamIslands4Text5, SeafoamIslands4Text6
+	dw BoulderText, BoulderText, BoulderText, BoulderText, BoulderText, BoulderText
 
 SeafoamIslands4Object: ; 0x466a6 (size=96)
 	db $7d ; border tile
@@ -45948,7 +45907,7 @@ SeafoamIslands5Script1: ; 0x46807
 INCBIN "baserom.gbc",$46816,$66
 
 SeafoamIslands5Texts: ; 0x4687c
-	dw SeafoamIslands5Text1, SeafoamIslands5Text2, SeafoamIslands5Text3, SeafoamIslands5Text4, SeafoamIslands5Text5
+	dw BoulderText, BoulderText, SeafoamIslands5Text3, SeafoamIslands5Text4, SeafoamIslands5Text5
 
 SeafoamIslands5TrainerHeaders:
 SeafoamIslands5TrainerHeader0: ; 0x46886
@@ -50336,11 +50295,11 @@ SaffronCityObject: ; 0x509dc (size=188)
 	db $5, $11, $10 ; SaffronCityText16
 	db $5, $1b, $11 ; SaffronCityText17
 	db $5, $23, $12 ; SaffronCityText18
-	db $b, $1a, $13 ; SaffronCityText19
+	db $b, $1a, $13 ; MartSignText
 	db $13, $27, $14 ; SaffronCityText20
 	db $15, $5, $15 ; SaffronCityText21
 	db $15, $f, $16 ; SaffronCityText22
-	db $1d, $a, $17 ; SaffronCityText23
+	db $1d, $a, $17 ; PokeCenterSignText
 	db $1d, $1b, $18 ; SaffronCityText24
 	db $13, $1, $19 ; SaffronCityText25
 
@@ -50379,7 +50338,7 @@ SaffronCityScript: ; 0x50c00
 ; 0x50c03
 
 SaffronCityTexts: ; 0x50c03
-	dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, SaffronCityText19, SaffronCityText20, SaffronCityText21, SaffronCityText22, SaffronCityText23, SaffronCityText24, SaffronCityText25
+	dw SaffronCityText1, SaffronCityText2, SaffronCityText3, SaffronCityText4, SaffronCityText5, SaffronCityText6, SaffronCityText7, SaffronCityText8, SaffronCityText9, SaffronCityText10, SaffronCityText11, SaffronCityText12, SaffronCityText13, SaffronCityText14, SaffronCityText15, SaffronCityText16, SaffronCityText17, SaffronCityText18, MartSignText, SaffronCityText20, SaffronCityText21, SaffronCityText22, PokeCenterSignText, SaffronCityText24, SaffronCityText25
 
 SaffronCityText1: ; 0x50c35
 	TX_FAR _SaffronCityText1
@@ -51787,7 +51746,7 @@ VictoryRoad2Script_Unknown517c4: ; 0x517c4
 INCBIN "baserom.gbc",$517c4,$57
 
 VictoryRoad2Texts: ; 0x5181b
-	dw VictoryRoad2Text1, VictoryRoad2Text2, VictoryRoad2Text3, VictoryRoad2Text4, VictoryRoad2Text5, VictoryRoad2Text6, VictoryRoad2Text7, VictoryRoad2Text8, VictoryRoad2Text9, VictoryRoad2Text10, VictoryRoad2Text11, VictoryRoad2Text12, VictoryRoad2Text13
+	dw VictoryRoad2Text1, VictoryRoad2Text2, VictoryRoad2Text3, VictoryRoad2Text4, VictoryRoad2Text5, VictoryRoad2Text6, VictoryRoad2Text7, VictoryRoad2Text8, VictoryRoad2Text9, VictoryRoad2Text10, BoulderText, BoulderText, BoulderText
 
 VictoryRoad2TrainerHeaders:
 VictoryRoad2TrainerHeader0: ; 0x51835
@@ -53404,7 +53363,7 @@ Route4Object: ; 0x543b2 (size=58)
 	db $5, $18, $7, MT_MOON_2
 
 	db $3 ; signs
-	db $5, $c, $4 ; Route4Text4
+	db $5, $c, $4 ; PokeCenterSignText
 	db $7, $11, $5 ; Route4Text5
 	db $7, $1b, $6 ; Route4Text6
 
@@ -54092,7 +54051,7 @@ Unknown_5566b: ; 0x5566b
 INCBIN "baserom.gbc",$5566b,$6
 
 Route4Texts: ; 0x55671
-	dw Route4Text1, Route4Text2, Route4Text3, Route4Text4, Route4Text5, Route4Text6
+	dw Route4Text1, Route4Text2, Route4Text3, PokeCenterSignText, Route4Text5, Route4Text6
 
 Route4TrainerHeaders:
 Route4TrainerHeader0: ; 0x5567d
@@ -56921,7 +56880,7 @@ Route10Object: ; 0x582f6 (size=96)
 
 	db $4 ; signs
 	db $13, $7, $7 ; Route10Text7
-	db $13, $c, $8 ; Route10Text8
+	db $13, $c, $8 ; PokeCenterSignText
 	db $37, $9, $9 ; Route10Text9
 	db $29, $5, $a ; Route10Text10
 
@@ -57847,7 +57806,7 @@ Route10_Unknown59349: ; 0x59349
 INCBIN "baserom.gbc",$59349,$6
 
 Route10Texts: ; 0x5934f
-	dw Route10Text1, Route10Text2, Route10Text3, Route10Text4, Route10Text5, Route10Text6, Route10Text7, Route10Text8, Route10Text9, Route10Text10
+	dw Route10Text1, Route10Text2, Route10Text3, Route10Text4, Route10Text5, Route10Text6, Route10Text7, PokeCenterSignText, Route10Text9, Route10Text10
 
 Route10TrainerHeaders:
 Route10TrainerHeader0: ; 0x59363
@@ -63292,7 +63251,7 @@ VictoryRoad1Script: ; 0x5da0a
 INCBIN "baserom.gbc",$5da27,$38
 
 VictoryRoad1Texts: ; 0x5da5f
-	dw VictoryRoad1Text1, VictoryRoad1Text2, VictoryRoad1Text3, VictoryRoad1Text4, VictoryRoad1Text5, VictoryRoad1Text6, VictoryRoad1Text7
+	dw VictoryRoad1Text1, VictoryRoad1Text2, VictoryRoad1Text3, VictoryRoad1Text4, BoulderText, BoulderText, BoulderText
 
 VictoryRoad1TrainerHeaders:
 VictoryRoad1TrainerHeader0: ; 0x5da6d
@@ -68774,9 +68733,9 @@ Unnamed_74f9e: ; 0x74f9e
 	db "SODA POP",$4E
 	db "LEMONADE",$4E
 	db "CANCEL@"
-	db $F0,"200",$4E
-	db $F0,"300",$4E
-	db $F0,"350",$4E,"@"
+	db "¥200",$4E
+	db "¥300",$4E
+	db "¥350",$4E,"@"
 
 UnnamedText_74fd3: ; 0x74fd3
 	TX_FAR _UnnamedText_74fd3
@@ -68928,7 +68887,7 @@ FuchsiaHouse2Script: ; 0x750b5
 ; 0x750b8
 
 FuchsiaHouse2Texts: ; 0x750b8
-	dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, FuchsiaHouse2Text3, FuchsiaHouse2Text4, FuchsiaHouse2Text5
+	dw FuchsiaHouse2Text1, FuchsiaHouse2Text2, BoulderText, FuchsiaHouse2Text4, FuchsiaHouse2Text5
 
 FuchsiaHouse2Text1: ; 0x750c2
 	db $08 ; asm
@@ -72769,47 +72728,16 @@ _UnnamedText_24e0: ; 0x80096
 	db "somewhere!", $57
 ; 0x80096 + 27 bytes
 
-_VictoryRoad3Text10:
-_VictoryRoad3Text9:
-_VictoryRoad3Text8:
-_VictoryRoad3Text7:
-_VictoryRoad2Text13:
-_VictoryRoad2Text12:
-_VictoryRoad2Text11:
-_SeafoamIslands1Text2:
-_SeafoamIslands1Text1:
-_SeafoamIslands5Text2:
-_SeafoamIslands5Text1:
-_SeafoamIslands4Text6:
-_SeafoamIslands4Text5:
-_SeafoamIslands4Text4:
-_SeafoamIslands4Text3:
-_SeafoamIslands4Text2:
-_SeafoamIslands4Text1:
-_SeafoamIslands3Text2:
-_SeafoamIslands3Text1:
-_SeafoamIslands2Text2:
-_SeafoamIslands2Text1:
-_FuchsiaHouse2Text3:
-_VictoryRoad1Text7:
-_VictoryRoad1Text6:
-_VictoryRoad1Text5: ; 0x800b1
+_BoulderText: ; 0x800b1
 	db $0, "This requires", $4f
 	db "STRENGTH to move!", $57
 
-_SaffronCityText19:
-_CinnabarIslandText4:
-_FuchsiaCityText14:
-_VermilionCityText9:
-_LavenderTownText6:
-_CeruleanCityText14:
-_PewterCityText8:
-_ViridianCityText11: ; 0x800d2
+_MartSignText: ; 0x800d2
 	db $0, "All your item", $4f
 	db "needs fulfilled!", $55
 	db "#MON MART", $57
 
-_ViridianCityText12: ; 0x800fc
+_PokeCenterSignText: ; 0x800fc
 	db $0, "Heal Your #MON!", $4f
 	db "#MON CENTER", $57
 
@@ -76582,7 +76510,7 @@ _UnnamedText_3c63e: ; 0x896c7
 ; 0x896c7 + 22 bytes = 0x896dd
 
 _UnnamedText_3c6e4: ; 0x896dd
-	db $0, $52, " got ", $f0, "@"
+	db $0, $52, " got ¥@"
 	;XXX $2
 	db $2, $79, $d0, $c3
 	db $0, $4f
@@ -77036,7 +76964,7 @@ SafariZoneAngryText: ; 0x89d6a
 ; $2, pointer, byte
 _UnnamedText_1386b: ; 0x89d80
 	db $0, $52, " picked up", $4f
-	db $f0, "@"
+	db "¥@"
 	db $2, $e5, $cc, $c3
 	db $0, "!", $58
 
@@ -77498,7 +77426,7 @@ _UnnamedText_4935c: ; 0x8a976
 	db "just for you!", $51
 	db "I'll let you have", $4f
 	db "a swell MAGIKARP", $55
-	db "for just ", $f0, "500!", $55
+	db "for just ¥500!", $55
 	db "What do you say?", $57
 ; 0x8a976 + 118 bytes
 
@@ -77605,7 +77533,7 @@ UnknownText_8ac67: ; 0x8ac67
 ; 0x8ac67 + 22 bytes
 
 _UnnamedText_56428: ; 0x8ac7d
-	db $0, "You owe me ", $f0, "@"
+	db $0, "You owe me ¥@"
 ; 0x8ac7d + 14 bytes
 
 ;XXX
@@ -77674,7 +77602,7 @@ _UnnamedText_5644f: ; 0x8c090
 
 _UnnamedText_56454: ; 0x8c0ad
 	db $0, "Hey, you don't", $4f
-	db "have enough ", $f0, "!", $57
+	db "have enough ¥!", $57
 ; 0x8c0ad + 30 bytes
 
 _UndergroundTunnelEntranceRoute6Text1: ; 0x8c0cb
@@ -77735,7 +77663,7 @@ _RockTunnelPokecenterText1: ; 0x8c2c0
 
 _RockTunnelPokecenterText3: ; 0x8c316
 	db $0, "I sold a useless", $4f
-	db "NUGGET for ", $f0, "5000!", $57
+	db "NUGGET for ¥5000!", $57
 
 _UnnamedText_44588: ; 0x8c33a
 	db $0, "This tunnel goes", $4f
@@ -82289,14 +82217,14 @@ _UnnamedText_5c21a: ; 0x9652c
 ; 0x9652c + 13 bytes
 
 _UnnamedText_5c21f: ; 0x96539
-	db $0, "It's ", $f0, "50 for a", $4f
+	db $0, "It's ¥50 for a", $4f
 	db "child's ticket.", $51
 	db "Would you like to", $4f
 	db "come in?", $57
 ; 0x96539 + 57 bytes
 
 _UnnamedText_5c224: ; 0x96572
-	db $0, "Right, ", $f0, "50!", $4f
+	db $0, "Right, ¥50!", $4f
 	db "Thank you!", $57
 ; 0x96572 + 24 bytes
 
@@ -82597,7 +82525,7 @@ _UnnamedText_74cc6: ; 0x985ac
 	db "this really weird", $55
 	db "fish #MON!", $51
 	db "It's totally weak", $4f
-	db "and it cost ", $f0, "500!", $57
+	db "and it cost ¥500!", $57
 ; 0x985ac + 96 bytes
 
 _UnnamedText_74cd5: ; 0x9860c
@@ -83466,7 +83394,7 @@ _UnnamedText_5c958: ; 0x9a1e3
 	db "in the mountains.", $51
 	db "I thought it was", $4f
 	db "useless, but it", $55
-	db "sold for ", $f0, "5000!", $57
+	db "sold for ¥5000!", $57
 ; 0x9a1e3 + 85 bytes
 
 _LavenderHouse2Text1: ; 0x9a238
@@ -84535,7 +84463,7 @@ _UnnamedText_48d22: ; 0x9d91a
 	db "GAME CORNER!", $51
 	db "Do you need some", $4f
 	db "game coins?", $51
-	db "It's ", $f0, "1000 for 50", $4f
+	db "It's ¥1000 for 50", $4f
 	db "coins. Would you", $55
 	db "like some?", $57
 ; 0x9d91a + 106 bytes
@@ -84954,7 +84882,7 @@ _SafariZoneEntranceText1: ; 0x9e6c7
 	db "SAFARI ZONE!", $57
 
 UnnamedText_9e6e4: ; 0x9e6e4
-	db $0, "For just ", $f0, "500,", $4f
+	db $0, "For just ¥500,", $4f
 	db "you can catch all", $55
 	db "the #MON you", $55
 	db "want in the park!", $51
@@ -84963,7 +84891,7 @@ UnnamedText_9e6e4: ; 0x9e6e4
 ; 0x9e747
 
 UnnamedText_9e747: ; 0x9e747
-	db $0, "That'll be ", $f0, "500", $4f
+	db $0, "That'll be ¥500", $4f
 	db "please!", $51
 	db "We only use a", $4f
 	db "special # BALL", $55
@@ -86291,7 +86219,7 @@ _PokemartTellBuyPrice: ; 0xa2619
 	TX_RAM $cf4b
 	db $0, "?", $4f
 	db "That will be", $55
-	db $f0, "@"
+	db "¥@"
 	db $2, $9f, $ff, $c3
 	db $0, ". OK?", $57
 ; 0xa2639
@@ -86318,7 +86246,7 @@ _PokemonSellingGreetingText: ; 0xa2690
 
 _PokemartTellSellPrice: ; 0xa26ae
 	db $0, "I can pay you", $4f
-	db $f0, "@"
+	db "¥@"
 	db $2, $9f, $ff, $c3 ; XXX
 	db $0, " for that.", $57
 ; 0xa26cf