mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-16 15:10:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add level tags to some segment 6 addresses (#179)

Browse Source 
* env

* format

* syms
This commit is contained in:
petrie911
2024-03-27 15:54:11 -05:00
committed by GitHub
parent 97f544c557
commit 38eba417f5
5 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_enmy2.c
+8 -8
View File
@@ -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]);
src/main/fox_hud.c
+21 -12
View File
@@ -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) {
src/main/fox_play.c
+3 -3
View File
@@ -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) {