summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorinspectredc <78732756+inspectredc@users.noreply.github.com>2024-04-01 02:53:09 +0100
committerGitHub <noreply@github.com>2024-03-31 22:53:09 -0300
commit2ef09bcf5d79e5e2dad0e6b59e0499ca6a91aef6 (patch)
treeca88c20c2d969d295fce6b0d58e0862f90d951e5 /src/main
parent8b4bb6d943d92df40e11b8bf9df413826d18b67c (diff)
export configuration for ast_andross (#189)
* export configuration for ast_andross * format * assets yaml
Diffstat (limited to 'src/main')
-rw-r--r--src/main/fox_bg.c4
-rw-r--r--src/main/fox_edata_1C.c14
-rw-r--r--src/main/fox_edisplay.c2
-rw-r--r--src/main/fox_enmy.c8
-rw-r--r--src/main/fox_enmy2.c2
-rw-r--r--src/main/fox_hud.c18
-rw-r--r--src/main/fox_play.c6
7 files changed, 27 insertions, 27 deletions
diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c
index 7649cb63..86ef8844 100644
--- a/src/main/fox_bg.c
+++ b/src/main/fox_bg.c
@@ -391,7 +391,7 @@ void func_8003E1E8(void) {
Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * 1.5f)) * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_C039208);
+ gSPDisplayList(gMasterDisp++, D_ANDROSS_C039208);
Matrix_Pop(&gGfxMatrix);
if (D_80177AB0 != 5) {
Matrix_Push(&gGfxMatrix);
@@ -399,7 +399,7 @@ void func_8003E1E8(void) {
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * -1.3f)) * M_DTOR,
1);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_C039208);
+ gSPDisplayList(gMasterDisp++, D_ANDROSS_C039208);
Matrix_Pop(&gGfxMatrix);
}
}
diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c
index 133fde2f..05c0795b 100644
--- a/src/main/fox_edata_1C.c
+++ b/src/main/fox_edata_1C.c
@@ -219,12 +219,12 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_F32_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
- /* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
- /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
+ /* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
+ /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_ANDROSS_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
- /* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
- /* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
- /* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
+ /* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
+ /* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
+ /* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -408,8 +408,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
- /* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
- /* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
+ /* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
+ /* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_ANDROSS_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_ITEM_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CHECKPOINT */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c
index a7d656a9..7ff7e3b6 100644
--- a/src/main/fox_edisplay.c
+++ b/src/main/fox_edisplay.c
@@ -1791,7 +1791,7 @@ void TexturedLine_Draw(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 25.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
- gSPDisplayList(gMasterDisp++, D_C017440);
+ gSPDisplayList(gMasterDisp++, D_ANDROSS_C017440);
}
} else {
Matrix_SetGfxMtx(&gMasterDisp);
diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c
index 83b0d176..15652392 100644
--- a/src/main/fox_enmy.c
+++ b/src/main/fox_enmy.c
@@ -22,9 +22,9 @@ u8 D_80161684;
#include "fox_enmy_assets.h"
ObjectInit* D_800CFDA0[] = {
- D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
- D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
- D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
+ D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
+ D_SO_601F234, D_ZO_6026714, D_ANDROSS_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
+ D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
@@ -529,7 +529,7 @@ void func_80062664(void) {
} else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C);
} else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) {
- D_80178310 = SEGMENTED_TO_VIRTUAL(D_C0356A4);
+ D_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4);
} else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_6010088);
} else {
diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c
index c7c536af..688b62c4 100644
--- a/src/main/fox_enmy2.c
+++ b/src/main/fox_enmy2.c
@@ -994,7 +994,7 @@ void func_8006D36C(Actor* actor) {
switch (gCurrentLevel) {
case LEVEL_VENOM_ANDROSS:
- var_v1 = SEGMENTED_TO_VIRTUAL(D_C037E3C);
+ var_v1 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C037E3C);
break;
case LEVEL_CORNERIA:
var_v1 = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8);
diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c
index b3c6d3fb..72d37071 100644
--- a/src/main/fox_hud.c
+++ b/src/main/fox_hud.c
@@ -564,15 +564,15 @@ s32 func_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_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_ANDROSS_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 fe7fb4c1..92977a3b 100644
--- a/src/main/fox_play.c
+++ b/src/main/fox_play.c
@@ -468,9 +468,9 @@ void func_800A5844(void) {
}
EnvSettings* D_800D2F98[21] = {
- &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_versus_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_ANDROSS_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_versus_302DD70,
};
void func_800A594C(void) {