mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-02 00:34:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

export configuration ast_zoness and bump torch for generic array factory (#192)

Browse Source 
* ast_zoness

* format

* remove ast_zoness.h

* change name to D_ZO_601996C

* rename to yaml and use vec3f array

* prevent_bss_reordering in fox_edisplay

* format

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
This commit is contained in:
inspectredc
2024-04-01 19:17:46 +01:00
committed by GitHub
parent 9604a29140
commit 5844ffc4dd
20 changed files with 621 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_A4290_colheaders.c
+2 -1
View File
@@ -12,6 +12,7 @@
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_versus.h"
#include "assets/ast_zoness.h"
static Vec3f D_800D2920[16] = {
{ 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
@@ -162,7 +163,7 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -488.0f, 0.0f, -568.0f },
{ 488.0f, 148.0f, 567.0f },
30,
D_602CACC,
D_ZO_602CACC,
D_602CB80,
},
{
src/main/fox_bg.c
+5 -4
View File
@@ -36,6 +36,7 @@ f32 D_80161394; // can be static
#include "assets/ast_andross.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_area_6.h"
#include "assets/ast_zoness.h"
f32 D_800C9C30 = 0.0f;
u16 D_800C9C34 = 1;
@@ -476,7 +477,7 @@ void func_8003E1E8(void) {
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_MA_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6013480);
gSPDisplayList(gMasterDisp++, D_ZO_6013480);
} else if (gCurrentLevel == LEVEL_SOLAR) {
gSPDisplayList(gMasterDisp++, D_601E150);
}
@@ -492,7 +493,7 @@ void func_8003E1E8(void) {
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_MA_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6013480);
gSPDisplayList(gMasterDisp++, D_ZO_6013480);
} else if (gCurrentLevel == LEVEL_SOLAR) {
gSPDisplayList(gMasterDisp++, D_601E150);
}
@@ -1111,9 +1112,9 @@ void func_80040CE4(void) {
Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gGameFrameCount & 1) {
gSPDisplayList(gMasterDisp++, D_6008830);
gSPDisplayList(gMasterDisp++, D_ZO_6008830);
} else {
gSPDisplayList(gMasterDisp++, D_600B0E0);
gSPDisplayList(gMasterDisp++, D_ZO_600B0E0);
}
break;
}
src/main/fox_edata_1C.c
+17 -16
View File
@@ -21,6 +21,7 @@
#include "assets/ast_andross.h"
#include "assets/ast_ve1_boss.h"
#include "assets/ast_area_6.h"
#include "assets/ast_zoness.h"
f32 D_800CBE70[] = {
1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
@@ -135,11 +136,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_43, */ {(void*) D_6024AC0, 0, (ObjectFunc) NULL, D_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_44, */ {(void*) D_600F560, 0, (ObjectFunc) NULL, D_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_45, */ {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_46, */ {(void*) D_600E820, 0, (ObjectFunc) NULL, D_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_47, */ {(void*) D_601FCB0, 0, (ObjectFunc) NULL, D_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_43, */ {(void*) D_ZO_6024AC0, 0, (ObjectFunc) NULL, D_ZO_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_44, */ {(void*) D_ZO_600F560, 0, (ObjectFunc) NULL, D_ZO_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_45, */ {(void*) D_ZO_600EC90, 0, (ObjectFunc) NULL, D_ZO_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_46, */ {(void*) D_ZO_600E820, 0, (ObjectFunc) NULL, D_ZO_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_47, */ {(void*) D_ZO_601FCB0, 0, (ObjectFunc) NULL, D_ZO_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_48, */ {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_VE1_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_VE1_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_50, */ {(void*) D_VE1_6007410, 0, (ObjectFunc) NULL, D_VE1_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -327,26 +328,26 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_ZO_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_ZO_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_ACTOR_238 */ {(void*) func_i3_801914C4, 2, (ObjectFunc) func_i3_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) func_i3_80191B4C, 1, (ObjectFunc) func_i3_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) func_i3_80191DB0, 1, (ObjectFunc) func_i3_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094, D_ZO_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_243 */ {(void*) func_i3_80192C18, 2, (ObjectFunc) func_i3_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_244 */ {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_244 */ {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64, D_ZO_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) func_i3_8019983C, 1, (ObjectFunc) func_i3_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) func_i3_80199E24, 1, (ObjectFunc) func_i3_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C, D_ZO_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) func_i3_8019A1FC, 1, (ObjectFunc) func_i3_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) func_i3_8019ACCC, 1, (ObjectFunc) func_i3_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548, D_ZO_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854, D_ZO_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48, D_ZO_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454, D_ZO_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC, D_ZO_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -399,7 +400,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_304 */ {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38, D_SX_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_ZO_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_FO_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
src/main/fox_edisplay.c
+8 -7
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "assets.h"
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
Vec3f D_801615D0;
Vec3f D_801615E0;
s32 D_801615EC;
@@ -26,6 +26,7 @@ WingInfo D_80161630;
#include "assets/ast_enmy_space.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_ve1_boss.h"
#include "assets/ast_zoness.h"
char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
@@ -199,15 +200,15 @@ Gfx* D_800CFA54[] = {
D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_FO_6005CC0,
};
Gfx* D_800CFAC4[] = {
D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0,
D_60176D0, D_6017810, D_6017770, D_ZO_6016D90, D_ZO_6016E30, D_60178B0,
};
Gfx* D_800CFADC[] = {
D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_6016350,
D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_ZO_6016350,
D_6021E20, D_60222A0, D_6022BE0, D_6022D70, D_6022F00,
};
Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 };
Gfx* D_800CFB14[] = { D_60163E0, D_60165D0, D_6016880, D_6016B50, D_6000C40 };
Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB14[] = { D_ZO_60163E0, D_ZO_60165D0, D_ZO_6016880, D_ZO_6016B50, D_ZO_6000C40 };
Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_ZO_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB40[] = {
D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810,
};
@@ -230,8 +231,8 @@ Gfx* D_800CFC0C[] = {
Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 };
Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 };
Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 };
Gfx* D_800CFC7C[] = { D_601B570, D_VE1_601B710, D_60209B0, D_6020B70, D_6020D50,
D_601B8F0, D_601B3B0, D_601B1C0, D_6011660 };
Gfx* D_800CFC7C[] = { D_601B570, D_VE1_601B710, D_60209B0, D_6020B70, D_6020D50,
D_601B8F0, D_601B3B0, D_601B1C0, D_ZO_6011660 };
void func_8005A094(Actor* actor) {
switch (actor->state) {
src/main/fox_effect.c
+6 -5
View File
@@ -6,9 +6,9 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n";
const char D_800D7240[] = "a=<%d>\n";
const char D_800D7248[] = "a=<%d>\n";
extern Gfx D_6016880[];
extern Gfx D_ZO_6016880[];
extern Gfx D_6018AF0[];
extern Gfx D_601BAD0[];
extern Gfx D_ZO_601BAD0[];
#include "assets/ast_blue_marine.h"
#include "assets/ast_arwing.h"
@@ -26,6 +26,7 @@ extern Gfx D_601BAD0[];
#include "assets/ast_A_ti.h"
#include "assets/ast_ve1_boss.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_zoness.h"
s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
s32 i;
@@ -214,7 +215,7 @@ void func_80077A7C(Effect* effect) {
Matrix_Scale(gGfxMatrix, effect->scale1, effect->scale2, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6024220);
gSPDisplayList(gMasterDisp++, D_ZO_6024220);
RCP_SetupDL(&gMasterDisp, 0x40);
}
@@ -3908,7 +3909,7 @@ void func_80082F78(Effect* effect) {
gSPDisplayList(gMasterDisp++, D_AQ_600A220);
}
if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6016880);
gSPDisplayList(gMasterDisp++, D_ZO_6016880);
}
break;
@@ -4060,7 +4061,7 @@ void func_80083B8C(Effect* effect) {
gDPSetEnvColor(gMasterDisp++, 36, 45, 28, 255);
Matrix_Scale(gGfxMatrix, effect->unk_60.x, effect->scale2 * effect->unk_60.y, effect->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601BAD0);
gSPDisplayList(gMasterDisp++, D_ZO_601BAD0);
RCP_SetupDL(&gMasterDisp, 0x40);
}
src/main/fox_enmy.c
+1
View File
@@ -15,6 +15,7 @@
#include "assets/ast_area_6.h"
#include "assets/ast_training.h"
#include "assets/ast_versus.h"
#include "assets/ast_zoness.h"
s32 D_Timer_80161670[4];
s32 D_80161680;
src/main/fox_enmy2.c
+7 -6
View File
@@ -25,6 +25,7 @@ s32 D_80161690;
#include "assets/ast_enmy_space.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_ve1_boss.h"
#include "assets/ast_zoness.h"
void func_8006A7B0(u16* msg, s32 character) {
PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
@@ -917,13 +918,13 @@ UnkStruct_D003C D_800D003C[108] = {
{ NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 },
{ D_SY_60102C0, D_SY_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_ME_6017B60, D_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 },
{ D_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 },
{ D_ZO_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 },
{ D_ME_601A880, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ NULL, D_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_ENMY_SPACE_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
@@ -950,7 +951,7 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_SY_601C6A0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 },
{ D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 },
{ NULL, D_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 },
{ NULL, D_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
{ NULL, D_ZO_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
{ NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
@@ -3494,7 +3495,7 @@ void func_80072594(Actor* actor) {
case 79:
if (actor->timer_0C4 == 0) {
actor->unk_0B6 += 1;
if (Animation_GetFrameCount(&D_600E5EC) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_ZO_600E5EC) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
}
@@ -3982,11 +3983,11 @@ void func_80074FF0(Actor* actor) {
break;
case 52:
Animation_GetFrameData(&D_601F874, actor->unk_0B6, sp114);
Animation_GetFrameData(&D_ZO_601F874, actor->unk_0B6, sp114);
sp114[2].z -= actor->fwork[15];
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
Animation_DrawSkeleton(1, D_601F920, sp114, NULL, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_ZO_601F920, sp114, NULL, NULL, actor, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
src/main/fox_play.c
+11 -10
View File
@@ -20,6 +20,7 @@
#include "assets/ast_arwing.h"
#include "assets/ast_versus.h"
#include "assets/ast_area_6.h"
#include "assets/ast_zoness.h"
UNK_TYPE D_800D2F50 = 0;
s32 D_800D2F54 = 0;
@@ -102,11 +103,11 @@ void func_800A3FEC(void) {
break;
case LEVEL_ZONESS:
if (gGameFrameCount & 1) {
spB4 = SEGMENTED_TO_VIRTUAL(D_6009ED0);
spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
} else {
spB4 = SEGMENTED_TO_VIRTUAL(D_600C780);
spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
}
spB0 = SEGMENTED_TO_VIRTUAL(D_602AC50);
spB0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
spA8 = 7;
sp90 = 40.0f;
sp8C = 0.2f;
@@ -1002,8 +1003,8 @@ bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) {
spA0 = SEGMENTED_TO_VIRTUAL(D_6022760);
break;
case LEVEL_ZONESS:
spA4 = SEGMENTED_TO_VIRTUAL(D_6009ED0);
spA0 = SEGMENTED_TO_VIRTUAL(D_602AC50);
spA4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
spA0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
break;
default:
return false;
@@ -2447,7 +2448,7 @@ void func_800AB334(void) {
mesh = SEGMENTED_TO_VIRTUAL(D_6001C50);
break;
case LEVEL_ZONESS:
mesh = SEGMENTED_TO_VIRTUAL(D_6009ED0);
mesh = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
break;
}
for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -2467,7 +2468,7 @@ void func_800AB334(void) {
mesh = SEGMENTED_TO_VIRTUAL(D_6004500);
break;
case LEVEL_ZONESS:
mesh = SEGMENTED_TO_VIRTUAL(D_600C780);
mesh = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
break;
}
for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -6248,12 +6249,12 @@ void func_800B79B0(void) {
case LEVEL_ZONESS:
func_800A3FEC();
for (D_80177CE8; D_80177CE8 >= 20.0f; D_80177CE8 -= 20.0f) {
Texture_Scroll(D_602C2CC, 32, 32, 1);
Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
}
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6) {
Texture_Scroll(D_602C2CC, 32, 32, 1);
Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
}
func_8008C104(D_602C2CC, D_600D990);
func_8008C104(D_ZO_602C2CC, D_ZO_600D990);
if (func_800A73E4(&sp3C, &sp40, gPlayer[0].camEye.x, gPlayer[0].camEye.y,
gPlayer[0].camEye.z - D_80177D20)) {
gLight1R = 0;
src/main/fox_radio.c
+3 -2
View File
@@ -24,6 +24,7 @@ s32 D_80178748;
#include "assets/ast_great_fox.h"
#include "assets/ast_area_6.h"
#include "assets/ast_title.h"
#include "assets/ast_zoness.h"
s32 gCurrentMsgPri = 0;
@@ -291,10 +292,10 @@ void func_800BAAE8(void) {
sp44 = D_A6_60038C0;
break;
case RCID_BOSS_ZONESS:
sp44 = D_6014510;
sp44 = D_ZO_6014510;
break;
case RCID_BOSS_ZONESS_OPEN:
sp44 = D_6015430;
sp44 = D_ZO_6015430;
break;
case RCID_BOSS_SECTORX:
sp44 = D_SX_6020FB0;
src/overlays/ovl_i3/fox_zo.c
+74 -74
View File
@@ -2,6 +2,7 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_zoness.h"
// f32 temp[] = {
// 13.0f,
@@ -78,39 +79,38 @@ void func_i3_8019962C(Boss* bossZO, f32 arg1);
// /* 0xC */ NO_SEGMENT,
// /* 0xD */ ROM_SEGMENT(ast_955270),
extern Gfx D_6002E10[];
extern Gfx D_6004380[];
extern Gfx D_6006360[];
extern Limb* D_600E7D8[];
extern Gfx D_6013330[];
extern Gfx D_6017950[];
extern Gfx D_60181E0[];
extern Animation D_6018550;
extern Limb* D_601863C[];
extern Gfx D_6018660[];
extern Animation D_60195EC;
extern Limb* D_6019738[];
extern Animation D_601996C;
extern Limb* D_6019E18[];
extern Gfx D_6019EB0[];
extern Gfx D_601A340[];
extern Animation D_601AA48;
extern Limb* D_601AB14[];
extern Animation D_601AFB8;
extern Limb* D_601B184[];
extern Gfx D_601BCC0[];
extern Gfx D_601C590[];
extern Gfx D_601D680[];
extern Animation D_601FBC4;
extern Limb* D_601FC90[];
extern Animation D_6021ABC;
extern Limb* D_6021B88[];
extern Gfx D_6023D50[];
extern Gfx D_6025E60[];
extern f32 D_602C028[];
extern Gfx D_60012A0[];
extern Gfx D_60239E0[];
extern Gfx D_6023730[];
extern Gfx D_ZO_6002E10[];
extern Gfx D_ZO_6004380[];
extern Gfx D_ZO_6006360[];
extern Limb* D_ZO_600E7D8[];
extern Gfx D_ZO_6013330[];
extern Gfx D_ZO_6017950[];
extern Gfx D_ZO_60181E0[];
extern Animation D_ZO_6018550;
extern Limb* D_ZO_601863C[];
extern Gfx D_ZO_6018660[];
extern Animation D_ZO_60195EC;
extern Limb* D_ZO_6019738[];
extern Limb* D_ZO_6019E18[];
extern Gfx D_ZO_6019EB0[];
extern Gfx D_ZO_601A340[];
extern Animation D_ZO_601AA48;
extern Limb* D_ZO_601AB14[];
extern Animation D_ZO_601AFB8;
extern Limb* D_ZO_601B184[];
extern Gfx D_ZO_601BCC0[];
extern Gfx D_ZO_601C590[];
extern Gfx D_ZO_601D680[];
extern Animation D_ZO_601FBC4;
extern Limb* D_ZO_601FC90[];
extern Animation D_ZO_6021ABC;
extern Limb* D_ZO_6021B88[];
extern Gfx D_ZO_6023D50[];
extern Gfx D_ZO_6025E60[];
extern f32 D_ZO_602C028[];
extern Gfx D_ZO_60012A0[];
extern Gfx D_ZO_60239E0[];
extern Gfx D_ZO_6023730[];
// typedef struct {
// /* 0 */ char pad0[4];
@@ -686,8 +686,8 @@ void func_i3_80190430(Actor* actor) {
Vec3f sp30[30];
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
Animation_GetFrameData(&D_600E5EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_600E7D8, sp30, func_i3_8019019C, func_i3_80190204, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_600E5EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_ZO_600E7D8, sp30, func_i3_8019019C, func_i3_80190204, actor, gCalcMatrix);
}
void func_i3_801904CC(Actor* actor) {
@@ -722,7 +722,7 @@ void func_i3_801904CC(Actor* actor) {
break;
}
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_600E5EC) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_ZO_600E5EC) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
if ((actor->unk_0D0 != 0) && (actor->health != 0)) {
@@ -813,7 +813,7 @@ s16 D_i3_801BF56C[20] = {
u8 D_i3_801BF594[20] = {
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
};
Gfx* D_i3_801BF5A8[3] = { D_60012A0, D_60239E0, D_6023730 };
Gfx* D_i3_801BF5A8[3] = { D_ZO_60012A0, D_ZO_60239E0, D_ZO_6023730 };
void func_i3_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 arg6, s32 arg7) {
Matrix_Push(&gGfxMatrix);
@@ -838,7 +838,7 @@ typedef struct {
} JntHitbox;
void func_i3_80190D0C(Actor* actor) {
Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_602BC58))->boxes);
Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_ZO_602BC58))->boxes);
s32 i;
s32 k;
PosRot* temp_s0;
@@ -923,7 +923,7 @@ void func_i3_80191010(Actor* actor) {
actor->unk_0B6--;
}
} else {
if (actor->unk_0B6 < Animation_GetFrameCount(&D_601AA48)) {
if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_601AA48)) {
actor->unk_0B6++;
}
}
@@ -979,8 +979,8 @@ void func_i3_801914C4(Actor* actor) {
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_GetFrameData(&D_601AA48, actor->unk_0B6, sp38);
Animation_DrawSkeleton(3, D_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_601AA48, actor->unk_0B6, sp38);
Animation_DrawSkeleton(3, D_ZO_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -1129,11 +1129,11 @@ void func_i3_80191BC4(Actor* actor) {
void func_i3_80191DB0(Actor* actor) {
RCP_SetupDL_40();
gSPDisplayList(gMasterDisp++, D_6019EB0);
gSPDisplayList(gMasterDisp++, D_ZO_6019EB0);
Matrix_RotateY(gGfxMatrix, actor->fwork[0] * 0.7f * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6023D50);
gSPDisplayList(gMasterDisp++, D_ZO_6023D50);
}
void func_i3_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) {
@@ -1174,8 +1174,8 @@ void func_i3_80191FFC(Actor* actor) {
Vec3f sp30[20];
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
Animation_GetFrameData(&D_60195EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_6019738, sp30, NULL, func_i3_80191E94, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_60195EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_ZO_6019738, sp30, NULL, func_i3_80191E94, actor, gCalcMatrix);
}
void func_i3_80192094(Actor* actor) {
@@ -1218,7 +1218,7 @@ void func_i3_80192094(Actor* actor) {
break;
case 1:
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_60195EC)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ZO_60195EC)) {
actor->unk_0B6 = 64;
Math_SmoothStepToF(&actor->vel.z, 0.0f, 1.0f, 100.0f, 0.00001f);
if (actor->obj.pos.y < -500.0f) {
@@ -1363,7 +1363,7 @@ void func_i3_80192834(Actor* actor) {
actor->unk_0B6++;
}
} else {
if (actor->unk_0B6 < Animation_GetFrameCount(&D_6021ABC)) {
if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_6021ABC)) {
actor->unk_0B6++;
}
}
@@ -1405,8 +1405,8 @@ void func_i3_80192834(Actor* actor) {
void func_i3_80192C18(Actor* actor) {
Vec3f sp28[20];
Animation_GetFrameData(&D_6021ABC, actor->unk_0B6, sp28);
Animation_DrawSkeleton(3, D_6021B88, sp28, NULL, func_i3_801926F4, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_6021ABC, actor->unk_0B6, sp28);
Animation_DrawSkeleton(3, D_ZO_6021B88, sp28, NULL, func_i3_801926F4, actor, gCalcMatrix);
}
void func_i3_80192C84(s32 limbIndex, Vec3f* rot, void* thisx) {
@@ -1487,7 +1487,7 @@ void func_i3_80192E64(Actor* actor) {
case 2:
Math_SmoothStepToF(&actor->vel.x, 0.0f, 0.1f, 1.0f, 0.0001f);
Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.1f, 1.0f, 0.0001f);
if (actor->unk_0B6 < Animation_GetFrameCount(&D_601AFB8)) {
if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_601AFB8)) {
actor->unk_0B6++;
} else {
actor->unk_0B6 = 0;
@@ -1527,8 +1527,8 @@ void func_i3_80192E64(Actor* actor) {
void func_i3_80193240(Actor* actor) {
Vec3f sp28[30];
Animation_GetFrameData(&D_601AFB8, actor->unk_0B6, sp28);
Animation_DrawSkeleton(2, D_601B184, sp28, NULL, func_i3_80192C84, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_601AFB8, actor->unk_0B6, sp28);
Animation_DrawSkeleton(2, D_ZO_601B184, sp28, NULL, func_i3_80192C84, actor, gCalcMatrix);
}
s32 D_i3_801BF5F0[6] = {
@@ -2030,7 +2030,7 @@ void func_i3_80194394(s32 limbIndex, Vec3f* rot, void* thisx) {
void func_i3_801949DC(Boss* bossZO) {
Matrix_Translate(gCalcMatrix, 0.0f, bossZO->fwork[ZO_FWK_3], 0.0f, 1);
Matrix_Scale(gCalcMatrix, 2.6f, 2.6f, 2.6f, 1);
Animation_DrawSkeleton(3, D_6019E18, bossZO->vwork, func_i3_80193D08, func_i3_80194394, bossZO, gCalcMatrix);
Animation_DrawSkeleton(3, D_ZO_6019E18, bossZO->vwork, func_i3_80193D08, func_i3_80194394, bossZO, gCalcMatrix);
}
f32 D_i3_801BF6BC[2] = { -600.0f, -3400.0f };
@@ -3087,7 +3087,7 @@ void func_i3_80194A84(Boss* bossZO) {
ZO_HIT_0(bossZO)->x.offset = sZoFwork[ZO_BSF_43_X] - bossZO->obj.pos.x;
ZO_HIT_1(bossZO)->z.offset = sZoFwork[ZO_BSF_43_Z] - bossZO->obj.pos.z;
ZO_HIT_1(bossZO)->x.offset = sZoFwork[ZO_BSF_43_X] - bossZO->obj.pos.x;
Animation_GetFrameData(&D_601996C, 0, bossZO->vwork);
Animation_GetFrameData(&D_ZO_601996C, 0, bossZO->vwork);
if (sZoSwork[ZO_BSS_38] != 0) {
sZoSwork[ZO_BSS_37] -= 10;
if (sZoSwork[ZO_BSS_37] < 0) {
@@ -3419,7 +3419,7 @@ void func_i3_8019983C(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6017950);
gSPDisplayList(gMasterDisp++, D_ZO_6017950);
}
void func_i3_801998E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
@@ -3530,7 +3530,7 @@ void func_i3_80199A28(Actor* actor) {
void func_i3_80199E24(Actor* actor) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6025E60);
gSPDisplayList(gMasterDisp++, D_ZO_6025E60);
}
void func_i3_80199E9C(Actor* actor, f32 arg1, f32 arg2) {
@@ -3611,7 +3611,7 @@ void func_i3_8019A1FC(Actor* actor) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_601C590);
gSPDisplayList(gMasterDisp++, D_ZO_601C590);
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
if (((actor->state == 1) && (gBosses[0].timer_052 != 0)) || (actor->state == 0)) {
@@ -3634,7 +3634,7 @@ void func_i3_8019A1FC(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6018660);
gSPDisplayList(gMasterDisp++, D_ZO_6018660);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -3827,7 +3827,7 @@ void func_i3_8019ACCC(Actor* actor) {
Matrix_RotateX(gGfxMatrix, 1.5707964f, 1);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6018660);
gSPDisplayList(gMasterDisp++, D_ZO_6018660);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gGfxMatrix);
var_fs5 += 90.0f;
@@ -3842,13 +3842,13 @@ void func_i3_8019ACCC(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 70);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_6004380);
gSPDisplayList(gMasterDisp++, D_ZO_6004380);
Matrix_RotateY(gGfxMatrix, sZoFwork[ZO_BSF_19] * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, actor->fwork[2] * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, actor->fwork[3] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_55();
gSPDisplayList(gMasterDisp++, D_601BCC0);
gSPDisplayList(gMasterDisp++, D_ZO_601BCC0);
}
Vec3f D_i3_801BF744[3] = {
@@ -3975,7 +3975,7 @@ void func_i3_8019B548(Actor* actor) {
}
void func_i3_8019B7DC(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_6006360);
gSPDisplayList(gMasterDisp++, D_ZO_6006360);
}
void func_i3_8019B810(Actor* actor) {
@@ -4093,8 +4093,8 @@ void func_i3_8019BC78(s32 limbIndex, Vec3f* rot, void* thisx) {
void func_i3_8019BDE0(Actor* actor) {
Vec3f sp28[20];
Animation_GetFrameData(&D_6018550, 0, sp28);
Animation_DrawSkeleton(3, D_601863C, sp28, NULL, func_i3_8019BC78, actor, gCalcMatrix);
Animation_GetFrameData(&D_ZO_6018550, 0, sp28);
Animation_DrawSkeleton(3, D_ZO_601863C, sp28, NULL, func_i3_8019BC78, actor, gCalcMatrix);
}
void func_i3_8019BE48(Actor* actor) {
@@ -4173,7 +4173,7 @@ void func_i3_8019BE48(Actor* actor) {
}
void func_i3_8019C1CC(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_6002E10);
gSPDisplayList(gMasterDisp++, D_ZO_6002E10);
}
Vec3f D_i3_801BF8AC = { 230.0f, -50.0f, 0.0f };
@@ -4305,25 +4305,25 @@ void func_i3_8019C83C(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601A340);
gSPDisplayList(gMasterDisp++, D_ZO_601A340);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -320.0f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.3, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6013330);
gSPDisplayList(gMasterDisp++, D_ZO_6013330);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 1.5707964f, 1);
Matrix_Translate(gGfxMatrix, -110.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601D680);
gSPDisplayList(gMasterDisp++, D_ZO_601D680);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, actor->fwork[1], actor->fwork[2], 0.0f, 1);
Matrix_RotateY(gGfxMatrix, actor->fwork[4] * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601C590);
gSPDisplayList(gMasterDisp++, D_ZO_601C590);
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
@@ -4344,7 +4344,7 @@ void func_i3_8019C83C(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6018660);
gSPDisplayList(gMasterDisp++, D_ZO_6018660);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -4432,7 +4432,7 @@ void func_i3_8019CE58(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 50);
gDPSetEnvColor(gMasterDisp++, 255, 255, 127, 255);
}
gSPDisplayList(gMasterDisp++, D_60181E0);
gSPDisplayList(gMasterDisp++, D_ZO_60181E0);
}
void func_i3_8019D060(Actor* actor) {
@@ -4452,7 +4452,7 @@ void func_i3_8019D060(Actor* actor) {
actor->unk_046 = i + 1;
Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_602C028);
gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_ZO_602C028);
break;
}
}
@@ -4516,8 +4516,8 @@ s32 func_i3_8019D340(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
void func_i3_8019D3C4(Actor* actor) {
Vec3f sp28[10];
Animation_GetFrameData(&D_601FBC4, 0, sp28);
Animation_DrawSkeleton(1, D_601FC90, sp28, func_i3_8019D340, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_ZO_601FBC4, 0, sp28);
Animation_DrawSkeleton(1, D_ZO_601FC90, sp28, func_i3_8019D340, NULL, actor, &gIdentityMatrix);
}
void func_i3_8019D428(Player* player) {