From 7c2ce8a678056461858c20fd4dc39e1d01e3f5ce Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Thu, 25 Apr 2024 16:08:40 -0300 Subject: DOCS: ast_text (ex ast_font) (#223) * progress of docs * caiman here, no problems * Emergency manouvers! * complete * rename ast_font to ast_text --- src/engine/fox_hud.c | 70 +++++++++++++++++++------------------ src/engine/fox_load_inits.c | 84 ++++++++++++++++++++++----------------------- src/engine/fox_std_lib.c | 35 +++++++++++-------- src/engine/fox_versus.c | 16 ++++----- 4 files changed, 106 insertions(+), 99 deletions(-) (limited to 'src/engine') 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; -- cgit v1.2.3