mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-05 08:57:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

T3: batch t3_S39 — restruct: batch t3_S39 rung S — 50 files (TUs; 1118 drawable) · 650 bodies: 332 sites → members / 0 kept / 180 skipped · levers off 0 · compiles 217 in 140 s wall · final 50/50 identical · written 45 files | R22 check-all: 218 passed, 0 failed of 218 | type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 375218 cast sites in 53506 bodies over 8 base classes (4 forms + A, coverage OK) · 229 lying declarations / 24 callees (+5293 K&R sites, +418 cross-binary apart) · controls 4/4 (restruct_cycle)

Browse Source
This commit is contained in:
Drew T
2026-10-01 22:36:36 -06:00
parent 90111bc249
commit 665e85bc95
49 changed files with 1822 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC04_010/ov_SC04_010_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8018F600;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8018F600;
RotMatrixYXZ(rot, D_8018F600);
func_80048D9C(D_8018F600, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181238);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_011/ov_SC04_011_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801F1568;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801F1568;
RotMatrixYXZ(rot, D_801F1568);
func_80048D9C(D_801F1568, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801934C8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_015/ov_SC04_015_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801C9270;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801C9270;
RotMatrixYXZ(rot, D_801C9270);
func_80048D9C(D_801C9270, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801875D4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_016/ov_SC04_016_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AC198;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AC198;
RotMatrixYXZ(rot, D_801AC198);
func_80048D9C(D_801AC198, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80183098);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_018/ov_SC04_018_jr_8015C32C.c
+4 -4
View File
@@ -5847,12 +5847,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E79B8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E79B8;
RotMatrixYXZ(rot, D_801E79B8);
func_80048D9C(D_801E79B8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801902B0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC04_020/ov_SC04_020_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801BC640;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801BC640;
RotMatrixYXZ(rot, D_801BC640);
func_80048D9C(D_801BC640, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801863E8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC05_000/ov_SC05_000_jr_8015C32C.c
+4 -4
View File
@@ -5843,12 +5843,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019AB10;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019AB10;
RotMatrixYXZ(rot, D_8019AB10);
func_80048D9C(D_8019AB10, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181328);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC05_007/ov_SC05_007_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019CDB8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019CDB8;
RotMatrixYXZ(rot, D_8019CDB8);
func_80048D9C(D_8019CDB8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80183AF8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80183AEC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80183AAC);
src/ov_SC05_008/ov_SC05_008_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A11A0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A11A0;
RotMatrixYXZ(rot, D_801A11A0);
func_80048D9C(D_801A11A0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80185A50);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80185A44, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80185A04);
src/ov_SC05_010/ov_SC05_010_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801C7EE8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801C7EE8;
RotMatrixYXZ(rot, D_801C7EE8);
func_80048D9C(D_801C7EE8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018BA3C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018BA30, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018B9F0);
src/ov_SC05_018/ov_SC05_018_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E6718;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E6718;
RotMatrixYXZ(rot, D_801E6718);
func_80048D9C(D_801E6718, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801899D0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801899C4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80189984);
src/ov_SC06_000/ov_SC06_000_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2008;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2008;
RotMatrixYXZ(rot, D_801B2008);
func_80048D9C(D_801B2008, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018B324);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018B318, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018B2D8);
src/ov_SC06_006/ov_SC06_006_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801F8A20;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801F8A20;
RotMatrixYXZ(rot, D_801F8A20);
func_80048D9C(D_801F8A20, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80184E48);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80184E3C, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80184DFC);
src/ov_SC06_008/ov_SC06_008_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AA6F0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AA6F0;
RotMatrixYXZ(rot, D_801AA6F0);
func_80048D9C(D_801AA6F0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801888B0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801888A4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80188864);
src/ov_SC06_010/ov_SC06_010_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2B38;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2B38;
RotMatrixYXZ(rot, D_801B2B38);
func_80048D9C(D_801B2B38, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80189A8C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80189A80, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80189A40);
src/ov_SC06_011/ov_SC06_011_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801ABC10;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801ABC10;
RotMatrixYXZ(rot, D_801ABC10);
func_80048D9C(D_801ABC10, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801834EC);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801834E0, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801834A0);
src/ov_SC06_013/ov_SC06_013_jr_8015C32C.c
+4 -4
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019AAC0;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019AAC0;
RotMatrixYXZ(rot, D_8019AAC0);
func_80048D9C(D_8019AAC0, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181C68);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
src/ov_SC06_014/ov_SC06_014_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A14D8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A14D8;
RotMatrixYXZ(rot, D_801A14D8);
func_80048D9C(D_801A14D8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80182FCC);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80182FC0, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80182F80);
src/ov_SC06_015/ov_SC06_015_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801948B8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801948B8;
RotMatrixYXZ(rot, D_801948B8);
func_80048D9C(D_801948B8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181B24);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80181B18, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80181AD8);
src/ov_SC06_016/ov_SC06_016_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A0128;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A0128;
RotMatrixYXZ(rot, D_801A0128);
func_80048D9C(D_801A0128, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80187F34);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80187F28, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80187EE8);
src/ov_SC06_018/ov_SC06_018_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D5A58;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D5A58;
RotMatrixYXZ(rot, D_801D5A58);
func_80048D9C(D_801D5A58, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80196670);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80196664, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80196624);
src/ov_SC06_020/ov_SC06_020_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801BA8A8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801BA8A8;
RotMatrixYXZ(rot, D_801BA8A8);
func_80048D9C(D_801BA8A8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801880F8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801880EC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801880AC);
src/ov_SC06_022/ov_SC06_022_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E2128;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E2128;
RotMatrixYXZ(rot, D_801E2128);
func_80048D9C(D_801E2128, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801903B4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801903A8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80190368);
src/ov_SC06_025/ov_SC06_025_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B2140;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B2140;
RotMatrixYXZ(rot, D_801B2140);
func_80048D9C(D_801B2140, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80187D30);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80187D24, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80187CE4);
src/ov_SC06_027/ov_SC06_027_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_8019D2E8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_8019D2E8;
RotMatrixYXZ(rot, D_8019D2E8);
func_80048D9C(D_8019D2E8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80181070);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80181064, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80181024);
src/ov_SC06_029/ov_SC06_029_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801E2048;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801E2048;
RotMatrixYXZ(rot, D_801E2048);
func_80048D9C(D_801E2048, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018F604);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018F5F8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018F5B8);
src/ov_SC06_030/ov_SC06_030_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801B9F40;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801B9F40;
RotMatrixYXZ(rot, D_801B9F40);
func_80048D9C(D_801B9F40, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80184EF4);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80184EE8, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80184EA8);
src/ov_SC06_032/ov_SC06_032_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_80195194[])(void);
void func_80155580(void *a0) {
D_80195194[*(u16 *)((s32)a0 + 0x2)]();
D_80195194[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80195608[])(void);
void func_80157544(void *a0) {
D_80195608[*(u16 *)((s32)a0 + 0x2)]();
D_80195608[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80195610;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80195620);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80195670[])(void);
void func_80157DC4(void *a0) {
D_80195670[*(u16 *)((s32)a0 + 0x2)]();
D_80195670[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80195678[])(void);
void func_80157FC4(void *a0) {
D_80195678[*(u16 *)((s32)a0 + 0x2)]();
D_80195678[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80195644;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80195644);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80195684[])(void);
void func_8015824C(void *a0) {
D_80195684[*(u16 *)((s32)a0 + 0x2)]();
D_80195684[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80195654);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_801956C0[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_801956C0[*(u8 *)((s32)param + 0x4F)](param);
D_801956C0[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC06_032/ov_SC06_032_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D1028;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D1028;
RotMatrixYXZ(rot, D_801D1028);
func_80048D9C(D_801D1028, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801963C0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801963B4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80196374);
src/ov_SC06_033/ov_SC06_033_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_801936A4[])(void);
void func_80155580(void *a0) {
D_801936A4[*(u16 *)((s32)a0 + 0x2)]();
D_801936A4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80193B18[])(void);
void func_80157544(void *a0) {
D_80193B18[*(u16 *)((s32)a0 + 0x2)]();
D_80193B18[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80193B20;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80193B30);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80193B80[])(void);
void func_80157DC4(void *a0) {
D_80193B80[*(u16 *)((s32)a0 + 0x2)]();
D_80193B80[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80193B88[])(void);
void func_80157FC4(void *a0) {
D_80193B88[*(u16 *)((s32)a0 + 0x2)]();
D_80193B88[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80193B54;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80193B54);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80193B94[])(void);
void func_8015824C(void *a0) {
D_80193B94[*(u16 *)((s32)a0 + 0x2)]();
D_80193B94[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80193B64);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80193BD0[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80193BD0[*(u8 *)((s32)param + 0x4F)](param);
D_80193BD0[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC06_033/ov_SC06_033_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D0EA8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D0EA8;
RotMatrixYXZ(rot, D_801D0EA8);
func_80048D9C(D_801D0EA8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801948D0);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801948C4, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80194884);
src/ov_SC07_000/ov_SC07_000_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_801844EC[])(void);
void func_80155580(void *a0) {
D_801844EC[*(u16 *)((s32)a0 + 0x2)]();
D_801844EC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80184960[])(void);
void func_80157544(void *a0) {
D_80184960[*(u16 *)((s32)a0 + 0x2)]();
D_80184960[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80184968;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80184978);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_801849C8[])(void);
void func_80157DC4(void *a0) {
D_801849C8[*(u16 *)((s32)a0 + 0x2)]();
D_801849C8[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_801849D0[])(void);
void func_80157FC4(void *a0) {
D_801849D0[*(u16 *)((s32)a0 + 0x2)]();
D_801849D0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8018499C;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018499C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_801849DC[])(void);
void func_8015824C(void *a0) {
D_801849DC[*(u16 *)((s32)a0 + 0x2)]();
D_801849DC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801849AC);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80184A18[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80184A18[*(u8 *)((s32)param + 0x4F)](param);
D_80184A18[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_000/ov_SC07_000_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801D0B98;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801D0B98;
RotMatrixYXZ(rot, D_801D0B98);
func_80048D9C(D_801D0B98, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80185718);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_8018570C, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_801856CC);
src/ov_SC07_001/ov_SC07_001_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8018339C[])(void);
void func_80155580(void *a0) {
D_8018339C[*(u16 *)((s32)a0 + 0x2)]();
D_8018339C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80183810[])(void);
void func_80157544(void *a0) {
D_80183810[*(u16 *)((s32)a0 + 0x2)]();
D_80183810[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80183818;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80183828);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80183878[])(void);
void func_80157DC4(void *a0) {
D_80183878[*(u16 *)((s32)a0 + 0x2)]();
D_80183878[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80183880[])(void);
void func_80157FC4(void *a0) {
D_80183880[*(u16 *)((s32)a0 + 0x2)]();
D_80183880[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8018384C;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018384C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_8018388C[])(void);
void func_8015824C(void *a0) {
D_8018388C[*(u16 *)((s32)a0 + 0x2)]();
D_8018388C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8018385C);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_801838C8[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_801838C8[*(u8 *)((s32)param + 0x4F)](param);
D_801838C8[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_001/ov_SC07_001_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801AADC8;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801AADC8;
RotMatrixYXZ(rot, D_801AADC8);
func_80048D9C(D_801AADC8, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_801845C8);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_801845BC, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_8018457C);
src/ov_SC07_002/ov_SC07_002_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_80188658[])(void);
void func_80155580(void *a0) {
D_80188658[*(u16 *)((s32)a0 + 0x2)]();
D_80188658[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80188ACC[])(void);
void func_80157544(void *a0) {
D_80188ACC[*(u16 *)((s32)a0 + 0x2)]();
D_80188ACC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80188AD4;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_80188AE4);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_80188B34[])(void);
void func_80157DC4(void *a0) {
D_80188B34[*(u16 *)((s32)a0 + 0x2)]();
D_80188B34[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_80188B3C[])(void);
void func_80157FC4(void *a0) {
D_80188B3C[*(u16 *)((s32)a0 + 0x2)]();
D_80188B3C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_80188B08;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80188B08);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80188B48[])(void);
void func_8015824C(void *a0) {
D_80188B48[*(u16 *)((s32)a0 + 0x2)]();
D_80188B48[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80188B18);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80188B84[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80188B84[*(u8 *)((s32)param + 0x4F)](param);
D_80188B84[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_006/ov_SC07_006_jr_80154C24.c
+17 -17
View File
@@ -1861,7 +1861,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_8018C27C[])(void);
D_8018C27C[*(u16 *)((s32)a0 + 0x2)]();
D_8018C27C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2109,7 +2109,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_8018C6F0[])(void);
D_8018C6F0[*(u16 *)((s32)a0 + 0x2)]();
D_8018C6F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2205,7 +2205,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018C6F8;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2255,8 +2255,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2279,7 +2279,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018C708);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2351,7 +2351,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018C758[])(void);
D_8018C758[*(u16 *)((s32)a0 + 0x2)]();
D_8018C758[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2372,7 +2372,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_8018C760[])(void);
D_8018C760[*(u16 *)((s32)a0 + 0x2)]();
D_8018C760[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2396,11 +2396,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_8018C72C;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8018C72C);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2418,7 +2418,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_8018C76C[])(void);
D_8018C76C[*(u16 *)((s32)a0 + 0x2)]();
D_8018C76C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2460,15 +2460,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8018C73C);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2487,7 +2487,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2600,5 +2600,5 @@ void func_80158880(s32 *param) {
extern void (*D_8018C7A8[])(s32 *);
func_80149020(param);
D_8018C7A8[*(u8 *)((s32)param + 0x4F)](param);
D_8018C7A8[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_007/ov_SC07_007_jr_80154C24.c
+17 -17
View File
@@ -1861,7 +1861,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_80184DA0[])(void);
D_80184DA0[*(u16 *)((s32)a0 + 0x2)]();
D_80184DA0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2078,7 +2078,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_80185214[])(void);
D_80185214[*(u16 *)((s32)a0 + 0x2)]();
D_80185214[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2174,7 +2174,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018521C;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2224,8 +2224,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2248,7 +2248,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018522C);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2320,7 +2320,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018527C[])(void);
D_8018527C[*(u16 *)((s32)a0 + 0x2)]();
D_8018527C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2341,7 +2341,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_80185284[])(void);
D_80185284[*(u16 *)((s32)a0 + 0x2)]();
D_80185284[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2365,11 +2365,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_80185250;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_80185250);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2387,7 +2387,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_80185290[])(void);
D_80185290[*(u16 *)((s32)a0 + 0x2)]();
D_80185290[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2429,15 +2429,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_80185260);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2456,7 +2456,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2569,5 +2569,5 @@ void func_80158880(s32 *param) {
extern void (*D_801852CC[])(s32 *);
func_80149020(param);
D_801852CC[*(u8 *)((s32)param + 0x4F)](param);
D_801852CC[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_008/ov_SC07_008_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8017F170[])(void);
void func_80155580(void *a0) {
D_8017F170[*(u16 *)((s32)a0 + 0x2)]();
D_8017F170[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_8017F5E4[])(void);
void func_80157544(void *a0) {
D_8017F5E4[*(u16 *)((s32)a0 + 0x2)]();
D_8017F5E4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_8017F5EC;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8017F5FC);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_8017F64C[])(void);
void func_80157DC4(void *a0) {
D_8017F64C[*(u16 *)((s32)a0 + 0x2)]();
D_8017F64C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_8017F654[])(void);
void func_80157FC4(void *a0) {
D_8017F654[*(u16 *)((s32)a0 + 0x2)]();
D_8017F654[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_8017F620;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_8017F620);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_8017F660[])(void);
void func_8015824C(void *a0) {
D_8017F660[*(u16 *)((s32)a0 + 0x2)]();
D_8017F660[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_8017F630);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_8017F69C[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_8017F69C[*(u8 *)((s32)param + 0x4F)](param);
D_8017F69C[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_008/ov_SC07_008_jr_8015C32C.c
+6 -6
View File
@@ -5846,12 +5846,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_80196600;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_80196600;
RotMatrixYXZ(rot, D_80196600);
func_80048D9C(D_80196600, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018039C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5890,10 +5890,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80180390, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80180350);
src/ov_SC07_009/ov_SC07_009_jr_80154C24.c
+17 -17
View File
@@ -964,7 +964,7 @@ s32 func_80155458(s32 param_1)
extern void (*D_8017FC14[])(void);
void func_80155580(void *a0) {
D_8017FC14[*(u16 *)((s32)a0 + 0x2)]();
D_8017FC14[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1149,7 +1149,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
extern void (*D_80180088[])(void);
void func_80157544(void *a0) {
D_80180088[*(u16 *)((s32)a0 + 0x2)]();
D_80180088[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1229,7 +1229,7 @@ extern u8 D_80180090;
void func_801578C0(s32 param_1)
{
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1279,8 +1279,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1303,7 +1303,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_801800A0);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1368,7 +1368,7 @@ void func_80157D20(void *param_1, s32 param_2)
extern void (*D_801800F0[])(void);
void func_80157DC4(void *a0) {
D_801800F0[*(u16 *)((s32)a0 + 0x2)]();
D_801800F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1384,7 +1384,7 @@ void func_80157DC4(void *a0) {
extern void (*D_801800F8[])(void);
void func_80157FC4(void *a0) {
D_801800F8[*(u16 *)((s32)a0 + 0x2)]();
D_801800F8[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1406,11 +1406,11 @@ extern s32 D_801800C4;
void func_80158038(void * param)
{
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801800C4);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1425,7 +1425,7 @@ void func_80158038(void * param)
extern void (*D_80180104[])(void);
void func_8015824C(void *a0) {
D_80180104[*(u16 *)((s32)a0 + 0x2)]();
D_80180104[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1463,15 +1463,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801800D4);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1490,7 +1490,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1596,5 +1596,5 @@ extern void (*D_80180140[])(s32 *);
void func_80158880(s32 *param) {
func_80149020(param);
D_80180140[*(u8 *)((s32)param + 0x4F)](param);
D_80180140[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_009/ov_SC07_009_jr_8015C32C.c
+6 -6
View File
@@ -5845,12 +5845,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A3C90;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A3C90;
RotMatrixYXZ(rot, D_801A3C90);
func_80048D9C(D_801A3C90, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_80180E40);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -5889,10 +5889,10 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80180E34, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
CAST_WIDTH(short, iVar1, 0x18) = 0x2000;
CAST_WIDTH(char, iVar1, 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
CAST_WIDTH(char, iVar1, 0x24) = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80180DF4);
src/ov_SC07_010/ov_SC07_010_jr_80154C24.c
+17 -17
View File
@@ -1282,7 +1282,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_80183E30[])(void);
D_80183E30[*(u16 *)((s32)a0 + 0x2)]();
D_80183E30[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1499,7 +1499,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_801842A4[])(void);
D_801842A4[*(u16 *)((s32)a0 + 0x2)]();
D_801842A4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1595,7 +1595,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_801842AC;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -1645,8 +1645,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -1669,7 +1669,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_801842BC);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -1741,7 +1741,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_8018430C[])(void);
D_8018430C[*(u16 *)((s32)a0 + 0x2)]();
D_8018430C[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1762,7 +1762,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_80184314[])(void);
D_80184314[*(u16 *)((s32)a0 + 0x2)]();
D_80184314[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1786,11 +1786,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_801842E0;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801842E0);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -1808,7 +1808,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_80184320[])(void);
D_80184320[*(u16 *)((s32)a0 + 0x2)]();
D_80184320[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -1850,15 +1850,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801842F0);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -1877,7 +1877,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -1990,5 +1990,5 @@ void func_80158880(s32 *param) {
extern void (*D_8018435C[])(s32 *);
func_80149020(param);
D_8018435C[*(u8 *)((s32)param + 0x4F)](param);
D_8018435C[((Unkstruct_80126B58 *)param)->unk4F](param);
}
src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c
+9 -9
View File
@@ -6509,12 +6509,12 @@ void func_80169BBC(s32 arg0) {
vec[1] = -0x400;
vec[2] = 0;
RotMatrixYXZ(vec, mtx);
*(s32 *)(s2 + 0x34) = (s32)D_801A9400;
CAST_WIDTH(s32, s2, 0x34) = (s32)D_801A9400;
RotMatrixYXZ(rot, D_801A9400);
func_80048D9C(D_801A9400, mtx);
*(u16 *)(s2 + 0x18) = 0x5000;
*(u16 *)(s2 + 0x1A) = 0x2000;
*(s32 *)(s2 + 4) = *(s32 *)(s2 + 4) | 0xC000140;
((Unkstruct_800B5CB8 *)s2)->unk18 = 0x5000;
((Unkstruct_800B5CB8 *)s2)->unk1A = 0x2000;
CAST_WIDTH(s32, s2, 4) = CAST_WIDTH(s32, s2, 4) | 0xC000140;
func_80128EA8(s2, arg0 + 0x24, (s32)D_8018505C);
*(u16 *)(arg0 + 2) = *(u16 *)(arg0 + 2) + 1;
} else {
@@ -6559,11 +6559,11 @@ void func_80169F3C(int param_1)
iVar1 = func_800D21C4(param_1, D_80185050, 0x16);
if (iVar1 != 0) {
*(int *)(param_1 + 0x20) = iVar1;
*(short *)(iVar1 + 0x1a) = 0x2000;
*(short *)(iVar1 + 0x18) = 0x2000;
*(char *)(iVar1 + 0x26) = 0x60;
*(char *)(iVar1 + 0x25) = 0x60;
*(char *)(iVar1 + 0x24) = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk1A = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk18 = 0x2000;
((Unkstruct_800B5CB8 *)iVar1)->unk26 = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk25 = 0x60;
((Unkstruct_800B5CB8 *)iVar1)->unk24 = 0x60;
*(unsigned int *)(iVar1 + 4) = *(unsigned int *)(iVar1 + 4) | 0x50000000;
((void (*)(int, int, void *))func_80128EA8)(iVar1, param_1 + 0x24, D_80185010);
*(short *)(param_1 + 2) = *(short *)(param_1 + 2) + 1;
src/ov_SC07_011/ov_SC07_011_jr_80154C24.c
+17 -17
View File
@@ -1862,7 +1862,7 @@ s32 func_80155458(s32 param_1)
void func_80155580(void *a0) {
extern void (*D_801804F0[])(void);
D_801804F0[*(u16 *)((s32)a0 + 0x2)]();
D_801804F0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2079,7 +2079,7 @@ void func_80156A1C(s32 param_1, s32 param_2)
void func_80157544(void *a0) {
extern void (*D_80180964[])(void);
D_80180964[*(u16 *)((s32)a0 + 0x2)]();
D_80180964[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2175,7 +2175,7 @@ void func_801578C0(s32 param_1)
extern u8 D_800D5128;
extern u8 D_8018096C;
((void (*)(void))func_80156648)();
*(u8 *)(param_1 + 0x1AA) = 9;
((Unkstruct_80126B58 *)param_1)->unk1AA = 9;
func_80154274((s32 *)param_1, (s32)&D_800D5128);
((void (*)(s32 *, s32))func_80154A74)((s32 *)param_1, 0x15);
func_80147324(0xC20);
@@ -2225,8 +2225,8 @@ void func_8015795C(int param_1)
*(unsigned int *)(param_1 + 0x44) = *(unsigned int *)(param_1 + 0x44) | 2;
((int (*)(int, int))func_80147A10)(param_1, 0x400);
if (*(int *)(param_1 + 0x2c) >= 0) {
*(int *)(param_1 + 0x2c) = 0;
if (((Unkstruct_80126B58 *)param_1)->unk2C >= 0) {
((Unkstruct_80126B58 *)param_1)->unk2C = 0;
}
func_80147A84(param_1);
((void (*)(int))func_801473EC)(param_1);
@@ -2249,7 +2249,7 @@ void func_8015795C(int param_1)
((void (*)(int, void *))func_80154274)(param_1, &D_800D5178);
((void (*)(int, void *))func_80146DB8)(param_1, &D_8018097C);
((void (*)(int, int))func_801477E8)(param_1, 0xfff40000);
*(short *)(param_1 + 2) = 4;
((Unkstruct_80126B58 *)param_1)->unk2 = 4;
}
((void (*)(int))func_801725A4)(param_1);
}
@@ -2321,7 +2321,7 @@ void func_80157D20(void *param_1, s32 param_2)
void func_80157DC4(void *a0) {
extern void (*D_801809CC[])(void);
D_801809CC[*(u16 *)((s32)a0 + 0x2)]();
D_801809CC[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2342,7 +2342,7 @@ void func_80157DC4(void *a0) {
void func_80157FC4(void *a0) {
extern void (*D_801809D4[])(void);
D_801809D4[*(u16 *)((s32)a0 + 0x2)]();
D_801809D4[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2366,11 +2366,11 @@ void func_80158038(void * param)
extern s32 D_800D51E0;
extern s32 D_801809A0;
*(u8 *)(param + 0x1aa) = 0xe;
((Unkstruct_80126B58 *)param)->unk1AA = 0xe;
func_80154274((s32 *)param, (s32)&D_800D51E0);
func_80154A74(param, 0x15);
func_80146DB8((s32 *)param, &D_801809A0);
*(s32 *)(param + 0x234) = 0;
((Unkstruct_80126B58 *)param)->unk234 = 0;
func_80146994(5, param, 0xc, 0);
func_80147324(0x455);
func_80146CA0((void *)param);
@@ -2388,7 +2388,7 @@ void func_80158038(void * param)
void func_8015824C(void *a0) {
extern void (*D_801809E0[])(void);
D_801809E0[*(u16 *)((s32)a0 + 0x2)]();
D_801809E0[((Unkstruct_80126B58 *)a0)->unk2]();
}
@@ -2430,15 +2430,15 @@ void func_80158434(s32 param_1)
s32 frame_pad[4];
(void)&frame_pad;
*(u32 *)(param_1 + 0x44) = *(u32 *)(param_1 + 0x44) | 2;
if ((*(u16 *)(param_1 + 0xB8) & 0x4000) != 0) {
*(s32 *)(param_1 + 0x234) = *(s32 *)(param_1 + 0x234) + 1;
((Unkstruct_80126B58 *)param_1)->unk44 = ((Unkstruct_80126B58 *)param_1)->unk44 | 2;
if ((((Unkstruct_80126B58 *)param_1)->unkB8 & 0x4000) != 0) {
((Unkstruct_80126B58 *)param_1)->unk234 = ((Unkstruct_80126B58 *)param_1)->unk234 + 1;
((s32 (*)(void))func_8014CBF8)();
((void (*)(s32))func_801474EC)(param_1);
((void (*)(s32, s32))func_801477E8)(param_1, 0xFFFA0000);
((void (*)(s32, s32))func_80146DB8)(param_1, (s32)&D_801809B0);
}
if (*(s32 *)(param_1 + 0x234) != 0) {
if (((Unkstruct_80126B58 *)param_1)->unk234 != 0) {
func_80148038(param_1, 0x10000);
func_80147460(param_1);
func_80147AD4(param_1, 0, 0, 0);
@@ -2457,7 +2457,7 @@ LAB_80158508:
((void (*)(s32))func_80146CA0)(param_1);
return;
LAB_80158528:
((void (*)(s32, s32))func_80155FF8)(param_1, *(u8 *)(param_1 + 0x1AA));
((void (*)(s32, s32))func_80155FF8)(param_1, ((Unkstruct_80126B58 *)param_1)->unk1AA);
}
@@ -2570,5 +2570,5 @@ void func_80158880(s32 *param) {
extern void (*D_80180A1C[])(s32 *);
func_80149020(param);
D_80180A1C[*(u8 *)((s32)param + 0x4F)](param);
D_80180A1C[((Unkstruct_80126B58 *)param)->unk4F](param);
}