Merge pull request #257 from mateon1/charmap

charmap
pret · Nov 11, 2024 · 4428779 · 4428779
2 parents 47a6cc3 + ad9688c
commit 4428779
Show file tree

Hide file tree

Showing 6 changed files with 441 additions and 685 deletions.
diff --git a/charmap.txt b/charmap.txt
@@ -221,61 +221,259 @@
 
 @ Shift JIS
 '　' = 81 40
+'、' = 81 41
+'。' = 81 42
+'，' = 81 43
+'．' = 81 44
+'・' = 81 45
+'：' = 81 46
+'；' = 81 47
 '？' = 81 48
+'！' = 81 49
 '゛' = 81 4A
 '゜' = 81 4B
+'ー' = 81 5B
+'／' = 81 5E
 '〜' = 81 60
+'…' = 81 63
+'‥' = 81 64
+@'’' = 81 66 - same char as 92
+@'“' = 81 67 - same char as ~93
+@'”' = 81 68 - same char as ~94
+'（' = 81 69
+'）' = 81 6A
+'「' = 81 75
+'」' = 81 76
+'『' = 81 77
+'』' = 81 78
+'＋' = 81 7B
+'−' = 81 7C
+@'×' = 81 7E - same char as D7
+'＝' = 81 81
+'＜' = 81 83
+'＞' = 81 84
+'∞' = 81 87
+@'♂' = 81 89 - same char as BD
+@'♀' = 81 8A - same char as BE
+'＄' = 81 90
+'％' = 81 93
+'＃' = 81 94
+'＆' = 81 95
+'＊' = 81 96
+'＠' = 81 97
+'○' = 81 9B
+'→' = 81 A8
+'←' = 81 A9
+'↑' = 81 AA
+'↓' = 81 AB
 '♪' = 81 F4
-'Ａ' = 82 60
+@ Inverted font block
+'０' = 82 4F
+'１' = 82 50
+'２' = 82 51
+'３' = 82 52
+'４' = 82 53
+'５' = 82 54
+'６' = 82 55
+'７' = 82 56
+'８' = 82 57
+'９' = 82 58
+
+'Ａ' = 82 60 @ Not standard shift-jis
 'Ｂ' = 82 61
 'Ｃ' = 82 62
+
+'あ' = 82 A0
+'い' = 82 A2
 'う' = 82 A4
+'え' = 82 A6
+'お' = 82 A8
 'か' = 82 A9
 'が' = 82 AA
+'き' = 82 AB
+'ぎ' = 82 AC
+'く' = 82 AD
+'ぐ' = 82 AE
+'け' = 82 AF
+'げ' = 82 B0
+'こ' = 82 B1
+'ご' = 82 B2
+'さ' = 82 B3
+'ざ' = 82 B4
 'し' = 82 B5
+'じ' = 82 B6
 'す' = 82 B7
+'ず' = 82 B8
+'せ' = 82 B9
+'ぜ' = 82 BA
+'そ' = 82 BB
+'ぞ' = 82 BC
+'た' = 82 BD
+'だ' = 82 BE
+'ち' = 82 BF
+'ぢ' = 82 C0
+'つ' = 82 C2
+'づ' = 82 C3
+'て' = 82 C4
+'で' = 82 C5
+'と' = 82 C6
+'ど' = 82 C7
 'な' = 82 C8
 'に' = 82 C9
-'も' = 82 CC
-'み' = 82 DC
-'ま' = 82 DD
-'の' = 82 E0
+'ぬ' = 82 CA
+'ね' = 82 CB
+'の' = 82 CC
+'は' = 82 CD
+'ば' = 82 CE
+'ぱ' = 82 CF
+'ひ' = 82 D0
+'び' = 82 D1
+'ぴ' = 82 D2
+'ふ' = 82 D3
+'ぶ' = 82 D4
+'ぷ' = 82 D5
+'へ' = 82 D6
+'べ' = 82 D7
+'ぺ' = 82 D8
+'ほ' = 82 D9
+'ぼ' = 82 DA
+'ぽ' = 82 DB
+'ま' = 82 DC
+'み' = 82 DD
+'む' = 82 DE
+'め' = 82 DF
+'も' = 82 E0
+'や' = 82 E2
+'ゆ' = 82 E4
 'よ' = 82 E6
