2020-10-03 15:22:44 +00:00
|
|
|
|
#include "global.h"
|
2022-11-01 23:17:11 +00:00
|
|
|
|
#include "terminal.h"
|
2021-09-20 16:51:35 +00:00
|
|
|
|
#include "z64environment.h"
|
2020-03-17 04:31:30 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
u32 D_8012AC90[4] = {
|
|
|
|
|
0x00000000,
|
|
|
|
|
0x00010000,
|
|
|
|
|
0x00020000,
|
|
|
|
|
0x00030000,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
u16 D_8012ACA0[2][0x20] = {
|
|
|
|
|
{ 0x00, 0x02, 0x0A, 0x0C, 0x02, 0x04, 0x0C, 0x0E, 0x0A, 0x0C, 0x14, 0x16, 0x0C, 0x0E, 0x16, 0x18,
|
|
|
|
|
0x01, 0x03, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0B, 0x0D, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x15, 0x17 },
|
|
|
|
|
{ 0x14, 0x16, 0x1E, 0x20, 0x16, 0x18, 0x20, 0x22, 0x1E, 0x20, 0x28, 0x2A, 0x20, 0x22, 0x2A, 0x2C,
|
|
|
|
|
0x15, 0x17, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1F, 0x21, 0x23, 0x24, 0x25, 0x26, 0x27, 0x29, 0x2B },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AD20[5] = {
|
|
|
|
|
0x0000, 0x0FC0, 0x1F80, 0x2F40, 0x3F00,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AD2C[9] = {
|
|
|
|
|
0x0000, 0x07C0, 0x0F80, 0x1740, 0x1F00, 0x26C0, 0x2E80, 0x3640, 0x3E00,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AD40[0x40] = {
|
|
|
|
|
0x00, 0x10, 0x13, 0x12, 0x10, 0x01, 0x14, 0x13, 0x01, 0x11, 0x15, 0x14, 0x11, 0x05, 0x16, 0x15,
|
|
|
|
|
0x12, 0x13, 0x17, 0x02, 0x13, 0x14, 0x03, 0x17, 0x14, 0x15, 0x18, 0x03, 0x15, 0x16, 0x07, 0x18,
|
|
|
|
|
0x02, 0x17, 0x1A, 0x19, 0x17, 0x03, 0x1B, 0x1A, 0x03, 0x18, 0x1C, 0x1B, 0x18, 0x07, 0x1D, 0x1C,
|
|
|
|
|
0x19, 0x1A, 0x1E, 0x0A, 0x1A, 0x1B, 0x0B, 0x1E, 0x1B, 0x1C, 0x1F, 0x0B, 0x1C, 0x1D, 0x0F, 0x1F,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
u32 D_8012ADC0[6] = {
|
|
|
|
|
0x00000000, 0x00002000, 0x00004000, 0x00006000, 0x00008000, 0x0000C000,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
u16 D_8012ADD8[0x20] = {
|
|
|
|
|
0x00, 0x02, 0x0A, 0x0C, 0x02, 0x04, 0x0C, 0x0E, 0x0A, 0x0C, 0x14, 0x16, 0x0C, 0x0E, 0x16, 0x18,
|
|
|
|
|
0x01, 0x03, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0B, 0x0D, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x15, 0x17,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AE18[5] = {
|
|
|
|
|
0x0000, 0x07C0, 0x0F80, 0x1740, 0x1F00,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AE24[5] = {
|
|
|
|
|
0x0000, 0x07C0, 0x0F80, 0x1740, 0x1F00,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AE30[5] = {
|
|
|
|
|
0x0000, 0x07C0, 0x0F80, 0x07C0, 0x0000,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s16 D_8012AE3C[0x40] = {
|
|
|
|
|
0x00, 0x10, 0x13, 0x12, 0x10, 0x01, 0x14, 0x13, 0x01, 0x11, 0x15, 0x14, 0x11, 0x05, 0x16, 0x15,
|
|
|
|
|
0x12, 0x13, 0x17, 0x02, 0x13, 0x14, 0x03, 0x17, 0x14, 0x15, 0x18, 0x03, 0x15, 0x16, 0x07, 0x18,
|
|
|
|
|
0x02, 0x17, 0x1A, 0x19, 0x17, 0x03, 0x1B, 0x1A, 0x03, 0x18, 0x1C, 0x1B, 0x18, 0x07, 0x1D, 0x1C,
|
|
|
|
|
0x19, 0x1A, 0x1E, 0x0A, 0x1A, 0x1B, 0x0B, 0x1E, 0x1B, 0x1C, 0x1F, 0x0B, 0x1C, 0x1D, 0x0F, 0x1F,
|
|
|
|
|
};
|
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
/* 0x000 */ s32 unk_0;
|
|
|
|
|
/* 0x004 */ s32 unk_4;
|
|
|
|
|
/* 0x008 */ s32 unk_8;
|
|
|
|
|
/* 0x00C */ s32 unk_C;
|
|
|
|
|
/* 0x010 */ s32 unk_10;
|
|
|
|
|
} Struct_8012AF0C; // size = 0x14
|
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
Struct_8012AF0C D_8012AEBC[4] = {
|
|
|
|
|
{ -0x7E, 0x7C, -0x7E, 0x3F, -0x1F },
|
|
|
|
|
{ 0x7E, 0x7C, -0x7E, 0x3F, -0x1F },
|
|
|
|
|
{ 0x7E, 0x7C, 0x7E, -0x3F, -0x1F },
|
|
|
|
|
{ -0x7E, 0x7C, 0x7E, -0x3F, -0x1F },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Struct_8012AF0C D_8012AF0C[6] = {
|
|
|
|
|
{ -0x40, 0x40, -0x40, 0x20, -0x20 }, { 0x40, 0x40, 0x40, -0x20, -0x20 }, { -0x40, 0x40, 0x40, -0x20, -0x20 },
|
|
|
|
|
{ 0x40, 0x40, -0x40, 0x20, -0x20 }, { -0x40, 0x40, 0x40, 0x20, -0x20 }, { -0x40, -0x40, -0x40, 0x20, 0x20 },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7,
|
|
|
|
|
s32 arg8, s32 arg9) {
|
|
|
|
|
u32 pad42C;
|
|
|
|
|
s32 pad428;
|
|
|
|
|
s32 sp424;
|
|
|
|
|
s32 i;
|
|
|
|
|
s32 j;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s32 k;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
u16 index;
|
|
|
|
|
s16 phi_t1;
|
|
|
|
|
s16 phi_a2_4;
|
|
|
|
|
s16 phi_a0_4;
|
|
|
|
|
s16 phi_t2_4;
|
|
|
|
|
s16 phi_ra;
|
|
|
|
|
s32 sp358[9 * 5];
|
|
|
|
|
s32 sp2A4[9 * 5];
|
|
|
|
|
s32 sp1F0[9 * 5];
|
|
|
|
|
s32 sp13C[9 * 5];
|
|
|
|
|
s32 sp88[9 * 5];
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s32 pad;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
|
|
|
|
|
switch (arg8) {
|
|
|
|
|
case 0:
|
|
|
|
|
case 2:
|
|
|
|
|
pad428 = arg4;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 45; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
pad42C = arg3;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp1F0[k] = arg5;
|
|
|
|
|
sp358[k] = pad42C;
|
|
|
|
|
sp2A4[k] = pad428;
|
|
|
|
|
sp13C[k] = D_8012AD20[j];
|
|
|
|
|
sp88[k] = D_8012AD2C[i];
|
|
|
|
|
pad42C += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
pad428 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
case 1:
|
|
|
|
|
case 3:
|
|
|
|
|
pad428 = arg4;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 45; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
pad42C = arg5;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp358[k] = arg3;
|
|
|
|
|
sp2A4[k] = pad428;
|
|
|
|
|
sp1F0[k] = pad42C;
|
|
|
|
|
sp13C[k] = D_8012AD20[j];
|
|
|
|
|
sp88[k] = D_8012AD2C[i];
|
|
|
|
|
pad42C += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
pad428 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
case 4:
|
|
|
|
|
case 5:
|
|
|
|
|
pad428 = arg5;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 45; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
pad42C = arg3;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp2A4[k] = arg4;
|
|
|
|
|
sp358[k] = pad42C;
|
|
|
|
|
sp1F0[k] = pad428;
|
|
|
|
|
sp13C[k] = D_8012AD20[j];
|
|
|
|
|
sp88[k] = D_8012AD2C[i];
|
|
|
|
|
pad42C += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
pad428 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
for (phi_a2_4 = 0, sp424 = 0; sp424 < 2; sp424++) {
|
|
|
|
|
skyboxCtx->unk_138 = skyboxCtx->dListBuf[arg9 + sp424];
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0; i < 0x20; i++) {
|
|
|
|
|
index = D_8012ACA0[sp424][i];
|
|
|
|
|
|
|
|
|
|
roomVtx[arg2 + i].v.ob[0] = sp358[index];
|
|
|
|
|
roomVtx[arg2 + i].v.ob[1] = sp2A4[index];
|
|
|
|
|
roomVtx[arg2 + i].v.ob[2] = sp1F0[index];
|
|
|
|
|
roomVtx[arg2 + i].v.flag = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.tc[0] = sp13C[index];
|
|
|
|
|
roomVtx[arg2 + i].v.tc[1] = sp88[index];
|
|
|
|
|
roomVtx[arg2 + i].v.cn[1] = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.cn[2] = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.cn[0] = 255;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
gSPVertex(skyboxCtx->unk_138++, &roomVtx[arg2], 32, 0);
|
2021-10-27 21:12:16 +00:00
|
|
|
|
arg2 += i;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
gSPCullDisplayList(skyboxCtx->unk_138++, 0, 15);
|
|
|
|
|
|
|
|
|
|
for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 4; phi_ra++, phi_a2_4 += 0x1F) {
|
|
|
|
|
for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x3F, phi_t2_4 += 4) {
|
|
|
|
|
gDPLoadTextureTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[0] + D_8012AC90[arg8],
|
|
|
|
|
G_IM_FMT_CI, G_IM_SIZ_8b, 256, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x3F,
|
|
|
|
|
phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
|
|
|
|
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AD40[phi_t2_4 + 1], D_8012AD40[phi_t2_4 + 2],
|
|
|
|
|
D_8012AD40[phi_t2_4 + 3], D_8012AD40[phi_t2_4 + 0], 3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
gSPEndDisplayList(skyboxCtx->unk_138++);
|
|
|
|
|
}
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7,
|
|
|
|
|
s32 arg8) {
|
|
|
|
|
s32 i;
|
|
|
|
|
s32 j;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s32 k;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
s16 phi_a0_4;
|
|
|
|
|
s16 phi_t1;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s32 temp1;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
u16 index;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s16 phi_a2_4;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
s16 phi_ra;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s16 phi_t2_4;
|
|
|
|
|
s32 temp2;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
s32 sp2B4[5 * 5];
|
|
|
|
|
s32 sp250[5 * 5];
|
|
|
|
|
s32 sp1EC[5 * 5];
|
|
|
|
|
s32 sp188[5 * 5];
|
|
|
|
|
s32 sp124[5 * 5];
|
2021-10-27 21:12:16 +00:00
|
|
|
|
s32 pad;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
|
|
|
|
|
switch (arg8) {
|
|
|
|
|
case 0:
|
|
|
|
|
case 1:
|
|
|
|
|
temp1 = arg4;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 25; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
temp2 = arg3;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp1EC[k] = arg5;
|
|
|
|
|
sp2B4[k] = temp2;
|
|
|
|
|
sp250[k] = temp1;
|
|
|
|
|
sp188[k] = D_8012AE18[j];
|
|
|
|
|
sp124[k] = D_8012AE30[i];
|
|
|
|
|
temp2 += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
temp1 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
case 2:
|
|
|
|
|
case 3:
|
|
|
|
|
temp1 = arg4;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 25; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
temp2 = arg5;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp2B4[k] = arg3;
|
|
|
|
|
sp250[k] = temp1;
|
|
|
|
|
sp1EC[k] = temp2;
|
|
|
|
|
sp188[k] = D_8012AE18[j];
|
|
|
|
|
sp124[k] = D_8012AE30[i];
|
|
|
|
|
temp2 += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
temp1 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
|
2021-09-21 08:48:43 +00:00
|
|
|
|
case 4:
|
|
|
|
|
case 5:
|
|
|
|
|
temp1 = arg5;
|
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0, k = 0; k < 25; i++) {
|
2021-09-21 08:48:43 +00:00
|
|
|
|
temp2 = arg3;
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (j = 0; j < 5; j++, k++) {
|
|
|
|
|
sp250[k] = arg4;
|
|
|
|
|
sp2B4[k] = temp2;
|
|
|
|
|
sp1EC[k] = temp1;
|
|
|
|
|
sp188[k] = D_8012AE18[j];
|
|
|
|
|
sp124[k] = D_8012AE24[i];
|
|
|
|
|
temp2 += arg6;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
2021-10-27 21:12:16 +00:00
|
|
|
|
temp1 += arg7;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2022-06-12 23:24:45 +00:00
|
|
|
|
skyboxCtx->unk_138 = &skyboxCtx->dListBuf[2 * arg8][0];
|
2021-09-21 08:48:43 +00:00
|
|
|
|
|
2021-10-27 21:12:16 +00:00
|
|
|
|
for (i = 0; i < 0x20; i++) {
|
|
|
|
|
index = D_8012ADD8[i];
|
|
|
|
|
|
|
|
|
|
roomVtx[arg2 + i].v.ob[0] = sp2B4[index];
|
|
|
|
|
roomVtx[arg2 + i].v.ob[1] = sp250[index];
|
|
|
|
|
roomVtx[arg2 + i].v.ob[2] = sp1EC[index];
|
|
|
|
|
roomVtx[arg2 + i].v.flag = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.tc[0] = sp188[index];
|
|
|
|
|
roomVtx[arg2 + i].v.tc[1] = sp124[index];
|
|
|
|
|
roomVtx[arg2 + i].v.cn[1] = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.cn[2] = 0;
|
|
|
|
|
roomVtx[arg2 + i].v.cn[0] = 255;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
}
|
|
|
|
|
gSPVertex(skyboxCtx->unk_138++, &roomVtx[arg2], 32, 0);
|
2021-10-27 21:12:16 +00:00
|
|
|
|
arg2 += i;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
gSPCullDisplayList(skyboxCtx->unk_138++, 0, 15);
|
|
|
|
|
|
|
|
|
|
if ((arg8 == 4) || (arg8 == 5)) {
|
|
|
|
|
phi_a2_4 = 0;
|
|
|
|
|
for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 4; phi_ra++, phi_a2_4 += 0x1F) {
|
|
|
|
|
for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[0] + D_8012ADC0[arg8], 0,
|
|
|
|
|
G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
|
|
|
|
|
phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
|
|
|
|
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[1] + D_8012ADC0[arg8], 0x80, 1,
|
|
|
|
|
G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
|
|
|
|
|
0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
|
|
|
|
|
G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AE3C[phi_t2_4 + 1], D_8012AE3C[phi_t2_4 + 2],
|
|
|
|
|
D_8012AE3C[phi_t2_4 + 3], D_8012AE3C[phi_t2_4 + 0], 3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
phi_a2_4 = 0;
|
|
|
|
|
for (phi_t2_4 = 0, phi_ra = 0; phi_ra < 2; phi_ra++, phi_a2_4 += 0x1F) {
|
|
|
|
|
for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[0] + D_8012ADC0[arg8], 0,
|
|
|
|
|
G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
|
|
|
|
|
phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
|
|
|
|
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[1] + D_8012ADC0[arg8], 0x80, 1,
|
|
|
|
|
G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
|
|
|
|
|
0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
|
|
|
|
|
G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AE3C[phi_t2_4 + 1], D_8012AE3C[phi_t2_4 + 2],
|
|
|
|
|
D_8012AE3C[phi_t2_4 + 3], D_8012AE3C[phi_t2_4 + 0], 3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
phi_a2_4 -= 0x1F;
|
|
|
|
|
for (phi_ra = 0; phi_ra < 2; phi_ra++, phi_a2_4 -= 0x1F) {
|
|
|
|
|
for (phi_a0_4 = 0, phi_t1 = 0; phi_t1 < 4; phi_t1++, phi_a0_4 += 0x1F, phi_t2_4 += 4) {
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[0] + D_8012ADC0[arg8], 0,
|
|
|
|
|
G_TX_RENDERTILE, G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F,
|
|
|
|
|
phi_a2_4 + 0x1F, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
|
|
|
|
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gDPLoadMultiTile(skyboxCtx->unk_138++, (u32)skyboxCtx->staticSegments[1] + D_8012ADC0[arg8], 0x80, 1,
|
|
|
|
|
G_IM_FMT_CI, G_IM_SIZ_8b, 128, 0, phi_a0_4, phi_a2_4, phi_a0_4 + 0x1F, phi_a2_4 + 0x1F,
|
|
|
|
|
0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
|
|
|
|
|
G_TX_NOMASK, G_TX_NOLOD);
|
|
|
|
|
gSP1Quadrangle(skyboxCtx->unk_138++, D_8012AE3C[phi_t2_4 + 1], D_8012AE3C[phi_t2_4 + 2],
|
|
|
|
|
D_8012AE3C[phi_t2_4 + 3], D_8012AE3C[phi_t2_4 + 0], 3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
gSPEndDisplayList(skyboxCtx->unk_138++);
|
|
|
|
|
return arg2;
|
|
|
|
|
}
|
2020-03-17 04:31:30 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
void func_800AEFC8(SkyboxContext* skyboxCtx, s16 skyboxId) {
|
|
|
|
|
s32 i;
|
|
|
|
|
s32 j;
|
|
|
|
|
s32 phi_s3 = 0;
|
|
|
|
|
|
|
|
|
|
if (skyboxId == SKYBOX_BAZAAR || (skyboxId > SKYBOX_HOUSE_KAKARIKO && skyboxId <= SKYBOX_BOMBCHU_SHOP)) {
|
|
|
|
|
for (j = 0, i = 0; i < 2; i++, j += 2) {
|
|
|
|
|
phi_s3 = func_800ADBB0(skyboxCtx, skyboxCtx->roomVtx, phi_s3, D_8012AEBC[i].unk_0, D_8012AEBC[i].unk_4,
|
|
|
|
|
D_8012AEBC[i].unk_8, D_8012AEBC[i].unk_C, D_8012AEBC[i].unk_10, i, j);
|
|
|
|
|
}
|
|
|
|
|
} else if (skyboxCtx->unk_140 == 2) {
|
|
|
|
|
for (j = 0, i = 0; i < 3; i++, j += 2) {
|
|
|
|
|
phi_s3 = func_800ADBB0(skyboxCtx, skyboxCtx->roomVtx, phi_s3, D_8012AEBC[i].unk_0, D_8012AEBC[i].unk_4,
|
|
|
|
|
D_8012AEBC[i].unk_8, D_8012AEBC[i].unk_C, D_8012AEBC[i].unk_10, i, j);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (j = 0, i = 0; i < 4; i++, j += 2) {
|
|
|
|
|
phi_s3 = func_800ADBB0(skyboxCtx, skyboxCtx->roomVtx, phi_s3, D_8012AEBC[i].unk_0, D_8012AEBC[i].unk_4,
|
|
|
|
|
D_8012AEBC[i].unk_8, D_8012AEBC[i].unk_C, D_8012AEBC[i].unk_10, i, j);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void func_800AF178(SkyboxContext* skyboxCtx, s32 arg1) {
|
|
|
|
|
s32 phi_s2 = 0;
|
|
|
|
|
s32 i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < arg1; i++) {
|
|
|
|
|
phi_s2 = func_800AE2C0(skyboxCtx, skyboxCtx->roomVtx, phi_s2, D_8012AF0C[i].unk_0, D_8012AF0C[i].unk_4,
|
|
|
|
|
D_8012AF0C[i].unk_8, D_8012AF0C[i].unk_C, D_8012AF0C[i].unk_10, i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
2021-08-04 17:37:26 +00:00
|
|
|
|
u32 size;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
s16 i;
|
2022-02-27 21:32:05 +00:00
|
|
|
|
u8 skybox1Index;
|
|
|
|
|
u8 skybox2Index;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
u32 start;
|
2022-05-20 18:40:13 +00:00
|
|
|
|
s32 skyboxConfig;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
|
|
|
|
switch (skyboxId) {
|
|
|
|
|
case SKYBOX_NORMAL_SKY:
|
2022-05-20 18:40:13 +00:00
|
|
|
|
skyboxConfig = 0;
|
2022-07-30 21:28:50 +00:00
|
|
|
|
if (gSaveContext.retainWeatherMode && !IS_CUTSCENE_LAYER && gWeatherMode > WEATHER_MODE_CLEAR &&
|
|
|
|
|
gWeatherMode <= WEATHER_MODE_HEAVY_RAIN) {
|
2022-05-20 18:40:13 +00:00
|
|
|
|
skyboxConfig = 1;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2022-05-20 18:40:13 +00:00
|
|
|
|
for (i = 0; i < ARRAY_COUNT(gTimeBasedSkyboxConfigs[skyboxConfig]); i++) {
|
|
|
|
|
if (gSaveContext.skyboxTime >= gTimeBasedSkyboxConfigs[skyboxConfig][i].startTime &&
|
|
|
|
|
(gSaveContext.skyboxTime < gTimeBasedSkyboxConfigs[skyboxConfig][i].endTime ||
|
|
|
|
|
gTimeBasedSkyboxConfigs[skyboxConfig][i].endTime == 0xFFFF)) {
|
2022-05-21 18:23:43 +00:00
|
|
|
|
play->envCtx.skybox1Index = skybox1Index = gTimeBasedSkyboxConfigs[skyboxConfig][i].skybox1Index;
|
|
|
|
|
play->envCtx.skybox2Index = skybox2Index = gTimeBasedSkyboxConfigs[skyboxConfig][i].skybox2Index;
|
2022-05-20 18:40:13 +00:00
|
|
|
|
if (gTimeBasedSkyboxConfigs[skyboxConfig][i].changeSkybox) {
|
2022-05-21 18:23:43 +00:00
|
|
|
|
play->envCtx.skyboxBlend =
|
2022-05-20 18:40:13 +00:00
|
|
|
|
Environment_LerpWeight(gTimeBasedSkyboxConfigs[skyboxConfig][i].endTime,
|
|
|
|
|
gTimeBasedSkyboxConfigs[skyboxConfig][i].startTime,
|
2021-09-20 16:51:35 +00:00
|
|
|
|
((void)0, gSaveContext.skyboxTime)) *
|
2021-07-04 15:43:04 +00:00
|
|
|
|
255.0f;
|
|
|
|
|
} else {
|
2022-05-21 18:23:43 +00:00
|
|
|
|
play->envCtx.skyboxBlend = 0;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-20 18:40:13 +00:00
|
|
|
|
size = gNormalSkyFiles[skybox1Index].file.vromEnd - gNormalSkyFiles[skybox1Index].file.vromStart;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1054);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1055);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], gNormalSkyFiles[skybox1Index].file.vromStart, size,
|
|
|
|
|
"../z_vr_box.c", 1058);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-05-20 18:40:13 +00:00
|
|
|
|
size = gNormalSkyFiles[skybox2Index].file.vromEnd - gNormalSkyFiles[skybox2Index].file.vromStart;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[1] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1060);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
|
|
|
|
|
1061);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[1], gNormalSkyFiles[skybox2Index].file.vromStart, size,
|
|
|
|
|
"../z_vr_box.c", 1064);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-02-27 21:32:05 +00:00
|
|
|
|
if ((skybox1Index & 1) ^ ((skybox1Index & 4) >> 2)) {
|
2022-05-20 18:40:13 +00:00
|
|
|
|
size = gNormalSkyFiles[skybox1Index].palette.vromEnd - gNormalSkyFiles[skybox1Index].palette.vromStart;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1072);
|
2021-09-21 08:48:43 +00:00
|
|
|
|
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1073);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, gNormalSkyFiles[skybox1Index].palette.vromStart, size,
|
|
|
|
|
"../z_vr_box.c", 1075);
|
|
|
|
|
DmaMgr_RequestSyncDebug((u8*)skyboxCtx->palettes + size,
|
|
|
|
|
gNormalSkyFiles[skybox2Index].palette.vromStart, size, "../z_vr_box.c", 1077);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
} else {
|
2022-05-20 18:40:13 +00:00
|
|
|
|
size = gNormalSkyFiles[skybox1Index].palette.vromEnd - gNormalSkyFiles[skybox1Index].palette.vromStart;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1085);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1086);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, gNormalSkyFiles[skybox2Index].palette.vromStart, size,
|
|
|
|
|
"../z_vr_box.c", 1088);
|
|
|
|
|
DmaMgr_RequestSyncDebug((u8*)skyboxCtx->palettes + size,
|
|
|
|
|
gNormalSkyFiles[skybox1Index].palette.vromStart, size, "../z_vr_box.c", 1090);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2021-08-04 17:37:26 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
case SKYBOX_BAZAAR:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_SP1a_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_SP1a_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1127);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1128);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1129);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_SP1a_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_SP1a_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1132);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1133);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1134);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_OVERCAST_SUNSET:
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_cloud2_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_cloud2_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1155);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1156);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1159);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[1] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1162);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
|
|
|
|
|
1163);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1166);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_cloud2_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1170);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1171);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1173);
|
|
|
|
|
DmaMgr_RequestSyncDebug((u8*)skyboxCtx->palettes + size, start, size, "../z_vr_box.c", 1175);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_MARKET_ADULT:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_RUVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_RUVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1182);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1183);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1184);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_RUVR_pal_staticSegmentRomEnd - start;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
osSyncPrintf("SIZE = %d\n", size);
|
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1188);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1189);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1190);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_CUTSCENE_MAP:
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_holy0_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_holy0_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1196);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1197);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1200);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_holy1_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_holy1_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[1] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1203);
|
2021-08-04 17:37:26 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
|
|
|
|
|
1204);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1207);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_holy0_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_holy0_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size * 2, "../z_vr_box.c", 1211);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1212);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1214);
|
|
|
|
|
DmaMgr_RequestSyncDebug((u8*)skyboxCtx->palettes + size, (uintptr_t)_vr_holy1_pal_staticSegmentRomStart,
|
|
|
|
|
size, "../z_vr_box.c", 1216);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_LINK:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_LHVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_LHVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1226);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1227);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1228);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_LHVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_LHVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1231);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1232);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1233);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_MARKET_CHILD_DAY:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MDVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MDVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1257);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1258);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1259);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MDVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MDVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1262);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1263);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1264);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_MARKET_CHILD_NIGHT:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MNVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MNVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1271);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1272);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1273);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MNVR_pal_staticSegmentRomEnd - start;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
osSyncPrintf("SIZE = %d\n", size);
|
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1277);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1278);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1279);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HAPPY_MASK_SHOP:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_FCVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_FCVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1286);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1287);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1288);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_FCVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_FCVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1291);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1292);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1293);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KHVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KHVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1301);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1302);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1303);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KHVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KHVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1306);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1307);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1308);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_OF_TWINS:
|
|
|
|
|
skyboxCtx->unk_140 = 2;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K3VR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K3VR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1331);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1332);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1333);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K3VR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K3VR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1336);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1337);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1338);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_STABLES:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MLVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MLVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1345);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
2021-08-04 17:37:26 +00:00
|
|
|
|
1346);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1347);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_MLVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_MLVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1350);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1351);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1352);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_KAKARIKO:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KKRVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KKRVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1359);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1360);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1361);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1364);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1365);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1366);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_KOKIRI_SHOP:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KSVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KSVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1373);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1374);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1375);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KSVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KSVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1378);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1379);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1380);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_GORON_SHOP:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_GLVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_GLVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1405);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1406);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1407);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_GLVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_GLVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1410);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1411);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1412);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_ZORA_SHOP:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_ZRVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_ZRVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1420);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1421);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1422);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1425);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1426);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1427);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_POTION_SHOP_KAKARIKO:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_DGVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_DGVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1451);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1452);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1453);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_DGVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_DGVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1456);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1457);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1458);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_POTION_SHOP_MARKET:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_ALVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_ALVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1466);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1467);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1468);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_ALVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_ALVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1471);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1472);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1473);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_BOMBCHU_SHOP:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_NSVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_NSVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1481);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1482);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1483);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_NSVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_NSVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1486);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1487);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1488);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->rot.y = 0.8f;
|
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_RICHARD:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_IPVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_IPVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1512);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1513);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1514);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_IPVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_IPVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1517);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1518);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1519);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_IMPA:
|
|
|
|
|
skyboxCtx->unk_140 = 1;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_LBVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_LBVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1526);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1527);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1528);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_LBVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_LBVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1531);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1532);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1533);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_TENT:
|
|
|
|
|
skyboxCtx->unk_140 = 2;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_TTVR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_TTVR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1540);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1541);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1542);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_TTVR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_TTVR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1545);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1546);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1547);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_MIDO:
|
|
|
|
|
skyboxCtx->unk_140 = 2;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K4VR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K4VR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1560);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1561);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1562);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K4VR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K4VR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1565);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1566);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1567);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_SARIA:
|
|
|
|
|
skyboxCtx->unk_140 = 2;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K5VR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K5VR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1574);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1575);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1576);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_K5VR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_K5VR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1579);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1580);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1581);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_HOUSE_ALLEY:
|
|
|
|
|
skyboxCtx->unk_140 = 2;
|
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KR3VR_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KR3VR_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->staticSegments[0] = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1588);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
|
|
|
|
|
1589);
|
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1590);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-10-02 15:38:09 +00:00
|
|
|
|
start = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomStart;
|
|
|
|
|
size = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomEnd - start;
|
2022-05-21 18:23:43 +00:00
|
|
|
|
skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1593);
|
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain
* cleanup
* a few more functions done, 11 remain
* finally all updated
* another function matched
* another action finished
* damage table
* death action done
* started very large action func
* more progress on long action funcs
* large action func matched
* 5 functions remain
* another large action finished
* start another action, doesn't match yet
* a few new functions, neither match
* done working on this for now
* Correct one nonmatching, fix compiler warnings
* Two functions left
* one left
* remove remaining gotos
* OK
* Delete outdated comment
* namefixer
* Flag macros
* audio, dmgeff, some colour
* Import symbols from object, reloc, name a few things
* Rest of object done
* Named a few more things, add action enum
* Name body parts and another couple of actions
* Last few names
* Delete asm
* Format
* undefined_syms, mods where possible
* Correct parent to EnEncount1
* Review
* Last newline
* louis and Dragorn's reviews
* Format
* More review
* Put back to isInvisible and or, as in EnGeldB
* Remove if (0)s in func_8009728C and change pointer arithmetic cast
* More review
* Unname headRot, make "fallthrough" case clearer, other review
* Format
* Even more review
* Rephrase
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
2021-09-24 22:35:42 +00:00
|
|
|
|
ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1594);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-11-17 02:57:02 +00:00
|
|
|
|
DmaMgr_RequestSyncDebug(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1595);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
break;
|
|
|
|
|
case SKYBOX_UNSET_27:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-15 21:33:44 +00:00
|
|
|
|
void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId) {
|
2022-05-21 18:23:43 +00:00
|
|
|
|
PlayState* play = (PlayState*)state;
|
2021-11-15 21:33:44 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
skyboxCtx->unk_140 = 0;
|
2021-09-21 08:48:43 +00:00
|
|
|
|
skyboxCtx->rot.x = skyboxCtx->rot.y = skyboxCtx->rot.z = 0.0f;
|
2021-07-04 15:43:04 +00:00
|
|
|
|
|
2022-05-21 18:23:43 +00:00
|
|
|
|
Skybox_Setup(play, skyboxCtx, skyboxId);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
osSyncPrintf("\n\n\n********************\n\n\n"
|
|
|
|
|
"TYPE=%d"
|
|
|
|
|
"\n\n\n********************\n\n\n",
|
|
|
|
|
skyboxId);
|
|
|
|
|
|
|
|
|
|
if (skyboxId != SKYBOX_NONE) {
|
|
|
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
|
|
|
|
|
|
|
|
if (skyboxCtx->unk_140 != 0) {
|
2021-11-15 21:33:44 +00:00
|
|
|
|
skyboxCtx->dListBuf = GameState_Alloc(state, 8 * 150 * sizeof(Gfx), "../z_vr_box.c", 1636);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->dListBuf != NULL, "vr_box->dpList != NULL", "../z_vr_box.c", 1637);
|
|
|
|
|
|
2021-11-15 21:33:44 +00:00
|
|
|
|
skyboxCtx->roomVtx = GameState_Alloc(state, 256 * sizeof(Vtx), "../z_vr_box.c", 1639);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1640);
|
|
|
|
|
|
|
|
|
|
func_800AEFC8(skyboxCtx, skyboxId);
|
|
|
|
|
} else {
|
2021-11-15 21:33:44 +00:00
|
|
|
|
skyboxCtx->dListBuf = GameState_Alloc(state, 12 * 150 * sizeof(Gfx), "../z_vr_box.c", 1643);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->dListBuf != NULL, "vr_box->dpList != NULL", "../z_vr_box.c", 1644);
|
2020-03-17 04:31:30 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
if (skyboxId == SKYBOX_CUTSCENE_MAP) {
|
2021-11-15 21:33:44 +00:00
|
|
|
|
skyboxCtx->roomVtx = GameState_Alloc(state, 192 * sizeof(Vtx), "../z_vr_box.c", 1648);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1649);
|
2020-03-17 04:31:30 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
func_800AF178(skyboxCtx, 6);
|
|
|
|
|
} else {
|
2021-11-15 21:33:44 +00:00
|
|
|
|
skyboxCtx->roomVtx = GameState_Alloc(state, 160 * sizeof(Vtx), "../z_vr_box.c", 1653);
|
2021-07-04 15:43:04 +00:00
|
|
|
|
ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1654);
|
2020-03-17 04:31:30 +00:00
|
|
|
|
|
2021-07-04 15:43:04 +00:00
|
|
|
|
func_800AF178(skyboxCtx, 5);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
osSyncPrintf(VT_RST);
|
|
|
|
|
}
|
|
|
|
|
}
|