Use Japanese charmap characters

8 files changed, 25 insertions, 22 deletions

diff --git a/constants/charmap.asm b/constants/charmap.asm
index be20a37..1c01298 100755
--- a/constants/charmap.asm
+++ b/constants/charmap.asm
@@ -278,8 +278,8 @@
 	charmap "♂", $ef
 	charmap "円", $f0
 	charmap "×", $f1
-	charmap ".", $f2
-	charmap "/", $f3
+	charmap "．", $f2
+	charmap "／", $f3
 
 	charmap "ォ", $f4
 
diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm
index dfef484..21b2731 100644
--- a/data/moves/descriptions.asm
+++ b/data/moves/descriptions.asm
@@ -848,7 +848,7 @@ FlashDescription:
 	next "てきの　めいちゅうりつを　さげさせる@"
 
 PsywaveDescription:
-	db   "てきに　１ーレべル×１.５の"
+	db   "てきに　１ーレべル×１．５の"
 	next "ダメージを　ランダムで　あたえる@"
 
 SplashDescription:
diff --git a/data/text/text_input_chars.asm b/data/text/text_input_chars.asm
index c7d9607..68cf9c9 100644
--- a/data/text/text_input_chars.asm
+++ b/data/text/text_input_chars.asm
@@ -10,7 +10,7 @@ TextEntryChars:
 	db "タチツテト　ナニヌネノ　ハヒフへホ"
 	db "マミムメモ　ヤユヨワン　ラりルレロ"
 	db "ゃゅょっを　ャュョッヲ　ﾞﾟ　ー。"
-	db "１２３４５　６７８９０　？！×.円"
+	db "１２３４５　６７８９０　？！×．円"
 
 TextEntryHiragana:
 	db "あいうえお　かきくけこ　さしすせそ"
diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm
index 4e9d5ea..c085c57 100755
--- a/engine/dumps/bank03.asm
+++ b/engine/dumps/bank03.asm
@@ -2537,16 +2537,16 @@ Functione438:
 	ret
 
 Texte461:
-	db "・.０１　@"
-	db "・.０２　@"
-	db "・.０３　@"
-	db "・.０４　@"
-	db "・.０５　@"
-	db "・.０６　@"
-	db "・.０７　@"
-	db "・.０８　@"
-	db "・.０９　@"
-	db "・.１０　@"
+	db "・．０１　@"
+	db "・．０２　@"
+	db "・．０３　@"
+	db "・．０４　@"
+	db "・．０５　@"
+	db "・．０６　@"
+	db "・．０７　@"
+	db "・．０８　@"
+	db "・．０９　@"
+	db "・．１０　@"
 
 Functione49d:
 	ld h, d
@@ -2571,7 +2571,7 @@ Texte4bf:
 	next "　@"
 
 Texte4ca:
-	db "/３０@"
+	db "／３０@"
 
 Functione4ce:
 	ld a, [wMenuSelection]
@@ -2760,7 +2760,7 @@ Functione5d3:
 	ret
 
 Texte679:
-	db "ボックス/いまの　ボックス@"
+	db "ボックス／いまの　ボックス@"
 
 Texte687:
 	db "しゅるい　　なまえ　　　レべル@"
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 299606f..2e9981d 100644
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -1712,7 +1712,7 @@ PartyMenuAttributes:
 	db $F3
 
 PartyTypeText:
-	db "タイプ/　　　　　いりょく/@"
+	db "タイプ／　　　　　いりょく／@"
 
 PartyPokeDivider:
 	db "ーーー@"
@@ -2148,7 +2148,7 @@ DrawTrainerCardMainPage:
 	ret
 
 TrainerCardText:
-	db "なまえ/<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@"
+	db "なまえ／<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@"
 
 TrainerCardDexEntriesText:
 	db "ひき@"
diff --git a/utils/dump_text.py b/utils/dump_text.py
index c36298e..75a3672 100644
--- a/utils/dump_text.py
+++ b/utils/dump_text.py
@@ -179,7 +179,7 @@ if __name__ == '__main__':
                     help='dump text codes (line breaks, prompt etc) as macros instead of inline text'
                     )
     ap.add_argument('-o', dest='outfile', default=sys.stdout, help='output file name')
-    ap.add_argument('-m', dest='charmap', default='../charmap.asm', help='charmap file name')
+    ap.add_argument('-m', dest='charmap', default='../constants/charmap.asm', help='charmap file name')
     ap.add_argument('rom', help='path to ROM')
     ap.add_argument('start', help='start offset', type=conv_address)
     ap.add_argument('end', help='end offset', type=conv_address, nargs='?')
diff --git a/utils/gfx.py b/utils/gfx.py
index a9e56d4..f25b90f 100644
--- a/utils/gfx.py
+++ b/utils/gfx.py
@@ -30,7 +30,7 @@ base_stats = None
 def get_base_stats():
 	global base_stats
 	if not base_stats:
-		base_stats = recursive_read('data/base_stats.asm')
+		base_stats = recursive_read('data/pokemon/base_stats.asm')
 	return base_stats
 
 def get_pokemon_dimensions(name):
diff --git a/utils/tests/charmap.asm b/utils/tests/charmap.asm
index 70e228c..1c01298 100644
--- a/utils/tests/charmap.asm
+++ b/utils/tests/charmap.asm
@@ -116,6 +116,9 @@
 	charmap "▲", $61
 	charmap "☎", $62
 
+	charmap "Ａ", $60
+	charmap "Ｂ", $61
+	charmap "Ｃ", $62
 	charmap "Ｄ", $63
 	charmap "Ｅ", $64
 	charmap "Ｆ", $65
@@ -275,8 +278,8 @@
 	charmap "♂", $ef
 	charmap "円", $f0
 	charmap "×", $f1
-	charmap ".", $f2
-	charmap "/", $f3
+	charmap "．", $f2
+	charmap "／", $f3
 
 	charmap "ォ", $f4