+'ら' = 82 E7
+'り' = 82 E8
 'る' = 82 E9
+'れ' = 82 EA
+'ろ' = 82 EB
+'わ' = 82 ED
 'を' = 82 F0
 'ん' = 82 F1
+'ア' = 83 41
+'イ' = 83 43
+'ウ' = 83 45
+'エ' = 83 47
+'オ' = 83 49
 'カ' = 83 4A
+'ガ' = 83 4B
+'キ' = 83 4C
+'ギ' = 83 4D
+'ク' = 83 4E
+'グ' = 83 4F
+'ケ' = 83 50
+'ゲ' = 83 51
+'コ' = 83 52
+'ゴ' = 83 53
+'サ' = 83 54
+'ザ' = 83 55
+'シ' = 83 56
+'ジ' = 83 57
+'ス' = 83 58
+'ズ' = 83 59
+'セ' = 83 5A
+'ゼ' = 83 5B
+'ソ' = 83 5C
+'ゾ' = 83 5D
+'タ' = 83 5E
+'ダ' = 83 5F
+'チ' = 83 60
+'ヂ' = 83 61
+'ッ' = 83 62
+'ツ' = 83 63
+'ヅ' = 83 64
+'テ' = 83 65
+'デ' = 83 66
+'ト' = 83 67
+'ド' = 83 68
 'ナ' = 83 69
-
-UNK_ICON_81_69 = 81 69
-UNK_ICON_81_6A = 81 6A
-RIGHT_ARROW = 81 A8
-LEFT_ARROW = 81 A9
-UP_ARROW = 81 AA
-'→' = 81 A8
-'←' = 81 A9
-'↑' = 81 AA
-'↓' = 81 AB
+'ニ' = 83 6A
+'ヌ' = 83 6B
+'ネ' = 83 6C
+'ノ' = 83 6D
+'ハ' = 83 6E
+'バ' = 83 6F
+'パ' = 83 70
+'ヒ' = 83 71
+'ビ' = 83 72
+'ピ' = 83 73
+'フ' = 83 74
+'ブ' = 83 75
+'プ' = 83 76
+'ヘ' = 83 77
+'ベ' = 83 78
+'ペ' = 83 79
+'ホ' = 83 7A
+'ボ' = 83 7B
+'ポ' = 83 7C
+'マ' = 83 7D
+'ミ' = 83 7E
+'ム' = 83 80
+'メ' = 83 81
+'モ' = 83 82
+'ヤ' = 83 84
+'ユ' = 83 86
+'ヨ' = 83 88
+'ラ' = 83 89
+'リ' = 83 8A
+'ル' = 83 8B
+'レ' = 83 8C
+'ロ' = 83 8D
+'ワ' = 83 8F
+'ヲ' = 83 92
+'ン' = 83 93
+@'Α' = 83 9F @ inverted narrow fixedwidth 0-9
+@'Β' = 83 A0
+@'Γ' = 83 A1
+@'Δ' = 83 A2
+@'Ε' = 83 A3
+@'Ζ' = 83 A4
+@'Η' = 83 A5
+@'Θ' = 83 A6
+@'Ι' = 83 A7
+@'Κ' = 83 A8
+@ Symbol block, replaces greek
+@'α' = 83 BF @ Po
+@'β' = 83 C0 @ Opened mail
+@'γ' = 83 C1 @ ?
+@'δ' = 83 C2 @ Go
+@'ε' = 83 C3 @ News
+@'ζ' = 83 C4 @ Ke
+@'η' = 83 C5 @ White dash?
+@'θ' = 83 C6 @ X button
+@'ι' = 83 C7 @ Y button
+'κ' = 83 C8 @ Kappa wasn't replaced :P
 
 POKE = 83 BF 83 C4 @ This is actually two characters which can render separately; may need to be split eventually.
