summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>2024-04-25 16:08:40 -0300
committerGitHub <noreply@github.com>2024-04-25 14:08:40 -0500
commit7c2ce8a678056461858c20fd4dc39e1d01e3f5ce (patch)
tree0bed6adbe15c19655caef50e5d3e63a3819e2619
parent0c9be776da37e754a9b9422a945bf1bc5cfd7e75 (diff)
DOCS: ast_text (ex ast_font) (#223)
* progress of docs * caiman here, no problems * Emergency manouvers! * complete * rename ast_font to ast_text
-rw-r--r--.vscode/settings.json2
-rw-r--r--assets/yaml/us/ast_text.yaml (renamed from assets/yaml/us/ast_font.yaml)436
-rw-r--r--include/sf64dma.h2
-rw-r--r--src/dmatable.c2
-rw-r--r--src/engine/fox_hud.c70
-rw-r--r--src/engine/fox_load_inits.c84
-rw-r--r--src/engine/fox_std_lib.c35
-rw-r--r--src/engine/fox_versus.c16
-rw-r--r--src/overlays/ovl_ending/fox_end2.c8
-rw-r--r--src/overlays/ovl_ending/fox_end2_data.c4
-rw-r--r--src/overlays/ovl_menu/fox_map.c37
-rw-r--r--src/overlays/ovl_menu/fox_option.c11
-rw-r--r--src/overlays/ovl_menu/fox_title.c8
-rw-r--r--yamls/us/assets.yaml4
14 files changed, 364 insertions, 355 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c7749127..bbad84ff 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -89,7 +89,7 @@
"tuple": "c",
"type_traits": "c",
"ast_allies.h": "c",
- "ast_font.h": "c",
+ "ast_text.h": "c",
"fox_std_lib_assets.h": "c",
"fox_versus_assets.h": "c",
"guint.h": "c",
diff --git a/assets/yaml/us/ast_font.yaml b/assets/yaml/us/ast_text.yaml
index a3ba59cf..6cdf8a6d 100644
--- a/assets/yaml/us/ast_font.yaml
+++ b/assets/yaml/us/ast_text.yaml
@@ -3,419 +3,419 @@
- [0x05, 0xCD2410]
header:
code:
- - '#include "assets/ast_font.h"'
+ - '#include "assets/ast_text.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
# 0 (small)
-D_5000000:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000000, symbol: D_5000000 }
+aSmallText_0:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000000, symbol: aSmallText_0 }
# 1 (small)
-D_5000080:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000080, symbol: D_5000080 }
+aSmallText_1:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000080, symbol: aSmallText_1 }
# 2 (small)
-D_5000100:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000100, symbol: D_5000100 }
+aSmallText_2:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000100, symbol: aSmallText_2 }
# 3 (small)
-D_5000180:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000180, symbol: D_5000180 }
+aSmallText_3:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000180, symbol: aSmallText_3 }
# 4 (small)
-D_5000200:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000200, symbol: D_5000200 }
+aSmallText_4:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000200, symbol: aSmallText_4 }
# 5 (small)
-D_5000280:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000280, symbol: D_5000280 }
+aSmallText_5:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000280, symbol: aSmallText_5 }
# 6 (small)
-D_5000300:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000300, symbol: D_5000300 }
+aSmallText_6:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000300, symbol: aSmallText_6 }
# 7 (small)
-D_5000380:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000380, symbol: D_5000380 }
+aSmallText_7:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000380, symbol: aSmallText_7 }
# 8 (small)
-D_5000400:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000400, symbol: D_5000400 }
+aSmallText_8:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000400, symbol: aSmallText_8 }
# 9 (small)
-D_5000480:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000480, symbol: D_5000480 }
+aSmallText_9:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000480, symbol: aSmallText_9 }
# Mission No.
-D_5000500:
- { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 19, offset: 0x5000500, symbol: D_5000500 }
+aTextMissionNo:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 19, offset: 0x5000500, symbol: aTextMissionNo }
# Training
-D_5000D50:
- { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x5000D50, symbol: D_5000D50 }
+aTextTraining:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x5000D50, symbol: aTextTraining }
# Enemies Down
-D_5001110:
- { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 25, offset: 0x5001110, symbol: D_5001110 }
+aTextEnemiesDown:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 25, offset: 0x5001110, symbol: aTextEnemiesDown }
# Accumulated Total
-D_5001750:
- { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 10, offset: 0x5001750, symbol: D_5001750 }
+aTextAccumTotal:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 10, offset: 0x5001750, symbol: aTextAccumTotal }
# Status of Team
-D_5001C50:
- { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 12, offset: 0x5001C50, symbol: D_5001C50 }
+aTextStatusOfTeam:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 12, offset: 0x5001C50, symbol: aTextStatusOfTeam }
# End
-D_50021F0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 8, offset: 0x50021F0, symbol: D_50021F0 }
+aTextEnd:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 8, offset: 0x50021F0, symbol: aTextEnd }
# ACCOM
-D_50022F0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 23, offset: 0x50022F0, symbol: D_50022F0 }
+aTextACCOM:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 23, offset: 0x50022F0, symbol: aTextACCOM }
# PLISHED
-D_5002DC0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002DC0 }
+aTextPLISHED:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: aTextPLISHED }
# MISSION
-D_5003A00:
- { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 23, offset: 0x5003A00, symbol: D_5003A00 }
+aTextMISSION:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 23, offset: 0x5003A00, symbol: aTextMISSION }
# COMP
-D_5004580:
- { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 23, offset: 0x5004580, symbol: D_5004580 }
+aTextCOMP:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 23, offset: 0x5004580, symbol: aTextCOMP }
# LETE
-D_5004E20:
- { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 21, offset: 0x5004E20, symbol: D_5004E20 }
+aTextLETE:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 21, offset: 0x5004E20, symbol: aTextLETE }
# THE END
-D_50054B0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 192, height: 30, offset: 0x50054B0, symbol: D_50054B0 }
+aText_THE_END:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 192, height: 30, offset: 0x50054B0, symbol: aText_THE_END }
# Falco
-D_5006B30:
- { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 8, offset: 0x5006B30, symbol: D_5006B30 }
+aTextFalco:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 8, offset: 0x5006B30, symbol: aTextFalco }
# Peppy
-D_5006CB0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 10, offset: 0x5006CB0, symbol: D_5006CB0 }
+aTextPeppy:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 10, offset: 0x5006CB0, symbol: aTextPeppy }
# Slippy
-D_5006E90:
- { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 10, offset: 0x5006E90, symbol: D_5006E90 }
+aTextSlippy:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 10, offset: 0x5006E90, symbol: aTextSlippy }
# A (small)
-D_50070C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50070C0, symbol: D_50070C0 }
+aSmallText_A:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50070C0, symbol: aSmallText_A }
# B (small)
-D_5007100:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007100, symbol: D_5007100 }
+aSmallText_B:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007100, symbol: aSmallText_B }
# ! (small)
-D_5007140:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007140, symbol: D_5007140 }
+aSmallTextExclamMark:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007140, symbol: aSmallTextExclamMark }
# C (small)
-D_5007180:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007180, symbol: D_5007180 }
+aSmallText_C:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007180, symbol: aSmallText_C }
# D (small)
-D_50071C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50071C0, symbol: D_50071C0 }
+aSmallText_D:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50071C0, symbol: aSmallText_D }
# E (small)
-D_5007200:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007200, symbol: D_5007200 }
+aSmallText_E:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007200, symbol: aSmallText_E }
-# 1 (large)
-D_5007240:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007240, symbol: D_5007240 }
+# 1 (large) Used in the ending: 1997
+sLargeText_1997_1:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007240, symbol: sLargeText_1997_1 }
-# 7 (large)
-D_5007330:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007330, symbol: D_5007330 }
+# 7 (large) Used in the ending: 1997
+sLargeText_1997_7:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007330, symbol: sLargeText_1997_7 }
-# 9 (large)
-D_5007420:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007420, symbol: D_5007420 }
+# 9 (large) Used in the ending: 1997
+sLargeText_1997_9:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007420, symbol: sLargeText_1997_9 }
# F (small)
-D_5007510:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007510, symbol: D_5007510 }
+aSmallText_F:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007510, symbol: aSmallText_F }
# G (small)
-D_5007550:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007550, symbol: D_5007550 }
+aSmallText_G:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007550, symbol: aSmallText_G }
# H (small)
-D_5007590:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007590, symbol: D_5007590 }
+aSmallText_H:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007590, symbol: aSmallText_H }
# I (small)
-D_50075D0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50075D0, symbol: D_50075D0 }
+aSmallText_I:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50075D0, symbol: aSmallText_I }
# J (small)
-D_5007610:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007610, symbol: D_5007610 }
+aSmallText_J:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007610, symbol: aSmallText_J }
# K (small)
-D_5007650:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007650, symbol: D_5007650 }
+aSmallText_K:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007650, symbol: aSmallText_K }
-# 完 (Japanese letter meaning COMPLETE)
-D_5007690:
- { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 47, offset: 0x5007690, symbol: D_5007690 }
+# 完 (Japanese kanji meaning COMPLETE)
+aTextKanjiCOMPLETE:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 47, offset: 0x5007690, symbol: aTextKanjiCOMPLETE }
# L (small)
-D_5007F60:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007F60, symbol: D_5007F60 }
+aSmallText_L:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007F60, symbol: aSmallText_L }
# M (small)
-D_5007FA0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FA0, symbol: D_5007FA0 }
+aSmallText_M:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FA0, symbol: aSmallText_M }
# N (small)
-D_5007FE0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FE0, symbol: D_5007FE0 }
+aSmallText_N:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FE0, symbol: aSmallText_N }
# A (large)
-D_5008020:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008020, symbol: D_5008020 }
+aLargeText_A:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008020, symbol: aLargeText_A }
# B (large)
-D_5008110:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008110, symbol: D_5008110 }
+aLargeText_B:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008110, symbol: aLargeText_B }
# C (large)
-D_5008200:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008200, symbol: D_5008200 }
+aLargeText_C:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008200, symbol: aLargeText_C }
# D (large)
-D_50082F0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50082F0, symbol: D_50082F0 }
+aLargeText_D:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50082F0, symbol: aLargeText_D }
# E (large)
-D_50083E0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50083E0, symbol: D_50083E0 }
+aLargeText_E:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50083E0, symbol: aLargeText_E }
# F (large)
-D_50084D0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50084D0, symbol: D_50084D0 }
+aLargeText_F:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50084D0, symbol: aLargeText_F }
# G (large)
-D_50085C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50085C0, symbol: D_50085C0 }
+aLargeText_G:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50085C0, symbol: aLargeText_G }
# H (large)
-D_50086B0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50086B0, symbol: D_50086B0 }
+aLargeText_H:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50086B0, symbol: aLargeText_H }
# I (large)
-D_50087A0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50087A0, symbol: D_50087A0 }
+aLargeText_I:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50087A0, symbol: aLargeText_I }
# J (large)
-D_5008890:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008890, symbol: D_5008890 }
+aLargeText_J:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008890, symbol: aLargeText_J }
# K (large)
-D_5008980:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008980, symbol: D_5008980 }
+aLargeText_K:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008980, symbol: aLargeText_K }
# L (large)
-D_5008A70:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008A70, symbol: D_5008A70 }
+aLargeText_L:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008A70, symbol: aLargeText_L }
# M (large)
-D_5008B60:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008B60, symbol: D_5008B60 }
+aLargeText_M:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008B60, symbol: aLargeText_M }
# N (large)
-D_5008C50:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008C50, symbol: D_5008C50 }
+aLargeText_N:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008C50, symbol: aLargeText_N }
# O (large)
-D_5008D40:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008D40, symbol: D_5008D40 }
+aSmallText_O:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008D40, symbol: aSmallText_O }
# P (large)
-D_5008E30:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008E30, symbol: D_5008E30 }
+aLargeText_P:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008E30, symbol: aLargeText_P }
# Q (large)
-D_5008F20:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008F20, symbol: D_5008F20 }
+aLargeText_Q:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008F20, symbol: aLargeText_Q }
# R (large)
-D_5009010:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009010, symbol: D_5009010 }
+aLargeText_R:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009010, symbol: aLargeText_R }
# S (large)
-D_5009100:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009100, symbol: D_5009100 }
+aLargeText_S:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009100, symbol: aLargeText_S }
# T (large)
-D_50091F0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50091F0, symbol: D_50091F0 }
+aLargeText_T:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50091F0, symbol: aLargeText_T }
# U (large)
-D_50092E0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50092E0, symbol: D_50092E0 }
+aLargeText_U:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50092E0, symbol: aLargeText_U }
# V (large)
-D_50093D0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50093D0, symbol: D_50093D0 }
+aLargeText_V:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50093D0, symbol: aLargeText_V }
# W (large)
-D_50094C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50094C0, symbol: D_50094C0 }
+aLargeText_W:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50094C0, symbol: aLargeText_W }
# X (large)
-D_50096A0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50096A0, symbol: D_50096A0 }
+aLargeText_X:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50096A0, symbol: aLargeText_X }
# Y (large)
-D_5009880:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009880, symbol: D_5009880 }
+aLargeText_Y:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009880, symbol: aLargeText_Y }
# - (large)
-D_5009970:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009970, symbol: D_5009970 }
+aLargeText_HYPHEN:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009970, symbol: aLargeText_HYPHEN }
# Z (large)
-D_5009A60:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009A60, symbol: D_5009A60 }
+aLargeText_Z:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009A60, symbol: aLargeText_Z }
# s (large)
-D_5009B50:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009B50, symbol: D_5009B50 }
+aLargeText_s:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009B50, symbol: aLargeText_s }
# t (large)
-D_5009C40:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009C40, symbol: D_5009C40 }
+aLargeText_t:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009C40, symbol: aLargeText_t }
# o (small)
-D_5009D30:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D30, symbol: D_5009D30 }
+aSmallText_o:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D30, symbol: aSmallText_o }
# p (small)
-D_5009D70:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D70, symbol: D_5009D70 }
+aSmallText_p:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D70, symbol: aSmallText_p }
# . (large)
-D_5009DB0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009DB0, symbol: D_5009DB0 }
+aLargeText_DOT:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009DB0, symbol: aLargeText_DOT }
# q (small)
-D_5009EA0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EA0, symbol: D_5009EA0 }
+aSmallText_q:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EA0, symbol: aSmallText_q }
# r (small)
-D_5009EE0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EE0, symbol: D_5009EE0 }
+aSmallText_r:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EE0, symbol: aSmallText_r }
# s (small)
-D_5009F20:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009F20, symbol: D_5009F20 }
+aSmallText_s:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009F20, symbol: aSmallText_s }
# 0 (large)
-D_5009F60:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009F60, symbol: D_5009F60 }
+aLargeText_0:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009F60, symbol: aLargeText_0 }
# 1 (large)
-D_500A050:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A050, symbol: D_500A050 }
+aLargeText_1:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A050, symbol: aLargeText_1 }
# 2 (large)
-D_500A140:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A140, symbol: D_500A140 }
+aLargeText_2:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A140, symbol: aLargeText_2 }
# 3 (large)
-D_500A230:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A230, symbol: D_500A230 }
+aLargeText_3:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A230, symbol: aLargeText_3 }
# 4 (large)
-D_500A320:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A320, symbol: D_500A320 }
+aLargeText_4:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A320, symbol: aLargeText_4 }
# 5 (large)
-D_500A410:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A410, symbol: D_500A410 }
+aLargeText_5:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A410, symbol: aLargeText_5 }
# 6 (large)
-D_500A500:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A500, symbol: D_500A500 }
+aLargeText_6:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A500, symbol: aLargeText_6 }
# 7 (large)
-D_500A5F0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A5F0, symbol: D_500A5F0 }
+aLargeText_7:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A5F0, symbol: aLargeText_7 }
# 8 (large)
-D_500A6E0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A6E0, symbol: D_500A6E0 }
+aLargeText_8:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A6E0, symbol: aLargeText_8 }
# 9 (large)
-D_500A7D0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A7D0, symbol: D_500A7D0 }
+aLargeText_9:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A7D0, symbol: aLargeText_9 }
-# 終 (Japanese letter meaning END)
-D_500A8C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 49, offset: 0x500A8C0, symbol: D_500A8C0 }
+# 終 (Japanese kanji meaning END)
+aTextKanji_END:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 49, offset: 0x500A8C0, symbol: aTextKanji_END }
# T (small)
-D_500B380:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B380, symbol: D_500B380 }
+aSmallText_T:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B380, symbol: aSmallText_T }
# . (small)
-D_500B3C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B3C0, symbol: D_500B3C0 }
+aSmallText_DOT:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B3C0, symbol: aSmallText_DOT }
# : (small)
-D_500B400:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B400, symbol: D_500B400 }
+aSmallText_COLON:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B400, symbol: aSmallText_COLON }
-# u (small)
-D_500B440:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B440, symbol: D_500B440 }
+# U (small)
+aSmallText_U:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B440, symbol: aSmallText_U }
-# v (small)
-D_500B480:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B480, symbol: D_500B480 }
+# V (small)
+aSmallText_V:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B480, symbol: aSmallText_V }
-# w (small)
-D_500B4C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B4C0, symbol: D_500B4C0 }
+# W (small)
+aSmallText_W:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B4C0, symbol: aSmallText_W }
-# x (small)
-D_500B500:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B500, symbol: D_500B500 }
+# X (small)
+aSmallText_X:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B500, symbol: aSmallText_X }
-# y (small)
-D_500B540:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B540, symbol: D_500B540 }
+# Y (small)
+aSmallText_Y:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B540, symbol: aSmallText_Y }
# - (small)
-D_500B580:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B580, symbol: D_500B580 }
+aSmallText_HYPHEN:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B580, symbol: aSmallText_HYPHEN }
-# z (small)
-D_500B5C0:
- { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B5C0, symbol: D_500B5C0 }
+# Z (small)
+aSmallText_Z:
+ { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B5C0, symbol: aSmallText_Z }
# Wrench DisplayList (Teammate in maintenance state)
-D_500B600:
- { type: GFX, offset: 0x500B600, symbol: D_500B600 }
+aDownWrenchDL:
+ { type: GFX, offset: 0x500B600, symbol: aDownWrenchDL }
# Wrench Texture
-D_500B768:
- { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 32, offset: 0x0500B768, tlut: 0x0500B868, symbol: D_500B768 }
+aDownWrenchTexture:
+ { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 32, offset: 0x0500B768, tlut: 0x0500B868, symbol: aDownWrenchTexture }
# Wrench TLUT
-D_500B868:
- { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0500B868, symbol: D_500B868 } \ No newline at end of file
+aDownWrenchTLUT:
+ { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0500B868, symbol: aDownWrenchTLUT } \ No newline at end of file
diff --git a/include/sf64dma.h b/include/sf64dma.h
index 64447681..07b63739 100644
--- a/include/sf64dma.h
+++ b/include/sf64dma.h
@@ -137,7 +137,7 @@ DECLARE_SEGMENT(ast_title);
DECLARE_SEGMENT(ast_map);
DECLARE_SEGMENT(ast_option);
DECLARE_SEGMENT(ast_vs_menu);
-DECLARE_SEGMENT(ast_font);
+DECLARE_SEGMENT(ast_text);
DECLARE_SEGMENT(ast_font_3d);
DECLARE_SEGMENT(ast_andross);
DECLARE_SEGMENT(ast_logo);
diff --git a/src/dmatable.c b/src/dmatable.c
index b2b4f77c..fbe9e2d0 100644
--- a/src/dmatable.c
+++ b/src/dmatable.c
@@ -59,7 +59,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_map), { SEGMENT_ROM_START(ast_map), SEGMENT_ROM_END(ast_map) }, false },
{ SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
{ SEGMENT_ROM_START(ast_vs_menu), { SEGMENT_ROM_START(ast_vs_menu), SEGMENT_ROM_END(ast_vs_menu) }, false },
- { SEGMENT_ROM_START(ast_font), { SEGMENT_ROM_START(ast_font), SEGMENT_ROM_END(ast_font) }, false },
+ { SEGMENT_ROM_START(ast_text), { SEGMENT_ROM_START(ast_text), SEGMENT_ROM_END(ast_text) }, false },
{ SEGMENT_ROM_START(ast_font_3d), { SEGMENT_ROM_START(ast_font_3d), SEGMENT_ROM_END(ast_font_3d) }, false },
{ SEGMENT_ROM_START(ast_andross), { SEGMENT_ROM_START(ast_andross), SEGMENT_ROM_END(ast_andross) }, false },
{ SEGMENT_ROM_START(ast_logo), { SEGMENT_ROM_START(ast_logo), SEGMENT_ROM_END(ast_logo) }, false },
diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c
index 96eb29fc..ff4fb1be 100644
--- a/src/engine/fox_hud.c
+++ b/src/engine/fox_hud.c
@@ -66,7 +66,7 @@ s32 D_80161900[20];
#include "assets/ast_landmaster.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_versus.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_area_6.h"
@@ -204,10 +204,10 @@ void func_hud_80084B94(s32 arg0) {
Matrix_Scale(gGfxMatrix, 0.68f, 0.68f, 1.0f, MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, M_PI / 4, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_RotateZ(gGfxMatrix, 3 * M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -217,10 +217,10 @@ void func_hud_80084B94(s32 arg0) {
Matrix_RotateZ(gGfxMatrix, M_PI / 4, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.68f, 0.68f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_RotateZ(gGfxMatrix, 3 * M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -543,15 +543,15 @@ s32 func_hud_800863C8(void) {
}
UnkStruct_D_800D1AEC D_800D1AEC[] = {
- { D_500A050, 16, 15, D_CO_6000000, 128, 28 }, { D_500A140, 16, 15, D_ME_6000000, 96, 28 },
- { D_500A140, 16, 15, D_SY_6000000, 176, 12 }, { D_500A230, 16, 15, D_FO_6000000, 168, 28 },
- { D_500A230, 16, 15, D_KA_6000000, 168, 28 }, { D_500A230, 16, 15, D_AQ_6000000, 96, 13 },
- { D_500A320, 16, 15, D_SX_6000000, 176, 12 }, { D_500A320, 16, 15, D_SO_6000000, 112, 13 },
- { D_500A320, 16, 15, D_ZO_6000000, 112, 28 }, { D_500A410, 16, 15, D_TI_6000000, 96, 28 },
- { D_500A410, 16, 15, D_MA_6000000, 160, 28 }, { D_500A410, 16, 15, D_SZ_6000000, 176, 12 },
- { D_500A500, 16, 15, D_BO_6000000, 168, 19 }, { D_500A500, 16, 15, D_A6_6000000, 104, 28 },
- { D_500A5F0, 16, 15, D_VE1_6000D80, 128, 28 }, { D_500A5F0, 16, 15, D_VE2_60012D0, 128, 28 },
- { D_500A5F0, 16, 15, D_ANDROSS_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 },
+ { aLargeText_1, 16, 15, D_CO_6000000, 128, 28 }, { aLargeText_2, 16, 15, D_ME_6000000, 96, 28 },
+ { aLargeText_2, 16, 15, D_SY_6000000, 176, 12 }, { aLargeText_3, 16, 15, D_FO_6000000, 168, 28 },
+ { aLargeText_3, 16, 15, D_KA_6000000, 168, 28 }, { aLargeText_3, 16, 15, D_AQ_6000000, 96, 13 },
+ { aLargeText_4, 16, 15, D_SX_6000000, 176, 12 }, { aLargeText_4, 16, 15, D_SO_6000000, 112, 13 },
+ { aLargeText_4, 16, 15, D_ZO_6000000, 112, 28 }, { aLargeText_5, 16, 15, D_TI_6000000, 96, 28 },
+ { aLargeText_5, 16, 15, D_MA_6000000, 160, 28 }, { aLargeText_5, 16, 15, D_SZ_6000000, 176, 12 },
+ { aLargeText_6, 16, 15, D_BO_6000000, 168, 19 }, { aLargeText_6, 16, 15, D_A6_6000000, 104, 28 },
+ { aLargeText_7, 16, 15, D_VE1_6000D80, 128, 28 }, { aLargeText_7, 16, 15, D_VE2_60012D0, 128, 28 },
+ { aLargeText_7, 16, 15, D_ANDROSS_C000A80, 128, 28 }, { aLargeText_0, 16, 15, aTextTraining, 80, 12 },
};
void func_hud_80086444(void) {
@@ -656,7 +656,7 @@ void func_hud_80086664(f32 x, f32 y) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if ((j != 14) && (j != 15)) {
- TextureRect_8bIA(&gMasterDisp, D_5000500, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x1 + 28.0f,
y1 + 4.0f, 1.0f, 1.0f);
@@ -686,7 +686,8 @@ void func_hud_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5)
s32 j;
u8* D_800D1CD4[] = {
- D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0,
+ aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
+ aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9,
};
if (arg4 != 0) {
@@ -863,42 +864,42 @@ void func_hud_80086DCC(void) {
case 1:
if (boolTemp) {
for (i = 0; i < 11; i++) {
- TextureRect_8bIA(&gMasterDisp, D_5002DC0 + (136 * 2 * i), 136, 2, x + 50.0f, y + 50.0f + (2 * i),
+ TextureRect_8bIA(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 2, x + 50.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
- TextureRect_8bIA(&gMasterDisp, D_5002DC0 + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i), 1.0f,
- 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i),
+ 1.0f, 1.0f);
} else {
for (i = 0; i < 10; i++) {
- TextureRect_8bIA(&gMasterDisp, D_5004E20 + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i),
+ TextureRect_8bIA(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
- TextureRect_8bIA(&gMasterDisp, D_5004E20 + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
+ TextureRect_8bIA(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
case 2:
if (boolTemp) {
for (i = 0; i < 11; i++) {
- TextureRect_8bIA(&gMasterDisp, D_50022F0 + (120 * 2 * i), 120, 2, x - 62.0f, y + 50.0f + (2 * i),
+ TextureRect_8bIA(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 2, x - 62.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
- TextureRect_8bIA(&gMasterDisp, D_50022F0 + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i), 1.0f,
+ TextureRect_8bIA(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
} else {
for (i = 0; i < 11; i++) {
- TextureRect_8bIA(&gMasterDisp, D_5004580 + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i),
+ TextureRect_8bIA(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
- TextureRect_8bIA(&gMasterDisp, D_5004580 + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
+ TextureRect_8bIA(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
case 3:
- TextureRect_8bIA(&gMasterDisp, D_5003A00, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextMISSION, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
case 4:
- TextureRect_8bIA(&gMasterDisp, D_5000500, 112, 19, x, y, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, x, y, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x + 112.0f,
y, 1.0f, 1.0f);
@@ -976,7 +977,7 @@ void func_hud_80087530(f32 x, f32 y, s32 number) {
void func_hud_80087788(void) {
u16* D_800D1D18[] = { D_10050E0, D_100BAC0, D_100D900, D_10032A0 };
- u8* D_800D1D28[] = { D_5006CB0, D_5006E90, D_5006B30 };
+ u8* D_800D1D28[] = { aTextPeppy, aTextSlippy, aTextFalco };
s32 shield;
s32 D_800D1D34[] = { 48, 56, 48 }; // width
s32 D_800D1D40[] = { 10, 10, 8 }; // height
@@ -1231,11 +1232,11 @@ void func_hud_80087B5C(void) {
func_hud_800869A0(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, 0, 999);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_8bIA(&gMasterDisp, D_5001110, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextEnemiesDown, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
func_hud_800869A0(x1, y1 + 12.0f, D_801617C0[1], 1.0f, 1, 999);
- TextureRect_8bIA(&gMasterDisp, D_5001750, 128, 10, x3, y3, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextAccumTotal, 128, 10, x3, y3, 1.0f, 1.0f);
func_hud_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999);
@@ -1246,7 +1247,7 @@ void func_hud_80087B5C(void) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_8bIA(&gMasterDisp, D_5001C50, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextStatusOfTeam, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
func_hud_80087788();
func_hud_80084B94(0);
@@ -2695,7 +2696,8 @@ void func_hud_8008C104(u16* srcTexture, u16* dstTexture) {
void func_hud_8008C390(f32 xPos, f32 yPos, f32 scale, s32 number) {
void* D_800D1EC0[] = {
- D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480,
+ aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
+ aSmallText_5, aSmallText_6, aSmallText_7, aSmallText_8, aSmallText_9,
};
s32 i;
@@ -5392,8 +5394,8 @@ void stub_80094D18(void) {
}
void func_hud_80094D20(f32 x, f32 y) {
- u8* D_800D24DC[] = { D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320,
- D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0 };
+ u8* D_800D24DC[] = { aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
+ aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9 };
s32 D_800D2504[] = { 100, 10, 1 };
bool boolTemp;
s32 i;
diff --git a/src/engine/fox_load_inits.c b/src/engine/fox_load_inits.c
index c2cedfc0..392e45dd 100644
--- a/src/engine/fox_load_inits.c
+++ b/src/engine/fox_load_inits.c
@@ -46,7 +46,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
@@ -62,7 +62,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_award_front),
@@ -78,7 +78,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_award_back),
@@ -94,7 +94,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_expert),
@@ -110,7 +110,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
@@ -126,7 +126,7 @@ Scene sOvlending_Ending[6] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_expert),
@@ -145,7 +145,7 @@ Scene sOvlmenu_Title[1] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -164,7 +164,7 @@ Scene sOvlmenu_Option[1] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ ROM_SEGMENT(ast_option),
@@ -183,7 +183,7 @@ Scene sOvlmenu_Map[1] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -202,7 +202,7 @@ Scene sOvlmenu_GameOver[1] = {
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -221,7 +221,7 @@ Scene sOvli1_Corneria[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_corneria),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -240,7 +240,7 @@ Scene sOvli2_Meteo[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_meteo),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
@@ -256,7 +256,7 @@ Scene sOvli2_Meteo[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_meteo),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
@@ -275,7 +275,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_1),
/* 0x8 */ NO_SEGMENT,
@@ -291,7 +291,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ NO_SEGMENT,
@@ -307,7 +307,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
@@ -323,7 +323,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
@@ -339,7 +339,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
@@ -355,7 +355,7 @@ Scene sOvli5_Titania[6] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
@@ -374,7 +374,7 @@ Scene sOvli2_SectorX[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_x),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
@@ -390,7 +390,7 @@ Scene sOvli2_SectorX[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_x),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
@@ -409,7 +409,7 @@ Scene sOvli4_SectorZ[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_z),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -428,7 +428,7 @@ Scene sOvli3_Aquas[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_blue_marine),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_aquas),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -447,7 +447,7 @@ Scene sOvli3_Area6[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -466,7 +466,7 @@ Scene sOvli4_Fortuna[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -482,7 +482,7 @@ Scene sOvli4_Fortuna[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -501,7 +501,7 @@ Scene sOvli3_Unk4[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -520,7 +520,7 @@ Scene sOvli6_SectorY[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_y),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -539,7 +539,7 @@ Scene sOvli3_Solar[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_solar),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -558,7 +558,7 @@ Scene sOvli3_Zoness[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_zoness),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -577,7 +577,7 @@ Scene sOvli1_Venom1[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_1),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -596,7 +596,7 @@ Scene sOvli6_Andross[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -615,7 +615,7 @@ Scene sOvli6_Venom2[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -631,7 +631,7 @@ Scene sOvli6_Venom2[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -650,7 +650,7 @@ Scene sOvli2_Setup20[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_ve1_boss),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -669,7 +669,7 @@ Scene sOvli4_Bolse[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_bolse),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -688,7 +688,7 @@ Scene sOvli4_Katina[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_katina),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -707,7 +707,7 @@ Scene sOvli5_Macbeth[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -723,7 +723,7 @@ Scene sOvli5_Macbeth[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -742,7 +742,7 @@ Scene sOvli1_Training[1] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_training),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
@@ -761,7 +761,7 @@ Scene sOvli2_Versus[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
@@ -777,7 +777,7 @@ Scene sOvli2_Versus[2] = {
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
- /* 0x5 */ ROM_SEGMENT(ast_font),
+ /* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index df7a695f..6983f5b6 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
char D_801619A0[100];
@@ -794,8 +794,8 @@ void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number) {
1.0f);
}
-u8* sSmallNumberTex[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200,
- D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 };
+u8* sSmallNumberTex[] = { aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
+ aSmallText_5, aSmallText_6, aSmallText_7, aSmallText_8, aSmallText_9 };
void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number) {
s32 place;
@@ -819,21 +819,26 @@ char sLargeChars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ. 0123456789st-";
u8 sLargeCharWidths[] = { 15, 14, 14, 13, 13, 13, 14, 14, 5, 12, 14, 12, 16, 14, 15, 13, 16, 14, 13, 13, 13,
16, 17, 17, 16, 13, 5, 16, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 10, 9, 14, 0 };
u8* sLargeCharTex[] = {
- D_5008020, D_5008110, D_5008200, D_50082F0, D_50083E0, D_50084D0, D_50085C0, D_50086B0, D_50087A0,
- D_5008890, D_5008980, D_5008A70, D_5008B60, D_5008C50, D_5008D40, D_5008E30, D_5008F20, D_5009010,
- D_5009100, D_50091F0, D_50092E0, D_50093D0, D_50094C0, D_50096A0, D_5009880, D_5009A60, D_5009DB0,
- NULL, D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0,
- D_500A6E0, D_500A7D0, D_5009B50, D_5009C40, D_5009970,
+ aLargeText_A, aLargeText_B, aLargeText_C, aLargeText_D, aLargeText_E, aLargeText_F, aLargeText_G,
+ aLargeText_H, aLargeText_I, aLargeText_J, aLargeText_K, aLargeText_L, aLargeText_M, aLargeText_N,
+ aSmallText_O, aLargeText_P, aLargeText_Q, aLargeText_R, aLargeText_S, aLargeText_T, aLargeText_U,
+ aLargeText_V, aLargeText_W, aLargeText_X, aLargeText_Y, aLargeText_Z, aLargeText_DOT, NULL,
+ aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4, aLargeText_5, aLargeText_6,
+ aLargeText_7, aLargeText_8, aLargeText_9, aLargeText_s, aLargeText_t, aLargeText_HYPHEN,
};
u8* sLargeNumberTex[] = {
- D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0,
+ aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
+ aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9,
};
-u8* sSmallCharTex[] = { NULL, D_50070C0, D_5007100, D_5007180, D_50071C0, D_5007200, D_5007510,
- D_5007550, D_5007590, D_50075D0, D_5007610, D_5007650, D_5007F60, D_5007FA0,
- D_5007FE0, D_5009D30, D_5009D70, D_5009EA0, D_5009EE0, D_5009F20, D_500B380,
- D_500B440, D_500B480, D_500B4C0, D_500B500, D_500B540, D_500B5C0, D_5007140,
- D_500B400, D_500B580, D_500B3C0, D_5000000, D_5000080, D_5000100, D_5000180,
- D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 };
+u8* sSmallCharTex[] = { NULL, aSmallText_A, aSmallText_B, aSmallText_C, aSmallText_D,
+ aSmallText_E, aSmallText_F, aSmallText_G, aSmallText_H, aSmallText_I,
+ aSmallText_J, aSmallText_K, aSmallText_L, aSmallText_M, aSmallText_N,
+ aSmallText_o, aSmallText_p, aSmallText_q, aSmallText_r, aSmallText_s,
+ aSmallText_T, aSmallText_U, aSmallText_V, aSmallText_W, aSmallText_X,
+ aSmallText_Y, aSmallText_Z, aSmallTextExclamMark, aSmallText_COLON, aSmallText_HYPHEN,
+ aSmallText_DOT, aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3,
+ aSmallText_4, aSmallText_5, aSmallText_6, aSmallText_7, aSmallText_8,
+ aSmallText_9 };
void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char* text) {
u32 charIndex;
diff --git a/src/engine/fox_versus.c b/src/engine/fox_versus.c
index 1ed295c9..7fc56a95 100644
--- a/src/engine/fox_versus.c
+++ b/src/engine/fox_versus.c
@@ -2,7 +2,7 @@
#include "global.h"
#include "fox_option.h"
#include "assets/ast_vs_menu.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
#include "assets/ast_versus.h"
s32 D_versus_80178750;
@@ -209,8 +209,8 @@ void func_versus_800BD3A8(f32 xPos, f32 yPos) {
}
void func_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
- u8* D_800D4AF8[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200,
- D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 };
+ u8* D_800D4AF8[] = { aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
+ aSmallText_5, aSmallText_6, aSmallText_7, aSmallText_8, aSmallText_9 };
bool var_s2 = false;
s32 i = 1000;
s32 j;
@@ -238,8 +238,8 @@ void func_versus_800BD76C(f32 xPos, f32 yPos) {
}
void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
- u8* D_800D4B20[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200,
- D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 };
+ u8* D_800D4B20[] = { aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
+ aSmallText_5, aSmallText_6, aSmallText_7, aSmallText_8, aSmallText_9 };
s32 i;
for (i = 10; i != 1; i /= 10) {
@@ -260,12 +260,12 @@ void func_versus_800BD9FC(f32 xPos, f32 yPos) {
}
void func_versus_800BDA54(f32 xPos, f32 yPos) {
- TextureRect_8bIA(&gMasterDisp, D_5007F60, 8, 8, xPos, yPos, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aSmallText_L, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
- u8* D_800D4B48[] = { D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320,
- D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0 };
+ u8* D_800D4B48[] = { aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
+ aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9 };
s32 i = 1000;
s32 temp1;
s32 temp2;
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index a97b4119..86c404d5 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -183,10 +183,10 @@ void Ending_8018D814(u32 arg0, AssetInfo* asset) {
gDPSetPrimColor(gMasterDisp++, 0, 0, asset->primRed, asset->primGreen, asset->primBlue, alpha);
- TextureRect_8bIA(&gMasterDisp, D_5007240, 16, 15, asset->unk_18.x, asset->unk_18.y, 1.0f, 1.0f);
- TextureRect_8bIA(&gMasterDisp, D_5007420, 16, 15, asset->unk_18.x + 16.0f * 1, asset->unk_18.y, 1.0f, 1.0f);
- TextureRect_8bIA(&gMasterDisp, D_5007420, 16, 15, asset->unk_18.x + 16.0f * 2, asset->unk_18.y, 1.0f, 1.0f);
- TextureRect_8bIA(&gMasterDisp, D_5007330, 16, 15, asset->unk_18.x + 16.0f * 3, asset->unk_18.y, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, sLargeText_1997_1, 16, 15, asset->unk_18.x, asset->unk_18.y, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 1, asset->unk_18.y, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 2, asset->unk_18.y, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, sLargeText_1997_7, 16, 15, asset->unk_18.x + 16.0f * 3, asset->unk_18.y, 1.0f, 1.0f);
}
void Ending_8018DA0C(u32 arg0, AssetInfo* asset) {
diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c
index a0f98f1f..0e419211 100644
--- a/src/overlays/ovl_ending/fox_end2_data.c
+++ b/src/overlays/ovl_ending/fox_end2_data.c
@@ -3,7 +3,7 @@
#include "global.h"
#include "assets/ast_arwing.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
#include "assets/ast_title.h"
#include "assets/ast_ending.h"
@@ -188,7 +188,7 @@ Credit D_ending_80192E74[] = {
"HIROSHI YAMAUCHI", 7400, 200, 0, 120, 1, 0, 25, 20,
"NINTENDO", 7800, 200, 0, 120, 1, 0, 25, 20,
- D_50054B0, 8200, 380, 0, 110, 2, 1, 25, 20,
+ aText_THE_END, 8200, 380, 0, 110, 2, 1, 25, 20,
};
AssetInfo D_ending_801934B4[] = {
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index 8393cfab..a86c8a0a 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -10,7 +10,7 @@
#include "fox_map.h"
#include "fox_option.h"
#include "assets/ast_map.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
#include "assets/ast_font_3d.h"
// BSS STARTS HERE
@@ -5329,72 +5329,73 @@ void Map_801A9A8C(void) {
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
- sp54 = D_500A050;
+ sp54 = aLargeText_1;
+
sp58 = 0;
break;
case LEVEL_METEO:
- sp54 = D_500A140;
+ sp54 = aLargeText_2;
sp58 = 1;
break;
case LEVEL_SECTOR_Y:
- sp54 = D_500A140;
+ sp54 = aLargeText_2;
sp58 = 2;
break;
case LEVEL_FORTUNA:
- sp54 = D_500A230;
+ sp54 = aLargeText_3;
sp58 = 3;
break;
case LEVEL_KATINA:
- sp54 = D_500A230;
+ sp54 = aLargeText_3;
sp58 = 4;
break;
case LEVEL_AQUAS:
- sp54 = D_500A230;
+ sp54 = aLargeText_3;
sp58 = 5;
break;
case LEVEL_SECTOR_X:
- sp54 = D_500A320;
+ sp54 = aLargeText_4;
sp58 = 6;
break;
case LEVEL_SOLAR:
- sp54 = D_500A320;
+ sp54 = aLargeText_4;
sp58 = 7;
break;
case LEVEL_ZONESS:
- sp54 = D_500A320;
+ sp54 = aLargeText_4;
sp58 = 8;
break;
case LEVEL_TITANIA:
- sp54 = D_500A410;
+ sp54 = aLargeText_5;
sp58 = 9;
break;
case LEVEL_MACBETH:
- sp54 = D_500A410;
+ sp54 = aLargeText_5;
sp58 = 10;
break;
case LEVEL_SECTOR_Z:
- sp54 = D_500A410;
+ sp54 = aLargeText_5;
sp58 = 11;
break;
case LEVEL_BOLSE:
- sp54 = D_500A500;
+ sp54 = aLargeText_6;
sp58 = 12;
break;
case LEVEL_AREA_6:
- sp54 = D_500A500;
+ sp54 = aLargeText_6;
sp58 = 13;
break;
}
@@ -5408,7 +5409,7 @@ void Map_801A9A8C(void) {
}
#endif
- TextureRect_8bIA(&gMasterDisp, D_5000500, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, sp54, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f);
for (i = 0; i < D_menu_801AF834[sp58].height; i++) {
@@ -6037,7 +6038,7 @@ void Map_801ABCDC(s32 arg0, s32 alpha) {
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@@ -6048,7 +6049,7 @@ void Map_801ABCDC(s32 arg0, s32 alpha) {
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_500B600);
+ gSPDisplayList(gMasterDisp++, aDownWrenchDL);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gGfxMatrix);
diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c
index d2c945dd..1709ee10 100644
--- a/src/overlays/ovl_menu/fox_option.c
+++ b/src/overlays/ovl_menu/fox_option.c
@@ -8,7 +8,7 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "fox_option.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
#include "assets/ast_font_3d.h"
#include "assets/ast_option.h"
#include "assets/ast_vs_menu.h"
@@ -305,7 +305,8 @@ static Gfx D_menu_801AECE0[] = {
};
static u8* D_menu_801AECF8[10] = {
- D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0,
+ aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
+ aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9,
};
static f32 D_menu_801AED20[2] = { 255.0f, 255.0f };
@@ -2246,8 +2247,8 @@ void Option_80197A3C(s32 arg0, s32 arg1, s32 arg2) {
if (arg0 != 9) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[arg0 + 1], 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
} else {
- TextureRect_8bIA(&gMasterDisp, D_500A050, 16, 15, arg1 - 14.0f, arg2 - 25.0f, 1.0f, 1.0f);
- TextureRect_8bIA(&gMasterDisp, D_5009F60, 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aLargeText_1, 16, 15, arg1 - 14.0f, arg2 - 25.0f, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aLargeText_0, 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
}
RCP_SetupDL(&gMasterDisp, 0x55);
@@ -4079,7 +4080,7 @@ void Option_8019D118(void) {
if (D_menu_801B9138 == 1) {
if (gGameFrameCount & 0x10) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
- TextureRect_8bIA(&gMasterDisp, D_50021F0, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aTextEnd, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f);
}
}
diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c
index 21d2077d..e54ac142 100644
--- a/src/overlays/ovl_menu/fox_title.c
+++ b/src/overlays/ovl_menu/fox_title.c
@@ -7,7 +7,7 @@
#include "global.h"
#include "fox_title.h"
#include "assets/ast_title.h"
-#include "assets/ast_font.h"
+#include "assets/ast_text.h"
f32 D_menu_801B7BB0;
f32 D_menu_801B7BB4;
@@ -407,14 +407,14 @@ void Title_80187CA8(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_8bIA(&gMasterDisp, D_5000300, 16, 8, 148.0f, temp, 1.0f, 1.0f);
- TextureRect_8bIA(&gMasterDisp, D_5000200, 16, 8, 164, temp, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aSmallText_6, 16, 8, 148.0f, temp, 1.0f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, aSmallText_4, 16, 8, 164, temp, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
- TextureRect_8bIA(&gMasterDisp, &D_5007690[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f);
+ TextureRect_8bIA(&gMasterDisp, &aTextKanjiCOMPLETE[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f);
Title_80187E28();
}
diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml
index 76356b6e..1ecf5b91 100644
--- a/yamls/us/assets.yaml
+++ b/yamls/us/assets.yaml
@@ -362,14 +362,14 @@
subsegments:
- [0xCBFE70, .data, ast_vs_menu/ast_vs_menu]
- - name: ast_font
+ - name: ast_text
exclusive_ram_id: segment_05
type: code
dir: assets
vram: 0x05000000
start: 0xCD2410
subsegments:
- - [0xCD2410, .data, ast_font/ast_font]
+ - [0xCD2410, .data, ast_text/ast_text]
- name: ast_font_3d
exclusive_ram_id: segment_09