diff --git a/include/assets.h b/include/assets.h index adb89943..dee16c55 100644 --- a/include/assets.h +++ b/include/assets.h @@ -294,7 +294,6 @@ extern Gfx D_500B600[]; * ast_B0AA00, ast_B1CA50, ast_B2CA50, ast_B612E0, ast_B84560, * ast_BB11D0, ast_BC23D0, ast_BFC510, ast_C48F40, ast_DDC010 */ -extern u16 D_6000000[]; extern Gfx D_60005B0[]; extern u16 D_6000900[]; extern Gfx D_6000A80[]; diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 81aed539..0f8b7279 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -897,9 +897,14 @@ D_101B310 = 0x0101B310; D_101B1A0 = 0x0101B1A0; D_3000000 = 0x03000000; D_3000080 = 0x03000080; +D_5000D50 = 0x05000D50; +D_5006CB0 = 0x05006CB0; +D_5006E90 = 0x05006E90; +D_5006B30 = 0x05006B30; D_6001B80 = 0x06001B80; D_60020D0 = 0x060020D0; +D_C000A80 = 0x0C000A80; D_C001880 = 0x0C001880; D_C037FCC = 0x0C037FCC; D_C0380C0 = 0x0C0380C0; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 94b3ad21..8c899252 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -110,6 +110,7 @@ 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[]; @@ -121,6 +122,9 @@ 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[]; @@ -131,6 +135,7 @@ 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[]; extern u8 D_6000D80[]; @@ -138,6 +143,7 @@ extern u8 D_6001260[]; extern u8 D_60012D0[]; extern u8 D_6002890[]; extern Gfx D_6003090[]; +extern u8 D_C000A80[]; // DATA SECTION START @@ -594,15 +600,15 @@ s32 func_800863C8(void) { } UnkStruct_D_800D1AEC D_800D1AEC[] = { - { D_500A050, 16, 15, (u8*) D_6000000, 128, 28 }, { D_500A140, 16, 15, (u8*) D_6000000, 96, 28 }, - { D_500A140, 16, 15, (u8*) D_6000000, 176, 12 }, { D_500A230, 16, 15, (u8*) D_6000000, 168, 28 }, - { D_500A230, 16, 15, (u8*) D_6000000, 168, 28 }, { D_500A230, 16, 15, (u8*) D_6000000, 96, 13 }, - { D_500A320, 16, 15, (u8*) D_6000000, 176, 12 }, { D_500A320, 16, 15, (u8*) D_6000000, 112, 13 }, - { D_500A320, 16, 15, (u8*) D_6000000, 112, 28 }, { D_500A410, 16, 15, (u8*) D_6000000, 96, 28 }, - { D_500A410, 16, 15, (u8*) D_6000000, 160, 28 }, { D_500A410, 16, 15, (u8*) D_6000000, 176, 12 }, - { D_500A500, 16, 15, (u8*) D_6000000, 168, 19 }, { D_500A500, 16, 15, (u8*) D_6000000, 104, 28 }, - { 0x0500A5F0, 16, 15, D_6000D80, 128, 28 }, { 0x0500A5F0, 16, 15, D_60012D0, 128, 28 }, - { 0x0500A5F0, 16, 15, 0x0C000A80, 128, 28 }, { D_5009F60, 16, 15, 0x05000D50, 80, 12 }, + { D_500A050, 16, 15, D_6000000, 128, 28 }, { D_500A140, 16, 15, D_6000000, 96, 28 }, + { D_500A140, 16, 15, D_6000000, 176, 12 }, { D_500A230, 16, 15, D_6000000, 168, 28 }, + { D_500A230, 16, 15, D_6000000, 168, 28 }, { D_500A230, 16, 15, D_6000000, 96, 13 }, + { D_500A320, 16, 15, D_6000000, 176, 12 }, { D_500A320, 16, 15, D_6000000, 112, 13 }, + { D_500A320, 16, 15, D_6000000, 112, 28 }, { D_500A410, 16, 15, D_6000000, 96, 28 }, + { D_500A410, 16, 15, D_6000000, 160, 28 }, { D_500A410, 16, 15, D_6000000, 176, 12 }, + { D_500A500, 16, 15, D_6000000, 168, 19 }, { D_500A500, 16, 15, D_6000000, 104, 28 }, + { D_500A5F0, 16, 15, D_6000D80, 128, 28 }, { D_500A5F0, 16, 15, D_60012D0, 128, 28 }, + { D_500A5F0, 16, 15, D_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 }, }; void func_80086444(void) { @@ -962,8 +968,8 @@ void func_80086DCC(void) { } void func_80087530(f32 x, f32 y, s32 number) { - u8* D_800D1D00[] = { 0x03000000, 0x03000000, 0x03000000 }; - u16* D_800D1D0C[] = { 0x03000080, 0x03000080, 0x03000080 }; + u8* D_800D1D00[] = { D_3000000, D_3000000, D_3000000 }; + u16* D_800D1D0C[] = { D_3000080, D_3000080, D_3000080 }; Player* player = &gPlayer[0]; f32 x0; f32 x1; @@ -1026,7 +1032,7 @@ void func_80087530(f32 x, f32 y, s32 number) { void func_80087788(void) { u16* D_800D1D18[] = { D_10050E0, D_100BAC0, D_100D900, D_10032A0 }; - u8* D_800D1D28[] = { 0x05006CB0, 0x05006E90, 0x05006B30 }; + u8* D_800D1D28[] = { D_5006CB0, D_5006E90, D_5006B30 }; s32 shield; s32 D_800D1D34[] = { 48, 56, 48 }; // width s32 D_800D1D40[] = { 10, 10, 8 }; // height diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 727fe00a..0fc995a7 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -188,6 +188,8 @@ s32 D_menu_801CF11C; s32 D_menu_801CF120; f32 D_menu_801CF124; +extern u16 D_6000000[]; + 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 78c6192f..b1c5203f 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -160,6 +160,7 @@ f32 D_menu_801B9084; extern u8 D_5000200[]; extern u8 D_5000300[]; +extern u16 D_6000000[]; typedef struct { /* 0x00 */ Animation* unk_0;