sf_61B30 decomped (#25)

* my god it's done

* save for later
This commit is contained in:
petrie911
2023-11-18 09:44:33 -06:00
committed by GitHub
parent d34a5e370a
commit ca9899deed
9 changed files with 2294 additions and 166 deletions
+1918 -92
View File
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -9,7 +9,7 @@ void func_800A18B0(void) {
func_80006F20();
Rand_Init();
Rand_SetSeed(1, 29000, 9876);
D_80177834 = 0x64;
D_80177834 = 100;
D_8017783C = 0;
D_80161A36 = 0;
D_80161A38 = 0xFF;
@@ -17,7 +17,7 @@ void func_800A18B0(void) {
D_80161A40 = 10.0f;
D_80161A44 = 12800.0f;
D_80161A10 = D_80161A14 = 0.0f;
D_801774F8 = 0x63;
D_801774F8 = 99;
D_80177820 = 0;
func_80059498();
D_80161A39 = 1;
@@ -289,7 +289,7 @@ void func_800A26C0(void) {
func_800A25DC();
if (func_800A1B6C() != 1) {
func_8000316C(&gUnkDisp1);
func_800A1FB0(&gUnkDisp1, D_801778AB, 0);
func_800A1FB0(&gUnkDisp1, D_801778A8, 0);
if (D_8017783C != 0) {
D_8017783C--;
}
@@ -435,9 +435,9 @@ void func_800A26C0(void) {
} else if ((D_801778A8 == 4) && (D_80177898 != 0)) {
func_800A1FB0(&gMasterDisp, D_801778A8, 3);
func_800A24DC(3);
func_800A1FB0(&gMasterDisp, D_801778AB, 2);
func_800A1FB0(&gMasterDisp, D_801778A8, 2);
func_800A24DC(2);
func_800A1FB0(&gMasterDisp, D_801778AB, 1);
func_800A1FB0(&gMasterDisp, D_801778A8, 1);
func_800A24DC(1);
gDPPipeSync(gMasterDisp++);
gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, 312, 232);
+1 -1
View File
@@ -1318,7 +1318,7 @@ void func_8008DE68(void) {
f32 temp7;
f32 var_fv0;
if ((D_80161734 == 1) && (D_801778B8 > 0)) {
if ((D_80161734 == 1) && (D_801778B0[2] > 0)) {
if ((D_80177848 >= 0) && (D_801616BC == -1.0f)) {
func_80019218(0x4900C028, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801616BC = 255.0f;
+3 -3
View File
@@ -31,9 +31,9 @@ void func_DF4260_801924A8(UnkStruct_func_DF4260_801924A8* arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192AA4.s")
void func_DF4260_80192CB0(UnkStruct_func_DF4260_80192CB0* arg0) {
arg0->unk50 = arg0->unk10;
arg0->unk10 = 0.0f;
void func_DF4260_80192CB0(Object_2F4* arg0) {
arg0->unk_050 = arg0->obj.rot.x;
arg0->obj.rot.x = 0.0f;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192CD4.s")