From 14aa8c9db727a472b0911df7f21a5be6e25f8844 Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Fri, 8 Mar 2024 13:18:34 -0300 Subject: [PATCH] export configuration for ast_font (#151) * progress * goodbye ast_font.h * progress * progress * progress * progress * progress * progress * progress * Matchpoint * comments * comment * ast_font debinarized * add header to files * cleanup --- .vscode/settings.json | 5 +- assets/yaml/us/ast_font.yaml | 422 ++++++++++++++++++++++++++++ include/assets.h | 38 ++- include/assets/ast_font.h | 33 --- include/fox_std_lib_assets.h | 96 ------- include/fox_versus_assets.h | 15 - linker_scripts/us/undefined_syms.ld | 1 - src/main/fox_hud.c | 34 +-- src/main/fox_std_lib.c | 1 + src/main/fox_versus.c | 6 +- src/overlays/ovl_menu/fox_map.c | 2 + src/overlays/ovl_menu/fox_title.c | 2 + yamls/us/assets.yaml | 6 +- 13 files changed, 459 insertions(+), 202 deletions(-) create mode 100644 assets/yaml/us/ast_font.yaml delete mode 100644 include/assets/ast_font.h diff --git a/.vscode/settings.json b/.vscode/settings.json index c41f98c8..1f40419c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -80,7 +80,10 @@ "util": "c", "variant": "c", "chrono": "c", - "ast_allies.h": "c" + "ast_allies.h": "c", + "ast_font.h": "c", + "fox_std_lib_assets.h": "c", + "fox_versus_assets.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/assets/yaml/us/ast_font.yaml b/assets/yaml/us/ast_font.yaml new file mode 100644 index 00000000..855a9192 --- /dev/null +++ b/assets/yaml/us/ast_font.yaml @@ -0,0 +1,422 @@ +:config: + segments: + seg5: 0xCD2410 + header: + code: + - '#include "assets/ast_font.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +# 0 (small) +D_5000000: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000000, symbol: D_5000000 } + +# 1 (small) +D_5000080: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000080, symbol: D_5000080 } + +# 2 (small) +D_5000100: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000100, symbol: D_5000100 } + +# 3 (small) +D_5000180: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000180, symbol: D_5000180 } + +# 4 (small) +D_5000200: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000200, symbol: D_5000200 } + +# 5 (small) +D_5000280: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000280, symbol: D_5000280 } + +# 6 (small) +D_5000300: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000300, symbol: D_5000300 } + +# 7 (small) +D_5000380: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000380, symbol: D_5000380 } + +# 8 (small) +D_5000400: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000400, symbol: D_5000400 } + +# 9 (small) +D_5000480: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 8, offset: 0x5000480, symbol: D_5000480 } + +# Mission No. +D_5000500: + { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 19, offset: 0x5000500, symbol: D_5000500 } + +# Training +D_5000D50: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 12, offset: 0x5000D50, symbol: D_5000D50 } + +# Enemies Down +D_5001110: + { type: TEXTURE, ctype: u8, format: IA8, width: 64, height: 25, offset: 0x5001110, symbol: D_5001110 } + +# Accumulated Total +D_5001750: + { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 10, offset: 0x5001750, symbol: D_5001750 } + +# Status of Team +D_5001C50: + { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 12, offset: 0x5001C50, symbol: D_5001C50 } + +# End +D_50021F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 8, offset: 0x50021F0, symbol: D_50021F0 } + +# ACCOM +D_50022F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 23, offset: 0x50022F0, symbol: D_50022F0, pad: 8 } + +# PLISHED +D_5002DC0: + { type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002D88, pad: 8 } + +# MISSION +D_5003A00: + { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 23, offset: 0x5003A00, symbol: D_5003A00 } + +# COMP +D_5004580: + { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 23, offset: 0x5004580, symbol: D_5004580 } + +# LETE +D_5004E20: + { type: TEXTURE, ctype: u8, format: IA8, width: 80, height: 21, offset: 0x5004E20, symbol: D_5004E20 } + +# THE END +D_50054B0: + { type: TEXTURE, ctype: u8, format: IA8, width: 192, height: 30, offset: 0x50054B0, symbol: D_50054B0 } + +# Falco +D_5006B30: + { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 8, offset: 0x5006B30, symbol: D_5006B30 } + +# Peppy +D_5006CB0: + { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 10, offset: 0x5006CB0, symbol: D_5006CB0 } + +# Slippy +D_5006E90: + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 10, offset: 0x5006E90, symbol: D_5006E90 } + +# A (small) +D_50070C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50070C0, symbol: D_50070C0 } + +# B (small) +D_5007100: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007100, symbol: D_5007100 } + +# ! (small) +D_5007140: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007140, symbol: D_5007140 } + +# C (small) +D_5007180: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007180, symbol: D_5007180 } + +# D (small) +D_50071C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50071C0, symbol: D_50071C0 } + +# E (small) +D_5007200: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007200, symbol: D_5007200 } + +# 1 (large) +D_5007240: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007240, symbol: D_5007240 } + +# 7 (large) +D_5007330: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007330, symbol: D_5007330 } + +# 9 (large) +D_5007420: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5007420, symbol: D_5007420 } + +# F (small) +D_5007510: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007510, symbol: D_5007510 } + +# G (small) +D_5007550: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007550, symbol: D_5007550 } + +# H (small) +D_5007590: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007590, symbol: D_5007590 } + +# I (small) +D_50075D0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x50075D0, symbol: D_50075D0 } + +# J (small) +D_5007610: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007610, symbol: D_5007610 } + +# K (small) +D_5007650: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007650, symbol: D_5007650 } + +# 完 (Japanese letter meaning COMPLETE) +D_5007690: + { type: TEXTURE, ctype: u8, format: IA8, width: 48, height: 47, offset: 0x5007690, symbol: D_5007690 } + +# L (small) +D_5007F60: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007F60, symbol: D_5007F60 } + +# M (small) +D_5007FA0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FA0, symbol: D_5007FA0 } + +# N (small) +D_5007FE0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5007FE0, symbol: D_5007FE0 } + +# A (large) +D_5008020: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008020, symbol: D_5008020 } + +# B (large) +D_5008110: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008110, symbol: D_5008110 } + +# C (large) +D_5008200: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008200, symbol: D_5008200 } + +# D (large) +D_50082F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50082F0, symbol: D_50082F0 } + +# E (large) +D_50083E0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50083E0, symbol: D_50083E0 } + +# F (large) +D_50084D0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50084D0, symbol: D_50084D0 } + +# G (large) +D_50085C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50085C0, symbol: D_50085C0 } + +# H (large) +D_50086B0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50086B0, symbol: D_50086B0 } + +# I (large) +D_50087A0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50087A0, symbol: D_50087A0 } + +# J (large) +D_5008890: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008890, symbol: D_5008890 } + +# K (large) +D_5008980: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008980, symbol: D_5008980 } + +# L (large) +D_5008A70: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008A70, symbol: D_5008A70 } + +# M (large) +D_5008B60: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008B60, symbol: D_5008B60 } + +# N (large) +D_5008C50: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008C50, symbol: D_5008C50 } + +# O (large) +D_5008D40: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008D40, symbol: D_5008D40 } + +# P (large) +D_5008E30: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008E30, symbol: D_5008E30 } + +# Q (large) +D_5008F20: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5008F20, symbol: D_5008F20 } + +# R (large) +D_5009010: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009010, symbol: D_5009010 } + +# S (large) +D_5009100: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009100, symbol: D_5009100 } + +# T (large) +D_50091F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50091F0, symbol: D_50091F0 } + +# U (large) +D_50092E0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50092E0, symbol: D_50092E0 } + +# V (large) +D_50093D0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x50093D0, symbol: D_50093D0 } + +# W (large) +D_50094C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50094C0, symbol: D_50094C0 } + +# X (large) +D_50096A0: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 15, offset: 0x50096A0, symbol: D_50096A0 } + +# Y (large) +D_5009880: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009880, symbol: D_5009880 } + +# - (large) +D_5009970: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009970, symbol: D_5009970 } + +# Z (large) +D_5009A60: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009A60, symbol: D_5009A60 } + +# s (large) +D_5009B50: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009B50, symbol: D_5009B50 } + +# t (large) +D_5009C40: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009C40, symbol: D_5009C40 } + +# o (small) +D_5009D30: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D30, symbol: D_5009D30 } + +# p (small) +D_5009D70: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009D70, symbol: D_5009D70 } + +# . (large) +D_5009DB0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009DB0, symbol: D_5009DB0 } + +# q (small) +D_5009EA0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EA0, symbol: D_5009EA0 } + +# r (small) +D_5009EE0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009EE0, symbol: D_5009EE0 } + +# s (small) +D_5009F20: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x5009F20, symbol: D_5009F20 } + +# 0 (large) +D_5009F60: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x5009F60, symbol: D_5009F60 } + +# 1 (large) +D_500A050: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A050, symbol: D_500A050 } + +# 2 (large) +D_500A140: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A140, symbol: D_500A140 } + +# 3 (large) +D_500A230: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A230, symbol: D_500A230 } + +# 4 (large) +D_500A320: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A320, symbol: D_500A320 } + +# 5 (large) +D_500A410: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A410, symbol: D_500A410 } + +# 6 (large) +D_500A500: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A500, symbol: D_500A500 } + +# 7 (large) +D_500A5F0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A5F0, symbol: D_500A5F0 } + +# 8 (large) +D_500A6E0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A6E0, symbol: D_500A6E0 } + +# 9 (large) +D_500A7D0: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 15, offset: 0x500A7D0, symbol: D_500A7D0 } + +# 終 (Japanese letter meaning END) +D_500A8C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 56, height: 49, offset: 0x500A8C0, symbol: D_500A8C0, pad: 8 } + +# T (small) +D_500B380: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B380, symbol: D_500B380 } + +# . (small) +D_500B3C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B3C0, symbol: D_500B3C0 } + +# : (small) +D_500B400: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B400, symbol: D_500B400 } + +# u (small) +D_500B440: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B440, symbol: D_500B440 } + +# v (small) +D_500B480: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B480, symbol: D_500B480 } + +# w (small) +D_500B4C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B4C0, symbol: D_500B4C0 } + +# x (small) +D_500B500: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B500, symbol: D_500B500 } + +# y (small) +D_500B540: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B540, symbol: D_500B540 } + +# - (small) +D_500B580: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B580, symbol: D_500B580 } + +# z (small) +D_500B5C0: + { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 8, offset: 0x500B5C0, symbol: D_500B5C0 } + +# Wrench DisplayList (Teammate in maintenance state) +D_500B600: + { type: GFX, offset: 0x500B600, symbol: D_500B600 } + +# Wrench Texture +D_500B768: + { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 32, offset: 0x0500B768, symbol: D_500B768, tlut: 0x0D000160 } + +# Wrench TLUT +D_500B868: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0500B868, symbol: D_500B868 } \ No newline at end of file diff --git a/include/assets.h b/include/assets.h index 94f7301b..a159451c 100644 --- a/include/assets.h +++ b/include/assets.h @@ -230,28 +230,22 @@ extern Limb* D_400A398[]; extern Gfx D_400B390[]; // ast_font -extern u8 D_5000000[]; -extern u8 D_5000080[]; -extern u8 D_5000100[]; -extern u8 D_5000180[]; -extern u8 D_5000280[]; -extern u8 D_5000380[]; -extern u8 D_5000400[]; -extern u8 D_5000480[]; -extern u8 D_50021F0[]; -extern u16 D_50077B0[]; -extern u8 D_5007F60[]; -extern u8 D_5009F60[]; -extern u8 D_500A050[]; -extern u8 D_500A140[]; -extern u8 D_500A230[]; -extern u8 D_500A320[]; -extern u8 D_500A410[]; -extern u8 D_500A500[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; -extern Gfx D_500B600[]; +extern u8 D_50021F0[]; // fox_option +extern u8 D_50022F0[]; // fox_hud +extern u8 D_5002DC0[]; // fox_hud +extern u8 D_5003A00[]; // fox_hud +extern u16 D_50077B0[]; // fox_title +extern u8 D_5007F60[]; // fox_std_lib, fox_versus +extern u8 D_5009F60[]; // fox_std_lib, fox_versus, fox_option +extern u8 D_500A050[]; // fox_std_lib, fox_versus, fox_option, fox_map +extern u8 D_500A140[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud +extern u8 D_500A230[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud +extern u8 D_500A320[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud +extern u8 D_500A410[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud +extern u8 D_500A500[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud +extern u8 D_500A5F0[]; // fox_std_lib, fox_versus, fox_option, fox_hud +extern u8 D_500A6E0[]; // fox_std_lib, fox_versus, fox_option, fox_hud +extern u8 D_500A7D0[]; // fox_std_lib, fox_versus, fox_option, fox_hud /* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z, * ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*, diff --git a/include/assets/ast_font.h b/include/assets/ast_font.h deleted file mode 100644 index 10ef1bb6..00000000 --- a/include/assets/ast_font.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef AST_FONT_H -#define AST_FONT_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -extern u8 D_5000000[]; -extern u8 D_5000080[]; -extern u8 D_5000100[]; -extern u8 D_5000180[]; -extern u16 D_5000200[]; -extern u8 D_5000280[]; -extern u16 D_5000300[]; -extern u8 D_5000380[]; -extern u8 D_5000400[]; -extern u8 D_5000480[]; -extern u8 D_50021F0[]; -extern u16 D_50077B0[]; -extern u8 D_5007F60[]; -extern u8 D_5009F60[]; -extern u8 D_500A050[]; -extern u8 D_500A140[]; -extern u8 D_500A230[]; -extern u8 D_500A320[]; -extern u8 D_500A410[]; -extern u8 D_500A500[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; -extern Gfx D_500B600[]; - -#endif diff --git a/include/fox_std_lib_assets.h b/include/fox_std_lib_assets.h index 869f48cb..13cb0718 100644 --- a/include/fox_std_lib_assets.h +++ b/include/fox_std_lib_assets.h @@ -3,102 +3,6 @@ #include "global.h" -extern u8 D_5008020[]; -extern u8 D_5008110[]; -extern u8 D_5008200[]; -extern u8 D_50082F0[]; -extern u8 D_50083E0[]; -extern u8 D_50084D0[]; -extern u8 D_50085C0[]; -extern u8 D_50086B0[]; -extern u8 D_50087A0[]; -extern u8 D_5008890[]; -extern u8 D_5008980[]; -extern u8 D_5008A70[]; -extern u8 D_5008B60[]; -extern u8 D_5008C50[]; -extern u8 D_5008D40[]; -extern u8 D_5008E30[]; -extern u8 D_5008F20[]; -extern u8 D_5009010[]; -extern u8 D_5009100[]; -extern u8 D_50091F0[]; -extern u8 D_50092E0[]; -extern u8 D_50093D0[]; -extern u8 D_50094C0[]; -extern u8 D_50096A0[]; -extern u8 D_5009880[]; -extern u8 D_5009A60[]; -extern u8 D_5009DB0[]; -extern u8 D_5009F60[]; -extern u8 D_500A050[]; -extern u8 D_500A140[]; -extern u8 D_500A230[]; -extern u8 D_500A320[]; -extern u8 D_500A410[]; -extern u8 D_500A500[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; -extern u8 D_5009B50[]; -extern u8 D_5009C40[]; -extern u8 D_5009970[]; - -extern u8 D_50070C0[]; -extern u8 D_5007100[]; -extern u8 D_5007180[]; -extern u8 D_50071C0[]; -extern u8 D_5007200[]; -extern u8 D_5007510[]; -extern u8 D_5007550[]; -extern u8 D_5007590[]; -extern u8 D_50075D0[]; -extern u8 D_5007610[]; -extern u8 D_5007650[]; -extern u8 D_5007F60[]; -extern u8 D_5007FA0[]; -extern u8 D_5007FE0[]; -extern u8 D_5009D30[]; -extern u8 D_5009D70[]; -extern u8 D_5009EA0[]; -extern u8 D_5009EE0[]; -extern u8 D_5009F20[]; -extern u8 D_500B380[]; -extern u8 D_500B440[]; -extern u8 D_500B480[]; -extern u8 D_500B4C0[]; -extern u8 D_500B500[]; -extern u8 D_500B540[]; -extern u8 D_500B5C0[]; -extern u8 D_5007140[]; -extern u8 D_500B400[]; -extern u8 D_500B580[]; -extern u8 D_500B3C0[]; -extern u8 D_5000000[]; -extern u8 D_5000080[]; -extern u8 D_5000100[]; -extern u8 D_5000180[]; -extern u8 D_5000200[]; -extern u8 D_5000280[]; -extern u8 D_5000300[]; -extern u8 D_5000380[]; -extern u8 D_5000400[]; -extern u8 D_5000480[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; - -extern u8 D_5000000[]; -extern u8 D_5000080[]; -extern u8 D_5000100[]; -extern u8 D_5000180[]; -extern u8 D_5000200[]; -extern u8 D_5000280[]; -extern u8 D_5000300[]; -extern u8 D_5000380[]; -extern u8 D_5000400[]; -extern u8 D_5000480[]; - extern u8 D_1010660[]; extern u8 D_10106B0[]; extern u8 D_1010700[]; diff --git a/include/fox_versus_assets.h b/include/fox_versus_assets.h index 423f7b5d..a00033b0 100644 --- a/include/fox_versus_assets.h +++ b/include/fox_versus_assets.h @@ -19,19 +19,4 @@ extern u16 D_3008598[]; extern u16 D_300C458[]; extern u16 D_3005E38[]; -extern u8 D_5000000[]; -extern u8 D_5000080[]; -extern u8 D_5000100[]; -extern u8 D_5000180[]; -extern u8 D_5000200[]; -extern u8 D_5000280[]; -extern u8 D_5000300[]; -extern u8 D_5000280[]; -extern u8 D_5000380[]; -extern u8 D_5000400[]; -extern u8 D_5000480[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; - #endif diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 70145ea5..c44a7939 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -1503,7 +1503,6 @@ D_5001750 = 0x5001750; D_5001C50 = 0x5001C50; D_50021F0 = 0x50021F0; D_50022F0 = 0x50022F0; -D_5002D40 = 0x5002D40; D_5002DC0 = 0x5002DC0; D_5003A00 = 0x5003A00; D_5004580 = 0x5004580; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index cadc4bca..959d4a6c 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -108,34 +108,6 @@ extern Gfx D_101B480[]; extern Gfx D_101B310[]; extern Gfx D_101B1A0[]; extern u16 D_3000120[]; -extern u16 D_5000200[]; -extern u16 D_5000300[]; -extern u8 D_5000500[]; -extern u8 D_5000D50[]; -extern u8 D_5001110[]; -extern u8 D_5001750[]; -extern u8 D_5001C50[]; -extern u8 D_50022F0[]; -extern u8 D_5002D40[]; -extern u8 D_5002DC0[]; -extern u8 D_5003A00[]; -extern u8 D_5004580[]; -extern u8 D_5004DC0[]; -extern u8 D_5004E20[]; -extern u8 D_5005460[]; -extern u8 D_5006B30[]; -extern u8 D_5006CB0[]; -extern u8 D_5006E90[]; -extern u8 D_5009F60[]; -extern u8 D_500A050[]; -extern u8 D_500A140[]; -extern u8 D_500A230[]; -extern u8 D_500A320[]; -extern u8 D_500A410[]; -extern u8 D_500A500[]; -extern u8 D_500A5F0[]; -extern u8 D_500A6E0[]; -extern u8 D_500A7D0[]; extern u8 D_6000000[]; extern u16 D_6000840[]; extern u16 D_6000C80[]; @@ -149,6 +121,7 @@ extern u8 D_C000A80[]; #include "assets/ast_bg_space.h" #include "assets/ast_bg_planet.h" #include "assets/ast_allies.h" +#include "assets/ast_font.h" // DATA SECTION START @@ -2754,9 +2727,8 @@ void func_8008C104(u16* texture, u16* arg1) { } void func_8008C390(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { - u16* D_800D1EC0[] = { - (u16*) D_5000000, (u16*) D_5000080, (u16*) D_5000100, (u16*) D_5000180, D_5000200, - (u16*) D_5000280, D_5000300, (u16*) D_5000380, (u16*) D_5000400, (u16*) D_5000480, + void* D_800D1EC0[] = { + D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480, }; s32 i; diff --git a/src/main/fox_std_lib.c b/src/main/fox_std_lib.c index 4c7f14b4..cabacedc 100644 --- a/src/main/fox_std_lib.c +++ b/src/main/fox_std_lib.c @@ -3,6 +3,7 @@ char D_801619A0[100]; #include "fox_std_lib_assets.h" +#include "assets/ast_font.h" char* Graphics_ClearPrintBuffer(char* buf, s32 fill, s32 len) { s32 i; diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index 3f79739f..5ac4c407 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1,11 +1,12 @@ // #include "prevent_bss_reordering.h" #include "global.h" #include "fox_option.h" + s32 D_80178750; s32 D_80178754; s32 D_80178758; -s32 sUnlockLandmaster; // sUnlockLandmaster -s32 sUnlockOnFoot; // sUnlockOnFoot +s32 sUnlockLandmaster; +s32 sUnlockOnFoot; s32 D_80178768[4]; s32 D_80178778; s32 D_80178780[4]; @@ -39,6 +40,7 @@ OSTime D_80178860; OSTime D_80178868; #include "fox_versus_assets.h" +#include "assets/ast_font.h" s32 D_800D4A90 = 0; s32 D_800D4A94 = 0; diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index f3acebd8..13133b2f 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -191,6 +191,8 @@ f32 D_menu_801CF124; extern u16 D_6000000[]; +#include "assets/ast_font.h" + s32 D_menu_801AF420[2] = { 10, 20 }; u16* D_menu_801AF428[15][2] = { diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index 38683660..7dec2037 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -163,6 +163,8 @@ extern u8 D_5000200[]; extern u8 D_5000300[]; extern u16 D_6000000[]; +#include "assets/ast_font.h" + typedef struct { /* 0x00 */ Animation* unk_0; /* 0x04 */ Animation* unk_4; diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index f80418a6..d82790f8 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -228,8 +228,12 @@ - name: ast_font exclusive_ram_id: segment_05 - type: bin + type: code + dir: assets + vram: 0x05000000 start: 0xCD2410 + subsegments: + - [0xBFA740, .data, ast_font/ast_font] - name: ast_font_3d exclusive_ram_id: segment_09