diff --git a/include/assets.h b/include/assets.h index 81407558..319fe631 100644 --- a/include/assets.h +++ b/include/assets.h @@ -36,14 +36,14 @@ extern Gfx D_6004170[]; extern Vtx D_6004500[]; extern Gfx D_60046F0[]; extern Gfx D_6004900[]; -extern EnvSettings D_6005000; +extern EnvSettings D_TI_6005000; extern u16 D_6005710[]; extern Gfx D_6005780[]; extern Gfx D_6005880[]; extern Gfx D_60059F0[]; extern Gfx D_6006140[]; extern Gfx D_6006310[]; -extern u16* D_600631C[]; +extern u16* D_TI_600631C[]; extern Animation D_600636C; extern f32 D_60064AC[]; extern f32 D_60064C8[]; @@ -93,7 +93,7 @@ extern Gfx D_60079B0[]; extern Gfx D_6007CF0[]; extern Gfx D_6007D80[]; extern Gfx D_6007D90[]; -extern EnvSettings D_6007E30; +extern EnvSettings D_VE1_6007E30; extern Gfx D_6008370[]; extern Gfx D_6008770[]; extern Gfx D_6008830[]; @@ -142,7 +142,7 @@ extern Limb* D_600E470[]; extern Animation D_600E5EC; extern Gfx D_600E820[]; extern u8 D_600E980[]; -extern EnvSettings D_600EA90; +extern EnvSettings D_FO_600EA90; extern Gfx D_600EC90[]; extern Gfx D_600EFF0[]; extern Gfx D_600F160[]; @@ -164,7 +164,7 @@ extern Vec3s D_600FD50[]; extern f32 D_600FE9C[]; extern f32 D_600FEB8[]; extern f32 D_600FF30_Hitbox[]; -extern EnvSettings D_600FF30_Env; +extern EnvSettings D_BO_600FF30; extern f32 D_600FF80[]; extern f32 D_600FFA0[]; extern f32 D_600FFC0[]; @@ -180,7 +180,7 @@ extern Gfx D_6010A50[]; extern u16 D_6010C20[]; extern Gfx D_6010E00[]; extern u8 D_6010FA0[]; -extern EnvSettings D_6011000; +extern EnvSettings D_KA_6011000; extern f32 D_6011058[]; extern f32 D_601115C[]; extern Vec3s D_601170C[]; @@ -214,7 +214,7 @@ extern u8 D_60148B0[]; extern Gfx D_60148D0[]; extern Gfx D_6014A20[]; extern Gfx D_6014B50[]; -extern EnvSettings D_6014D50; +extern EnvSettings D_VE2_6014D50; extern CollisionPoly D_6014FEC[]; extern Gfx D_60153B0[]; extern u16 D_6015430[]; @@ -238,7 +238,7 @@ extern Gfx D_601A7A0[]; extern Gfx D_601A7D0[]; extern Gfx D_601AE40[]; extern Gfx D_601B0D0[]; -extern u16* D_601B1E4[]; +extern u16* D_VE1_601B1E4[]; extern f32 D_601B4C4[]; extern f32 D_601B4E0[]; extern f32 D_601B4FC[]; @@ -273,7 +273,7 @@ extern Animation D_601E8C4; extern Limb* D_601E9D0[]; extern Gfx D_601EAA0[]; extern Gfx D_601F1D0[]; -extern EnvSettings D_601F1F0; +extern EnvSettings D_SO_601F1F0; extern Gfx D_601F500[]; extern Gfx D_601F5A0[]; extern Animation D_601F874; @@ -284,7 +284,7 @@ extern Gfx D_60200E0[]; extern Gfx D_6020760[]; extern Gfx D_6020A30[]; extern Gfx D_6020B40[]; -extern u16* D_6020DD0[]; +extern u16* D_SO_600631C[]; extern Gfx D_6020E60[]; extern u16 D_6020F60[]; extern Gfx D_60223C0[]; @@ -305,8 +305,8 @@ extern Gfx D_6024B60[]; extern u16 D_6025500[]; extern Gfx D_6025B50[]; extern u16 D_6026420[]; -extern EnvSettings D_60266D0; -extern EnvSettings D_ENV_6026C80; +extern EnvSettings D_ZO_60266D0; +extern EnvSettings D_ME_6026C80; extern Gfx D_60270E0[]; extern Gfx D_6027180[]; extern Animation D_6027320; @@ -319,7 +319,7 @@ extern Animation D_6029528; extern Limb* D_6029674[]; extern Gfx D_6029890[]; extern Gfx D_602A720[]; -extern u16* D_602AAC0[]; +extern u16* D_ZO_602AAC0[]; extern u16 D_602AC50[]; extern ObjectInit* D_602B148[]; extern f32 D_602B9EC[]; @@ -353,7 +353,7 @@ extern Gfx D_602E380[]; extern Gfx D_602E570[]; extern Gfx D_602E7A0[]; extern Gfx D_602E9E0[]; -extern u16* D_602F3AC[]; +extern u16* D_ME_602F3AC[]; extern f32 D_602F638[]; extern f32 D_602F684[]; extern f32 D_602F6A0[]; @@ -372,7 +372,7 @@ extern Vec3s D_6030550[]; extern CollisionPoly D_60305DC[]; extern Gfx D_6030630[]; extern Gfx D_60306D0[]; -extern EnvSettings D_6030E30_Env; +extern EnvSettings D_MA_6030E30; extern Triangle D_6030E74[]; extern Vec3f D_6030E80[]; extern Triangle D_6030EB0[]; @@ -435,11 +435,11 @@ extern f32 D_6036930[]; extern f32 D_603694C[]; extern f32 D_6036968[]; extern Gfx D_6036CD0[]; -extern EnvSettings D_6037160; +extern EnvSettings D_CO_6037160; extern Gfx D_6037CF0[]; -extern u16* D_60381D8[]; +extern u16* D_MA_60381D8[]; extern ObjectInit D_603B074[]; -extern u16* D_603D9E8[]; +extern u16* D_CO_603D9E8[]; extern f32 D_603DCA4[]; extern f32 D_603DD40[]; extern f32 D_603DDF0[]; diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 11f642ce..c72c1afa 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -476,7 +476,7 @@ D_60034E0 = 0x060034E0; D_6003580 = 0x06003580; D_6003620 = 0x06003620; D_60036C0 = 0x060036C0; -D_6037160 = 0x06037160; +D_CO_6037160 = 0x06037160; D_601E424 = 0x0601E424; D_6026C80 = 0x06026C80; D_6029BE4 = 0x06029BE4; @@ -485,17 +485,17 @@ D_602A710 = 0x0602A710; D_6020058 = 0x06020058; D_A6_6023F20 = 0x06023F20; D_A6_6028760 = 0x06028760; -D_6007E30 = 0x06007E30; -D_601F1F0 = 0x0601F1F0; -D_60266D0 = 0x060266D0; +D_VE1_6007E30 = 0x06007E30; +D_SO_601F1F0 = 0x0601F1F0; +D_ZO_60266D0 = 0x060266D0; D_C035110 = 0x0C035110; -D_6030E30_Env = 0x06030E30; -D_6005000 = 0x06005000; +D_MA_6030E30 = 0x06030E30; +D_TI_6005000 = 0x06005000; D_AQ_602E540 = 0x0602E540; -D_600EA90 = 0x0600EA90; -D_6011000 = 0x06011000; -D_600FF30_Env = 0x0600FF30; -D_6014D50 = 0x06014D50; +D_FO_600EA90 = 0x0600EA90; +D_KA_6011000 = 0x06011000; +D_BO_600FF30 = 0x0600FF30; +D_VE2_6014D50 = 0x06014D50; D_60084C0 = 0x060084C0; D_6008D40 = 0x06008D40; D_6007C40 = 0x06007C40; @@ -822,7 +822,18 @@ D_6026EC0 = 0x06026EC0; D_6026DA0 = 0x06026DA0; D_6026D10 = 0x06026D10; D_6026C80 = 0x06026C80; -D_ENV_6026C80 = 0x06026C80; +D_ME_6026C80 = 0x06026C80; +D_CO_6000000 = 0x06000000; +D_ME_6000000 = 0x06000000; +D_FO_6000000 = 0x06000000; +D_KA_6000000 = 0x06000000; +D_SO_6000000 = 0x06000000; +D_ZO_6000000 = 0x06000000; +D_TI_6000000 = 0x06000000; +D_MA_6000000 = 0x06000000; +D_BO_6000000 = 0x06000000; +D_VE1_6000D80 = 0x06000D80; +D_VE2_60012D0 = 0x060012D0; D_6026BF0 = 0x06026BF0; D_6027460 = 0x06027460; D_6026F60 = 0x06026F60; @@ -1492,7 +1503,7 @@ D_6005710 = 0x6005710; D_AQ_6005954 = 0x6005954; D_60059F0 = 0x60059F0; D_AQ_6005A80 = 0x6005A80; -D_600631C = 0x600631C; +D_TI_600631C = 0x600631C; D_6006360 = 0x6006360; D_600636C = 0x600636C; D_6006558 = 0x6006558; @@ -1754,7 +1765,7 @@ D_601AE40 = 0x601AE40; D_601AFB8 = 0x601AFB8; D_AQ_601AFF0 = 0x601AFF0; D_601B184 = 0x601B184; -D_601B1E4 = 0x601B1E4; +D_VE1_601B1E4 = 0x601B1E4; D_A6_601B2B0 = 0x601B2B0; D_601B4B0 = 0x601B4B0; D_601B4C4 = 0x601B4C4; @@ -1813,7 +1824,7 @@ D_6020B40 = 0x6020B40; D_SX_6020C68 = 0x6020C68; D_AQ_6020C6C = 0x6020C6C; D_SX_6020D20 = 0x6020D20; -D_6020DD0 = 0x6020DD0; +D_SO_600631C = 0x6020DD0; D_6020E60 = 0x6020E60; D_6020F60 = 0x6020F60; D_SX_6020FB0 = 0x6020FB0; @@ -1891,7 +1902,7 @@ D_602A520 = 0x602A520; D_602A720 = 0x602A720; D_602AA04 = 0x602AA04; D_602AA7C = 0x602AA7C; -D_602AAC0 = 0x602AAC0; +D_ZO_602AAC0 = 0x602AAC0; D_602AB48 = 0x602AB48; D_AQ_602AC28 = 0x602AC28; D_AQ_602AC40 = 0x602AC40; @@ -1923,7 +1934,7 @@ D_602F264 = 0x602F264; D_602F2E0 = 0x602F2E0; D_602F36C = 0x602F36C; D_602F380 = 0x602F380; -D_602F3AC = 0x602F3AC; +D_ME_602F3AC = 0x602F3AC; D_602F638 = 0x602F638; D_602FBF0 = 0x602FBF0; D_602FEB4 = 0x602FEB4; @@ -1978,9 +1989,9 @@ D_6036818 = 0x6036818; D_6036840 = 0x6036840; D_6036CD0 = 0x6036CD0; D_6037CF0 = 0x6037CF0; -D_60381D8 = 0x60381D8; +D_MA_60381D8 = 0x60381D8; D_603B074 = 0x603B074; -D_603D9E8 = 0x603D9E8; +D_CO_603D9E8 = 0x603D9E8; D_603E748 = 0x603E748; D_603E7C4 = 0x603E7C4; D_603E924 = 0x603E924; diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 1ed7d8a1..fed9eb31 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -993,16 +993,16 @@ void func_8006D36C(Actor* actor) { var_v1 = SEGMENTED_TO_VIRTUAL(D_C037E3C); break; case LEVEL_CORNERIA: - var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8); + var_v1 = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8); break; case LEVEL_METEO: - var_v1 = SEGMENTED_TO_VIRTUAL(D_602F3AC); + var_v1 = SEGMENTED_TO_VIRTUAL(D_ME_602F3AC); break; case LEVEL_AQUAS: var_v1 = SEGMENTED_TO_VIRTUAL(D_AQ_60308B8); break; case LEVEL_TITANIA: - var_v1 = SEGMENTED_TO_VIRTUAL(D_600631C); + var_v1 = SEGMENTED_TO_VIRTUAL(D_TI_600631C); break; case LEVEL_SECTOR_X: var_v1 = SEGMENTED_TO_VIRTUAL(D_SX_60320D0); @@ -1017,22 +1017,22 @@ void func_8006D36C(Actor* actor) { var_v1 = SEGMENTED_TO_VIRTUAL(D_SY_6032E18); break; case LEVEL_SOLAR: - var_v1 = SEGMENTED_TO_VIRTUAL(D_6020DD0); + var_v1 = SEGMENTED_TO_VIRTUAL(D_SO_600631C); break; case LEVEL_ZONESS: - var_v1 = SEGMENTED_TO_VIRTUAL(D_602AAC0); + var_v1 = SEGMENTED_TO_VIRTUAL(D_ZO_602AAC0); break; case LEVEL_VENOM_1: - var_v1 = SEGMENTED_TO_VIRTUAL(D_601B1E4); + var_v1 = SEGMENTED_TO_VIRTUAL(D_VE1_601B1E4); break; case LEVEL_MACBETH: - var_v1 = SEGMENTED_TO_VIRTUAL(D_60381D8); + var_v1 = SEGMENTED_TO_VIRTUAL(D_MA_60381D8); break; case LEVEL_TRAINING: var_v1 = SEGMENTED_TO_VIRTUAL(D_TR_6009B34); break; default: - var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8); + var_v1 = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8); break; } temp_s1 = SEGMENTED_TO_VIRTUAL(var_v1[actor->unk_0E4]); diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 4cc29002..de722af5 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -91,11 +91,20 @@ void func_80087788(void); // Segmented addresses -extern u8 D_6000000[]; +extern u8 D_CO_6000000[]; +extern u8 D_ME_6000000[]; +extern u8 D_MA_6000000[]; +extern u8 D_FO_6000000[]; +extern u8 D_KA_6000000[]; +extern u8 D_SO_6000000[]; +extern u8 D_ZO_6000000[]; +extern u8 D_TI_6000000[]; +extern u8 D_BO_6000000[]; + extern u16 D_6000C80[]; -extern u8 D_6000D80[]; +extern u8 D_VE1_6000D80[]; extern u8 D_6001260[]; -extern u8 D_60012D0[]; +extern u8 D_VE2_60012D0[]; extern u8 D_6002890[]; extern Gfx D_6003090[]; @@ -561,15 +570,15 @@ s32 func_800863C8(void) { } UnkStruct_D_800D1AEC D_800D1AEC[] = { - { D_500A050, 16, 15, D_6000000, 128, 28 }, { D_500A140, 16, 15, D_6000000, 96, 28 }, - { D_500A140, 16, 15, D_SY_6000000, 176, 12 }, { D_500A230, 16, 15, D_6000000, 168, 28 }, - { D_500A230, 16, 15, D_6000000, 168, 28 }, { D_500A230, 16, 15, D_AQ_6000000, 96, 13 }, - { D_500A320, 16, 15, D_SZ_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_SX_6000000, 176, 12 }, - { D_500A500, 16, 15, D_6000000, 168, 19 }, { D_500A500, 16, 15, D_A6_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 }, + { 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_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 }, }; void func_80086444(void) { diff --git a/src/main/fox_play.c b/src/main/fox_play.c index b9b37a3a..46e2a9c2 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -463,9 +463,9 @@ void func_800A5844(void) { } EnvSettings* D_800D2F98[21] = { - &D_6037160, &D_ENV_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_6007E30, - &D_601F1F0, &D_60266D0, &D_C035110, &D_TR_6006A60, &D_6030E30_Env, &D_6005000, &D_AQ_602E540, - &D_600EA90, NULL, &D_6011000, &D_600FF30_Env, &D_SZ_6006E70, &D_6014D50, &D_vs_player_302DD70, + &D_CO_6037160, &D_ME_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_VE1_6007E30, + &D_SO_601F1F0, &D_ZO_60266D0, &D_C035110, &D_TR_6006A60, &D_MA_6030E30, &D_TI_6005000, &D_AQ_602E540, + &D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_vs_player_302DD70, }; void func_800A594C(void) {