summaryrefslogtreecommitdiff
path: root/src/code/db_camera.c
diff options
context:
space:
mode:
authorRoman971 <32455037+Roman971@users.noreply.github.com>2021-11-28 14:48:17 +0100
committerGitHub <noreply@github.com>2021-11-28 08:48:17 -0500
commit54d77c71f17f530e6bf0c9d75fb76cf3f951da17 (patch)
tree2a902dd78f6affe604be583f8cb8dae5de814954 /src/code/db_camera.c
parent1fa6e3874b7283ec493466176c77d5ea85b4e76a (diff)
Improve gfxprint documentation and strings (#1028)
* Improve gfxprint documentation and strings * Add GFXP_UNUSED_CHAR and rename bss variable
Diffstat (limited to 'src/code/db_camera.c')
-rw-r--r--src/code/db_camera.c140
1 files changed, 72 insertions, 68 deletions
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index f686a7f37..51112b781 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -3,71 +3,75 @@
static GlobalContext* sGlobalCtx;
-char* D_8012CEE0[] = { "\x8Cキ-フレ-ム\x8Dガ" };
-const char* D_8012CEE4 = "\x8Dタリマセン。";
-const char* D_8012CEE8 = "\x8Dサイセイデキマセン";
-const char* D_8012CEEC = "\x8Dサイセイシュウリョウ";
-const char* D_8012CEF0 = "\x8Dサイセイチュウ!";
-
-const char* D_8012CEF4 = "DEMO CAMERA TOOL";
-const char* D_8012CEF8[] = { "\x8Dモウハイリマセン", "\x8Dトウロク テンメ", "\x8Dヘンコウ / " };
-const char* D_8012CF04 = "> >";
-const char* D_8012CF08 = "< <";
-const char* D_8012CF0C = "< >";
-const char* D_8012CF10 = "\x8C*プレイヤ-*";
-const char* D_8012CF14 = "\x8C\Eモ-ド\x8D ソウタイ";
-const char* D_8012CF18[] = { "\x8C\Eモ-ド\x8Dゼッタイ", "\x8Dガメン\x8C デモ", "\x8Dガメン フツウ" };
-const char* D_8012CF24[] = { "\x8DPジカン MAX", "\x8Cリンク\x8D キオク", "\x8Cリンク\x8D ムシ" };
-const char* D_8012CF30 = "\x8D*ミテルイチ*";
-const char* D_8012CF34 = "\x8C*カメラ\x8Dイチ*";
-const char* D_8012CF38 = "DEBUG CAMERA";
-const char* D_8012CF3C = "\x8Cセンタ-/ロック";
-const char* D_8012CF40 = "\x8Cセンタ-/フリ-";
-
-const char* D_8012CF44 = "DEMO CONTROL";
-const char* D_8012CF48 = "\x8Cメモリ\x8Dガタリマセン";
-const char* D_8012CF4C = "p";
-const char* D_8012CF50[] = { "e", "s", "l", "c" };
-
-const char* D_8012CF60[] = { "\x8Cメモリパック" }; // "Mempak"
-const char* D_8012CF64 = "\x8Cセーブ"; // "Save"
-const char* D_8012CF68 = "\x8Cロード"; // "Load"
-const char* D_8012CF6C = "\x8Cクリア-"; // "Clear"
-const char* D_8012CF70 = "\x8Dヲヌカナイデネ";
-
-const char* D_8012CF74 = "FREE BYTE";
-const char* D_8012CF78 = "NEED BYTE";
-const char* D_8012CF7C = "\x8C*メモリ-パック*";
-const char* D_8012CF80 = "\x8Dヲミツケラレマセン";
-char* D_8012CF84 = "\x8Cファイル \x8Dヲ";
-const char* D_8012CF88[] = { "\x8Dシテモイイデスカ?", "\x8Dゲンザイヘンシュウチュウノ", "\x8Cファイル\x8Dハハキサレマス" };
-const char* D_8012CF94 = "\x8Dハイ";
-const char* D_8012CF98 = "\x8Dイイエ";
-const char* D_8012CF9C[] = { "\x8Dシテイマス", "\x8Dウワガキ" };
-const char* D_8012CFA4 = "\x8Dシマシタ";
-const char* D_8012CFA8 = "USE BYTE";
-const char* D_8012CFAC = "\x8Dニシッパイ";
-
-const char* D_8012CFB0 = "\x8C\Eモ-ド\x8D コテイ";
-char D_8012CFB4[] = "\x8Cフレ-ム ";
-char D_8012CFC4[] = "\x8Cキ- / ";
-char D_8012CFD0[] = "\x8D(センタ-テン)\0\0\0\0\0";
-char D_8012CFE4[] = "\x8D(ゲンテン)\0\0\0\0\0\0";
-char D_8012CFF8[] = "\x8C(プレイヤ-)\0\0\0\0\0";
-char D_8012D00C[] = "\x8D(イチアワセ)\0\0\0\0\0\0";
-char D_8012D020[] = "\x8D(セッテイ)\0\0\0\0\0\0\0\0";
-char D_8012D034[] = "\x8D(キャッカン)\0\0\0\0\0\0";
-char D_8012D048[] = "\x8CポイントNo. \0\0\0";
-char D_8012D05C[] = "\x8Dガカク \0\0\0";
-char D_8012D070[] = "\x8CNフレ-ム \0\0\0\0";
-char D_8012D084[] = "\x8DZカイテン \0\0\0";
-char D_8012D098[] = "\x8Cモ-ド \0\0\0\0";
-char D_8012D0AC[] = " R\x8Dチュウシン \0\0\0";
-
-char D_8012D0C0[] = "\x8DPジカン \0\0";
-char D_8012D0D4[] = "\x8Dキョリ \0";
-char D_8012D0E4[] = "\x8DXカイテン \0\0";
-char D_8012D0F8[] = "\x8DYカイテン \0\0";
+// TODO: cleanup these arrays and UB access
+char* D_8012CEE0[] = { GFXP_KATAKANA "キ-フレ-ム" GFXP_HIRAGANA "ガ" };
+char* D_8012CEE4 = GFXP_HIRAGANA "タリマセン。";
+char* D_8012CEE8 = GFXP_HIRAGANA "サイセイデキマセン";
+char* D_8012CEEC = GFXP_HIRAGANA "サイセイシュウリョウ";
+char* D_8012CEF0 = GFXP_HIRAGANA "サイセイチュウ!";
+
+char* D_8012CEF4 = "DEMO CAMERA TOOL";
+char* D_8012CEF8[] = { GFXP_HIRAGANA "モウハイリマセン", GFXP_HIRAGANA "トウロク テンメ", GFXP_HIRAGANA "ヘンコウ / " };
+char* D_8012CF04 = "> >";
+char* D_8012CF08 = "< <";
+char* D_8012CF0C = "< >";
+char* D_8012CF10 = GFXP_KATAKANA "*プレイヤ-*";
+char* D_8012CF14 = GFXP_KATAKANA "Eモ-ド" GFXP_HIRAGANA " ソウタイ";
+char* D_8012CF18[] = { GFXP_KATAKANA "Eモ-ド" GFXP_HIRAGANA "ゼッタイ", GFXP_HIRAGANA "ガメン" GFXP_KATAKANA " デモ",
+ GFXP_HIRAGANA "ガメン フツウ" };
+char* D_8012CF24[] = { GFXP_HIRAGANA "Pジカン MAX", GFXP_KATAKANA "リンク" GFXP_HIRAGANA " キオク",
+ GFXP_KATAKANA "リンク" GFXP_HIRAGANA " ムシ" };
+char* D_8012CF30 = GFXP_HIRAGANA "*ミテルイチ*";
+char* D_8012CF34 = GFXP_KATAKANA "*カメラ" GFXP_HIRAGANA "イチ*";
+char* D_8012CF38 = "DEBUG CAMERA";
+char* D_8012CF3C = GFXP_KATAKANA "センタ-/ロック";
+char* D_8012CF40 = GFXP_KATAKANA "センタ-/フリ-";
+
+char* D_8012CF44 = "DEMO CONTROL";
+char* D_8012CF48 = GFXP_KATAKANA "メモリ" GFXP_HIRAGANA "ガタリマセン";
+char* D_8012CF4C = "p";
+char* D_8012CF50[] = { "e", "s", "l", "c" };
+
+char* D_8012CF60[] = { GFXP_KATAKANA "メモリパック" }; // "Mempak"
+char* D_8012CF64 = GFXP_KATAKANA "セーブ"; // "Save"
+char* D_8012CF68 = GFXP_KATAKANA "ロード"; // "Load"
+char* D_8012CF6C = GFXP_KATAKANA "クリア-"; // "Clear"
+char* D_8012CF70 = GFXP_HIRAGANA "ヲヌカナイデネ";
+
+char* D_8012CF74 = "FREE BYTE";
+char* D_8012CF78 = "NEED BYTE";
+char* D_8012CF7C = GFXP_KATAKANA "*メモリ-パック*";
+char* D_8012CF80 = GFXP_HIRAGANA "ヲミツケラレマセン";
+char* D_8012CF84 = GFXP_KATAKANA "ファイル " GFXP_HIRAGANA "ヲ";
+char* D_8012CF88[] = { GFXP_HIRAGANA "シテモイイデスカ?", GFXP_HIRAGANA "ゲンザイヘンシュウチュウノ",
+ GFXP_KATAKANA "ファイル" GFXP_HIRAGANA "ハハキサレマス" };
+char* D_8012CF94 = GFXP_HIRAGANA "ハイ";
+char* D_8012CF98 = GFXP_HIRAGANA "イイエ";
+char* D_8012CF9C[] = { GFXP_HIRAGANA "シテイマス", GFXP_HIRAGANA "ウワガキ" };
+char* D_8012CFA4 = GFXP_HIRAGANA "シマシタ";
+char* D_8012CFA8 = "USE BYTE";
+char* D_8012CFAC = GFXP_HIRAGANA "ニシッパイ";
+
+char* D_8012CFB0 = GFXP_KATAKANA "Eモ-ド" GFXP_HIRAGANA " コテイ";
+char D_8012CFB4[] = GFXP_KATAKANA "フレ-ム ";
+char D_8012CFC4[] = GFXP_KATAKANA "キ- / ";
+char D_8012CFD0[] = GFXP_HIRAGANA "(センタ-テン)\0\0\0\0\0";
+char D_8012CFE4[] = GFXP_HIRAGANA "(ゲンテン)\0\0\0\0\0\0";
+char D_8012CFF8[] = GFXP_KATAKANA "(プレイヤ-)\0\0\0\0\0";
+char D_8012D00C[] = GFXP_HIRAGANA "(イチアワセ)\0\0\0\0\0\0";
+char D_8012D020[] = GFXP_HIRAGANA "(セッテイ)\0\0\0\0\0\0\0\0";
+char D_8012D034[] = GFXP_HIRAGANA "(キャッカン)\0\0\0\0\0\0";
+char D_8012D048[] = GFXP_KATAKANA "ポイントNo. \0\0\0";
+char D_8012D05C[] = GFXP_HIRAGANA "ガカク \0\0\0";
+char D_8012D070[] = GFXP_KATAKANA "Nフレ-ム \0\0\0\0";
+char D_8012D084[] = GFXP_HIRAGANA "Zカイテン \0\0\0";
+char D_8012D098[] = GFXP_KATAKANA "モ-ド \0\0\0\0";
+char D_8012D0AC[] = " R" GFXP_HIRAGANA "チュウシン \0\0\0";
+
+char D_8012D0C0[] = GFXP_HIRAGANA "Pジカン \0\0";
+char D_8012D0D4[] = GFXP_HIRAGANA "キョリ \0";
+char D_8012D0E4[] = GFXP_HIRAGANA "Xカイテン \0\0";
+char D_8012D0F8[] = GFXP_HIRAGANA "Yカイテン \0\0";
#define ACTION_E 0
#define ACTION_SAVE 1
@@ -1713,9 +1717,9 @@ void DbCamera_PrintAllCuts(Camera* cam) {
osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** finish! ***** */\n@@@\n");
}
-char D_8012D114[] = "\x8Cフレ-ム ";
-char D_8012D128[] = "\x8Cト-タル ";
-char D_8012D13C[] = "\x8Cキ- / ";
+char D_8012D114[] = GFXP_KATAKANA "フレ-ム ";
+char D_8012D128[] = GFXP_KATAKANA "ト-タル ";
+char D_8012D13C[] = GFXP_KATAKANA "キ- / ";
s32 func_800B91B0(Camera* cam, DbCamera* dbCamera) {
s32 pointCount;