-UNK_ICON_83_C0 = 83 C0
-UNK_ICON_83_C1 = 83 C1
-UNK_ICON_83_C2 = 83 C2
-UNK_ICON_83_C3 = 83 C3
+ENVELOPE_OPEN = 83 C0
+THANK_YOU_MAIL = 83 C1
+ICON_GO = 83 C2
+ICON_NEWS = 83 C3
 NDS_Y_BUTTON = 83 C7
 
 R_BUTTON = 84 86
-UNK_ICON_84_87 = 84 87
+ENVELOPE_CLOSED = 84 87
 
-UNK_ICON_40 = 87 40
+ICON_BLANK = 87 40
+@ = 87 41 @ E
 STAR_BULLET = 87 42
+@ = 87 43 @ Star with E
+ICON_STICKY = 87 44
 SPEECH_BUBBLE = 87 45
+@ 87 46..49 - red hearts
+@ 87 4a..4d - yellow hearts - appears in team list
 TM = 87 4E
 ORB = 87 4F
 A_BUTTON = 87 50
 B_BUTTON = 87 51
 DPAD = 87 52
 START_BUTTON = 87 53 87 71
+@ 87 54 placeholder, some kanji character
+@ 87 5F ?????
 SELECT_BUTTON = 87 72 87 73
 L_BUTTON = 87 74
 

diff --git a/data/move/move_names.s b/data/move/move_names.s
@@ -275,7 +275,7 @@ MoveUseTextBide:
 
 .global MoveNameBide2
 MoveNameBide2:
-.string "がみん\0"
+.string "がまん\0"
 .align 2,0
 
 .global MoveDescriptionIsWatching
@@ -285,7 +285,7 @@ MoveDescriptionIsWatching:
 
 .global MoveNameIsWatching
 MoveNameIsWatching:
-.string "ようすをまる\0"
+.string "ようすをみる\0"
 .align 2,0
 
 .global MoveUseTextRegularAttack
@@ -3280,5 +3280,5 @@ MoveDescriptionNone:
 
 .global MoveNameNone
 MoveNameNone:
-.string "なにのも？\0"
+.string "なにもの？\0"
 .align 2,0
diff --git a/data_monster.mk b/data_monster.mk
@@ -29,7 +29,7 @@ $(LEARNSET_DATA): $(LEARNSET_DIR)/learnset_data.json
 	$(DUNGEONJSON) learnset pmd-red $<
 
 data_learnset_ptrs: ${LEARNSET_DATA};
-	echo '.4byte 0' >> $(LEARNSET_PTRS)
+	echo '.4byte 0' > $(LEARNSET_PTRS)
 	echo '.4byte 0' >> $(LEARNSET_PTRS)
 	cat $(LEARNSET_DATA) | grep .global >> $(LEARNSET_PTRS)
 ifeq ($(shell uname -s), Darwin)

diff --git a/src/data/iq_skill_list_menu.h b/src/data/iq_skill_list_menu.h
@@ -18,5 +18,5 @@ static const UnkTextStruct2 sUnknown_80DBDF0 = {
 
 ALIGNED(4) static const u8 sIQSkills[] = _("IQ Skills");
 ALIGNED(4) static const u8 sStarBullet[] = _("{STAR_BULLET}");
-ALIGNED(4) static const u8 sUnknown_80DBE18[] = _("{UNK_ICON_40}");
-ALIGNED(4) static const u8 sFmt01[] = _("{MOVE_ITEM_0}{MOVE_ITEM_1}");
+ALIGNED(4) static const u8 sUnknown_80DBE18[] = _("{ICON_BLANK}");
+ALIGNED(4) static const u8 sFmt01[] = _("{MOVE_ITEM_0}{MOVE_ITEM_1}");