izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Solar decompiled, some cleanup (#102)

Browse Source 
* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros
This commit is contained in:
petrie911
2024-01-22 00:28:02 -03:00
committed by GitHub
parent 61b55d90ce
commit 119dfa9354
19 changed files with 3804 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/assets.h
+12 -1
View File
@@ -543,7 +543,8 @@ extern Gfx D_6011EE0[];
extern Gfx D_60120F0[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Gfx D_6012C00[];
extern Gfx D_6012C00_Gfx[];
extern AnimationHeader D_6012C00_Anim;
extern u8 D_60131A0[];
extern Gfx D_60132B0[];
extern u8 D_6013470[];
@@ -942,6 +943,16 @@ extern f32 D_603E030[];
extern f32 D_603E09C[];
extern f32 D_603E0EC[];
extern Gfx D_60084C0[];
extern Gfx D_6008D40[];
extern Gfx D_6007C40[];
extern Gfx D_601B790[];
extern Gfx D_601B790[];
extern Gfx D_601A700[];
extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
// ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600
extern Gfx D_7000000[];
extern u8 D_7000F10[];
include/functions.h
+8 -2
View File
@@ -42,7 +42,7 @@ void func_8001CE28(u8, f32 *);
void func_8001D034(f32*, s32, u8);
void func_8001D10C(f32*, u32);
void func_8001D15C(u8);
void func_8001D1C8(u8, s32);
void func_8001D1C8(u8, u32);
void func_8001D2FC(f32 *, u16);
void func_8001D3A0(f32 *, u16);
void func_8001D400(s8);
@@ -116,6 +116,9 @@ void func_800319AC(Actor* this);
void func_80035448(Actor* actor);
//fox_beam
void func_80038140(PlayerShot* shot);
void func_80036318(PlayerShot* shot);
void func_80035DEC(f32 xPos, f32 yPos, f32 zPos);
void PlayerShot_Initialize(PlayerShot *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8(void);
@@ -152,7 +155,7 @@ void func_80045E7C(Player*);
void func_80047504(Player * player);
void func_80046358(Player*);
// sf_496E0
// fox_demo
void func_80048AC0(s32 teamId);
void func_80049C0C(Player *);
void func_8004A52C(Player *);
@@ -160,6 +163,7 @@ void func_8004AA84(void);
void func_8004AAF4(Player *);
void func_8004C930(Player *);
void func_8004CCC0(Player *);
void func_8004D440(Player* player);
void func_8004E3D8(Player *);
void func_8004F8AC(Actor*);
void func_8004FEC0(Actor*);
@@ -315,6 +319,7 @@ void func_800771CC(Actor*);
void func_80077218(Actor*);
// fox_effect
s32 func_80081B24(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 hits);
void func_8007729C(void);
void func_80077790(void);
@@ -531,6 +536,7 @@ void func_800A3CA0(void);
s32 Play_CheckMedalStatus(u16);
s32 Play_GetMaxShields(void);
void func_800A6028(f32*, u32);
void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5);
void func_800A5844(void);
void func_800A594C(void);
void func_800A5D6C(void);
include/i3.h
+2 -2
View File
@@ -10,7 +10,7 @@
// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
void func_i3_801BE034(Actor*, Player*);
void func_i3_801BE034(Actor*);
void func_i3_8018DA58(Actor*);
void func_i3_8019E5F0(Actor*);
@@ -97,7 +97,7 @@ void func_i3_801ABA40(PlayerShot*);
void func_i3_801AC274(Player*);
void func_i3_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(void);
void func_i3_801ACBB4(Player*);
void func_i3_801ACE50(Player*);
void func_i3_801AD328(Player*);
void func_i3_801AD688(Actor *);
include/libc/math.h
+2 -2
View File
@@ -12,8 +12,8 @@
#define SHT_MAX 32767.0f
#define SHT_MINV (1.0f / SHT_MAX)
#define RAD_TO_DEG(radians) ((radians * 180.0f) / M_PI)
#define DEG_TO_RAD(degrees) ((degrees * M_PI) / 180.0f)
#define RAD_TO_DEG(radians) (((radians) * 180.0f) / M_PI)
#define DEG_TO_RAD(degrees) (((degrees) * M_PI) / 180.0f)
typedef union {
struct {
linker_scripts/us/undefined_syms.ld
+11
View File
@@ -457,6 +457,8 @@ D_6011C48 = 0x06011C48;
D_6011C80 = 0x06011C80;
D_6011EE0 = 0x06011EE0;
D_60120F0 = 0x060120F0;
D_6012C00_Gfx = 0x06012C00;
D_6012C00_Anim = 0x06012C00;
D_60132B0 = 0x060132B0;
D_60137B0 = 0x060137B0;
D_6013960 = 0x06013960;
@@ -752,6 +754,15 @@ D_6011000 = 0x06011000;
D_600FF30_Env = 0x0600FF30;
D_6006E70 = 0x06006E70;
D_6014D50 = 0x06014D50;
D_60084C0 = 0x060084C0;
D_6008D40 = 0x06008D40;
D_6007C40 = 0x06007C40;
D_601B790 = 0x0601B790;
D_601B790 = 0x0601B790;
D_601A700 = 0x0601A700;
D_6019670 = 0x06019670;
D_60185E0 = 0x060185E0;
D_6017550 = 0x06017550;
D_700AB70 = 0x0700AB70;
D_700BE00 = 0x0700BE00;
src/main/fox_360.c
+1 -1
View File
@@ -2165,7 +2165,7 @@ void func_80035448(Actor* actor) {
f32 sp38;
s32 pad[3];
Vec3f sp1E4 = { 0.0f, 0.0f, 0.0f };
Vec3f sp7C[30]; // larger than expected
Vec3f sp7C[30];
f32 pad2;
if (actor->unk_0E4 != 1000) {
src/main/fox_display.c
+1 -1
View File
@@ -690,7 +690,7 @@ void func_80054280(Player* player, s32 arg1) {
func_80052884(player);
return;
case FORM_BLUE_MARINE:
func_i3_801ACBB4();
func_i3_801ACBB4(player);
return;
case FORM_ON_FOOT:
func_800526B8(player);
src/main/fox_edisplay.c
+4 -4
View File
@@ -409,7 +409,7 @@ void func_8005A094(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_i1_8019A008[actor->unk_048]);
break;
default:
if (actor->unk_0B8 > 9) { // part of switch tree somehow?
if (actor->unk_0B8 > 9) {
if (actor->unk_0B8 == 0x24) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -856,7 +856,7 @@ void func_8005CDA8(Item* item) {
} else {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING); // wrong order?
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING);
for (i = 0; i < 7; i++) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, (i * 360.0f / 7.0f) * M_DTOR, 1);
@@ -1384,7 +1384,7 @@ void func_8005F0E8(f32* sfxSrc, Vec3f* pos) {
}
func_8005F030(sfxSrc);
}
// check
void func_8005F1EC(f32* sfxSrc) {
Vec3f sp2C = { 0.0f, 0.0f, 0.0f };
Vec3f sp20;
@@ -1798,7 +1798,7 @@ void func_80060968(void) {
} else {
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6012C00);
gSPDisplayList(gMasterDisp++, D_6012C00_Gfx);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, ent30->unk_2C, ent30->unk_2D, ent30->unk_2E,
ent30->unk_2F);
src/main/fox_effect.c
+1 -2
View File
@@ -3496,7 +3496,6 @@ void func_80081C5C(Effect* effect) {
s32 unusedOut;
Vec3f velocity;
Vec3f velocityDest;
// f32 pad;
velocity.x = effect->vel.x;
velocity.y = effect->vel.y;
@@ -3659,7 +3658,7 @@ void func_80081C5C(Effect* effect) {
case LEVEL_ZONESS:
if (!(gGameFrameCount & 3)) {
// clang-format off
func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6);
func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6);
// clang-format on
}
src/main/fox_hud.c
+1 -7
View File
@@ -1427,8 +1427,6 @@ void func_80088784(s32 arg0) {
}
}
// #if defined(IMPORT_BSS) || defined(NON_MATCHING)
// needs D_80161838 to be static
void func_80088970(void) {
s32 i;
s32 j;
@@ -1751,10 +1749,6 @@ void func_80088970(void) {
}
}
}
// #else
// void func_80088970(void);
// #pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_hud/func_80088970.s")
// #endif
void func_80089670(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
@@ -4851,7 +4845,7 @@ void func_80093164(Actor* actor) {
break;
case 41:
func_i3_801BE034(actor, player);
func_i3_801BE034(actor);
break;
case 44:
src/main/fox_std_lib.c
+1 -1
View File
@@ -384,7 +384,7 @@ void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, AnimationHeader* a
boundBox[2].y = boundBox[3].y = boundBox[6].y = boundBox[7].y = min->y;
boundBox[4].z = boundBox[5].z = boundBox[6].z = boundBox[7].z = min->z;
for (i = 0; i < 8; i++) {
// Matrix_MultVec3f(gGfxMatrix, spC0[i], sp60[i]); should logically go here
// Matrix_MultVec3f(gGfxMatrix, boundBox[i], boundBoxRot[i]); should logically go here
}
*min = *max = boundBoxRot[0];
for (i = 1; i < 8; i++) {
src/overlays/ovl_i1/fox_co.c
+4 -4
View File
@@ -11,9 +11,9 @@ extern Gfx D_60199D0[];
void func_i1_8018753C(Object_80* obj80) {
GCGM_BACK();
GDL(&D_60199D0);
GSGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_60199D0);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
void func_i1_801875A4(Object_4C* obj4C) {
@@ -1009,7 +1009,7 @@ s32 func_i1_8018A434(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4)
}
if ((boss->swork[arg0] & 1) || (boss->timer_05C & 1)) {
RCP_SetupDL_64();
GPC(64, 64, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
return false;
}
src/overlays/ovl_i3/fox_a6.c
+3 -3
View File
@@ -1696,14 +1696,14 @@ void func_i3_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f3
Matrix_Scale(gCalcMatrix, 1.5f, 1.5f, 1.5f, 1);
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GSGM_BACK();
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_600F1F0);
Matrix_MultVec3f(gCalcMatrix, &sp90, arg3);
} else {
Matrix_Scale(gCalcMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6015EE0);
if (arg6 != 12) {
Matrix_MultVec3f(gCalcMatrix, &sp90, arg3);
@@ -1734,7 +1734,7 @@ void func_i3_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) {
Matrix_Push(&gGfxMatrix);
Matrix_Push(&gCalcMatrix);
Matrix_Copy(gCalcMatrix, &gIdentityMatrix);
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_RotateZ(gCalcMatrix, (D_i3_801C22F0.unk_34 + arg1) * M_DTOR, 1);
Matrix_Translate(gCalcMatrix, 0.0f, -360.0f, 120.0f, 1);
Matrix_RotateX(gCalcMatrix, -(90.0f - arg3) * M_DTOR, 1);
src/overlays/ovl_i3/fox_so.c
+3189
View File
File diff suppressed because it is too large Load Diff
src/overlays/ovl_i3/fox_zo.c
+38 -39
View File
@@ -605,9 +605,9 @@ void func_i3_801900FC(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32
}
s32 func_i3_8019019C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
GSGM_BACK();
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
if ((limbIndex >= 4) && (limbIndex < 10)) {
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
return false;
}
@@ -810,9 +810,9 @@ void func_i3_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
if (arg7 != 0) {
RCP_SetupDL_64();
GPC(40, 40, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 40, 40, 255, 255);
}
GDL(D_i3_801BF5A8[arg6]);
gSPDisplayList(gMasterDisp++, D_i3_801BF5A8[arg6]);
Matrix_Pop(&gGfxMatrix);
}
@@ -962,10 +962,10 @@ void func_i3_801914C4(Actor* actor) {
Vec3f sp38[20];
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_GetFrameData(&D_601AA48, actor->unk_0B6, sp38);
Animation_DrawSkeleton(3, D_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix);
GSGM_BACK();
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
void func_i3_801915A4(Actor* actor) {
@@ -1114,11 +1114,11 @@ void func_i3_80191BC4(Actor* actor) {
void func_i3_80191DB0(Actor* actor) {
RCP_SetupDL_40();
GDL(D_6019EB0);
gSPDisplayList(gMasterDisp++, D_6019EB0);
Matrix_RotateY(gGfxMatrix, actor->fwork[0] * 0.7f * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6023D50);
gSPDisplayList(gMasterDisp++, D_6023D50);
}
void func_i3_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) {
@@ -1745,15 +1745,15 @@ s32 func_i3_80193D08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
if (sZoLimbTimers[limbIndex] == LIMB_DESTROYED) {
*dList = NULL;
}
GSGM_BACK();
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
if (sZoSwork[ZO_BSS_37] != 255) {
RCP_SetupDL_46();
GPC(255, 255, sZoSwork[ZO_BSS_37], sZoSwork[ZO_BSS_37]);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, sZoSwork[ZO_BSS_37], sZoSwork[ZO_BSS_37]);
} else if (!(sZoLimbTimers[limbIndex] & 1)) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} else {
RCP_SetupDL_27();
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
switch (limbIndex) {
case ZO_LIMB_1:
@@ -1766,7 +1766,7 @@ s32 func_i3_80193D08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
}
/* fallthrough */
case ZO_LIMB_12:
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case ZO_LIMB_2:
@@ -3516,7 +3516,7 @@ void func_i3_80199A28(Actor* actor) {
void func_i3_80199E24(Actor* actor) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6025E60);
gSPDisplayList(gMasterDisp++, D_6025E60);
}
void func_i3_80199E9C(Actor* actor, f32 arg1, f32 arg2) {
@@ -3597,13 +3597,12 @@ void func_i3_8019A1FC(Actor* actor) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
GDL(D_601C590);
gSPDisplayList(gMasterDisp++, D_601C590);
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
if (((actor->unk_0B8 == 1) && (gBosses[0].timer_052 != 0)) || (actor->unk_0B8 == 0)) {
Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
}
// var_s1 = 1;
var_fv0 = sZoFwork[ZO_BSF_60_Y] + -1.0f * actor->fwork[0] - actor->obj.pos.y;
for (var_s1 = 1; var_fv0 >= 0.0f; var_s1++) {
@@ -3621,7 +3620,7 @@ void func_i3_8019A1FC(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6018660);
gSPDisplayList(gMasterDisp++, D_6018660);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -3779,10 +3778,10 @@ void func_i3_8019ACCC(Actor* actor) {
var_fs5 = 90.0f;
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
GSGM_BACK();
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
if ((gBosses[0].actionState != 6) && (gBosses[0].actionState != 7)) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
temp_fa0 = sZoFwork[ZO_BSF_65_X] - actor->obj.pos.x;
temp_fs0 = sZoFwork[ZO_BSF_65_Y] - actor->obj.pos.y;
temp_fa1 = sZoFwork[ZO_BSF_65_Z] - actor->obj.pos.z;
@@ -3814,7 +3813,7 @@ void func_i3_8019ACCC(Actor* actor) {
Matrix_RotateX(gGfxMatrix, 1.5707964f, 1);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6018660);
gSPDisplayList(gMasterDisp++, D_6018660);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gGfxMatrix);
var_fs5 += 90.0f;
@@ -3828,14 +3827,14 @@ void func_i3_8019ACCC(Actor* actor) {
Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 70);
GPC(255, 255, 255, 255);
GDL(D_6004380);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_6004380);
Matrix_RotateY(gGfxMatrix, sZoFwork[ZO_BSF_19] * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, actor->fwork[2] * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, actor->fwork[3] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_55();
GDL(D_601BCC0);
gSPDisplayList(gMasterDisp++, D_601BCC0);
}
Vec3f D_i3_801BF744[3] = {
@@ -3962,7 +3961,7 @@ void func_i3_8019B548(Actor* actor) {
}
void func_i3_8019B7DC(Actor* actor) {
GDL(D_6006360);
gSPDisplayList(gMasterDisp++, D_6006360);
}
void func_i3_8019B810(Actor* actor) {
@@ -4161,7 +4160,7 @@ void func_i3_8019BE48(Actor* actor) {
}
void func_i3_8019C1CC(Actor* actor) {
GDL(D_6002E10);
gSPDisplayList(gMasterDisp++, D_6002E10);
}
Vec3f D_i3_801BF8AC = { 230.0f, -50.0f, 0.0f };
@@ -4293,25 +4292,25 @@ void func_i3_8019C83C(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_601A340);
gSPDisplayList(gMasterDisp++, D_601A340);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -320.0f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.3, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6013330);
gSPDisplayList(gMasterDisp++, D_6013330);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 1.5707964f, 1);
Matrix_Translate(gGfxMatrix, -110.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_601D680);
gSPDisplayList(gMasterDisp++, D_601D680);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, actor->fwork[1], actor->fwork[2], 0.0f, 1);
Matrix_RotateY(gGfxMatrix, actor->fwork[4] * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_601C590);
gSPDisplayList(gMasterDisp++, D_601C590);
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
@@ -4332,7 +4331,7 @@ void func_i3_8019C83C(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_6018660);
gSPDisplayList(gMasterDisp++, D_6018660);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -4407,20 +4406,20 @@ void func_i3_8019CE58(Actor* actor) {
Matrix_Scale(gGfxMatrix, actor->fwork[1], actor->fwork[2], actor->fwork[3], 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (D_80161684 != 0) {
GPC(255, 191, 43, 255);
GEC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 191, 43, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
} else {
GPC(255, 255, 255, 255);
GEC(255, 255, 127, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 127, 255);
}
} else if (D_80161684 != 0) {
GPC(255, 191, 43, 50);
GEC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 191, 43, 50);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
} else {
GPC(255, 255, 255, 50);
GEC(255, 255, 127, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 50);
gDPSetEnvColor(gMasterDisp++, 255, 255, 127, 255);
}
GDL(D_60181E0);
gSPDisplayList(gMasterDisp++, D_60181E0);
}
#ifdef NON_MATCHING
src/overlays/ovl_i3/sf_aq.c
+477 -19
View File
File diff suppressed because it is too large Load Diff
src/overlays/ovl_i3/sf_so.c
-1243
View File
File diff suppressed because it is too large Load Diff
src/overlays/ovl_i6/fox_ve2.c
+45 -45
View File
@@ -348,14 +348,14 @@ extern Gfx* D_6009300;
void func_i6_80188660(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
GPC(255, 255, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
Matrix_RotateZ(gGfxMatrix, actor->unk_0F4.z * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, -actor->unk_0F4.z * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, 1);
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(&D_6009300);
gSPDisplayList(gMasterDisp++, &D_6009300);
}
void func_i6_801887B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@@ -1169,13 +1169,13 @@ s32 func_i6_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
if (boss->fwork[21] >= 254.0f) {
if (limbIndex == 2) {
RCP_SetupDL(&gMasterDisp, 0x16);
GPC((s32) boss->fwork[25], 255, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) boss->fwork[25], 255, 255, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x17);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x33);
GPC(255, 255, 255, (s32) boss->fwork[21]);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) boss->fwork[21]);
}
if ((limbIndex == 2) && (boss->swork[6] != 0)) {
*dList = NULL;
@@ -1202,10 +1202,10 @@ s32 func_i6_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_SetGfxMtx(&gMasterDisp);
if ((boss->swork[3] & 1) && (boss->fwork[21] >= 254.0f)) {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
GDL(*dList);
gSPDisplayList(gMasterDisp++, *dList);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
}
@@ -1235,12 +1235,12 @@ void func_i6_8018B8C0(Boss* boss) {
Animation_DrawSkeleton(0, D_600C0A4, boss->vwork, func_i6_8018B47C, NULL, boss, &gIdentityMatrix);
if (boss->fwork[21] >= 254) {
RCP_SetupDL(&gMasterDisp, 0x36);
GPC(255, 64, 64, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x46);
GPC(255, 64, 64, (s32) boss->fwork[21]);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, (s32) boss->fwork[21]);
}
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_Translate(gGfxMatrix, 0.0f, -16.0f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 0.3f, 0.6f, 0.3f, 1);
@@ -1263,9 +1263,9 @@ void func_i6_8018B8C0(Boss* boss) {
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (j == 9) {
GDL(&D_600C2D0);
gSPDisplayList(gMasterDisp++, &D_600C2D0);
} else {
GDL(&D_600C560);
gSPDisplayList(gMasterDisp++, &D_600C560);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -1563,17 +1563,17 @@ static Gfx* D_i6_801A6790[10] = {
void func_i6_8018CF98(Effect* effect) {
if (effect->unk_4E == 10) {
GPC(255, 255, 255, effect->unk_44);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(&D_2010A30);
gSPDisplayList(gMasterDisp++, &D_2010A30);
} else {
RCP_SetupDL(&gMasterDisp, 0x1D);
if (effect->unk_4C < 8) {
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
GDL(D_i6_801A6790[effect->unk_4C]);
gSPDisplayList(gMasterDisp++, D_i6_801A6790[effect->unk_4C]);
RCP_SetupDL(&gMasterDisp, 0x40);
}
}
@@ -2884,20 +2884,20 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
*dList = NULL;
} else if (boss->swork[3] & 1) {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
} else if (boss->swork[4] < 0) {
*dList = NULL;
} else if (boss->swork[2] & 1) {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
}
} else if (!(boss->timer_05C & 1)) {
RCP_SetupDL(&gMasterDisp, 0x1D);
} else {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
switch (limbIndex) {
@@ -2914,7 +2914,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
rot->y -= boss->vwork[4].y;
if (boss->swork[0] & 1) {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[11] != 0) {
*dList = D_C0043D0;
@@ -2927,7 +2927,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
rot->y -= boss->vwork[5].y;
if (boss->swork[1] & 1) {
RCP_SetupDL(&gMasterDisp, 0x1B);
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[12] != 0) {
*dList = D_C015740;
@@ -3010,20 +3010,20 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_Push(&gCalcMatrix);
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(*dList);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x29);
switch (gGameFrameCount & 3) {
case 0:
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
break;
case 1:
GPC(0, 255, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 0, 255);
break;
case 2:
GPC(0, 0, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 255, 255);
break;
case 3:
GPC(255, 255, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
break;
}
Matrix_Translate(gGfxMatrix, D_i6_801A67DC.x, D_i6_801A67DC.y, D_i6_801A67DC.z, 1);
@@ -3031,7 +3031,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_RotateY(gGfxMatrix, D_i6_801A67EC * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, D_i6_801A67E8 * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_C022520);
gSPDisplayList(gMasterDisp++, D_C022520);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
}
@@ -3049,20 +3049,20 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_Push(&gCalcMatrix);
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(*dList);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x29);
switch (gGameFrameCount & 3) {
case 0:
GPC(255, 0, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
break;
case 1:
GPC(0, 255, 0, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 0, 255);
break;
case 2:
GPC(0, 0, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 255, 255);
break;
case 3:
GPC(255, 255, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
break;
}
Matrix_Translate(gGfxMatrix, D_i6_801A67C4.x, D_i6_801A67C4.y, D_i6_801A67C4.z, 1);
@@ -3070,7 +3070,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_RotateY(gGfxMatrix, D_i6_801A67D4 * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, D_i6_801A67D0 * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_C022520);
gSPDisplayList(gMasterDisp++, D_C022520);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
}
@@ -3090,7 +3090,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
func_8005F670(&sp88);
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(*dList);
gSPDisplayList(gMasterDisp++, *dList);
}
Matrix_Pop(&gCalcMatrix);
return true;
@@ -3199,23 +3199,23 @@ void func_i6_801928C8(Boss* boss) {
if (boss->fwork[21] > 0.05f) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x43);
GPC(255, 255, 255, 192);
GEC(255, 0, 128, 192);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 192);
gDPSetEnvColor(gMasterDisp++, 255, 0, 128, 192);
Matrix_Scale(gGfxMatrix, boss->fwork[21] * 7.0f, boss->fwork[21] * 7.0f, boss->fwork[21] * 7.0f, 1);
if (gGameFrameCount & 1) {
Matrix_Scale(gGfxMatrix, 1.1f, 1.1f, 1.1f, 1);
}
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_1024AC0);
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_Pop(&gGfxMatrix);
}
Matrix_Scale(gGfxMatrix, boss->fwork[20] * 10.0f, boss->fwork[20] * 10.0f, boss->fwork[20] * 10.0f, 1);
Matrix_RotateZ(gGfxMatrix, boss->fwork[19] * M_DTOR, 1);
RCP_SetupDL(&gMasterDisp, 0x40);
if (gGameFrameCount & 1) {
GPC(255, 255, 255, 128);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
} else {
GPC(255, 255, 255, 30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 30);
}
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 0.0f, 1);
@@ -3223,7 +3223,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_C017440);
gSPDisplayList(gMasterDisp++, D_C017440);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 2.0943952f, 1);
@@ -3231,7 +3231,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_C017440);
gSPDisplayList(gMasterDisp++, D_C017440);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 4.1887903f, 1);
@@ -3239,7 +3239,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_C017440);
gSPDisplayList(gMasterDisp++, D_C017440);
Matrix_Pop(&gGfxMatrix);
}
Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR,
@@ -3314,7 +3314,7 @@ extern Gfx* D_6007E20;
void func_i6_80193244(Actor* actor) {
GDL(&D_6007E20);
gSPDisplayList(gMasterDisp++, &D_6007E20);
if (actor->timer_0BC != 0) {
f32 scale;
u8 alpha;
@@ -3329,9 +3329,9 @@ void func_i6_80193244(Actor* actor) {
Matrix_RotateX(gGfxMatrix, 1.5707964f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
GPC(255, 255, 255, alpha);
GEC(255, 128, 128, alpha);
GDL(D_1024AC0);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 255, 128, 128, alpha);
gSPDisplayList(gMasterDisp++, D_1024AC0);
}
}
@@ -3393,7 +3393,7 @@ void func_i6_801935D4(Object_80* obj80) {
Animation_GetFrameData(&D_6014658, obj80->unk_44, frameTable);
if (gLevelMode == LEVELMODE_ALL_RANGE) {
GCGM_BACK();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
Animation_DrawSkeleton(1, D_6014844, frameTable, func_i6_801935B4, NULL, NULL, &gIdentityMatrix);
}
yamls/us/overlays.yaml
+4 -4
View File
@@ -56,21 +56,21 @@
- [0xE16C50, c, fox_i3]
- [0xE16C60, c, fox_a6]
- [0xE1F680, c, fox_zo]
- [0xE2DF20, c, sf_so]
- [0xE2DF20, c, fox_so]
- [0xE38560, c, sf_aq]
- [0xE4E3D0, .data, fox_i3]
- [0xE4E3E0, .data, fox_a6]
- [0xE4EC90, .data, fox_zo]
- [0xE4F010, .data, sf_so]
- [0xE4F010, .data, fox_so]
- [0xE4F290, .data, sf_aq]
- [0xE50030, .rodata, fox_a6]
- [0xE504E0, .rodata, fox_zo]
- [0xE50C00, .rodata, sf_so]
- [0xE50C00, .rodata, fox_so]
- [0xE51160, .rodata, sf_aq]
- { start: 0xE51970, type: .bss, vram: 0x801C2240, name: fox_i3 }
- { type: .bss, vram: 0x801C2250, name: fox_a6 }
- { type: .bss, vram: 0x801C2330, name: fox_zo }
- { type: .bss, vram: 0x801C2740, name: sf_so }
- { type: .bss, vram: 0x801C2740, name: fox_so }
- { type: .bss, vram: 0x801C27C0, name: sf_aq }
- name: ovl_i4