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

T5: batch t5_imS9 — restruct: batch t5_imS9 rung S — 200 files (TUs; 856 drawable) · 495 bodies: 0 sites → members / 0 kept / 0 skipped · levers off 0 · I/M recipes drawn 47 {'R2-extern-array': 47} / residual 936 {'R2-COMPILE-ERROR': 3, 'R2-DIFFERS': 104, 'R2-NO-SCALAR-EXTERN': 535, 'R2-REKEYS': 139, 'R2-WIDTH': 154, 'R3-NOT-CONTIGUOUS': 1} · compiles 194 in 182 s wall · final 200/200 identical · written 32 files | R22 check-all: 218 passed, 0 failed of 218 | type_census: 1650 definitions (523 layouts, 53 duplicate classes, 0 variant camps) · 336500 cast sites in 51000 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-02 12:34:01 -06:00
parent 191d9643aa
commit 8d1bbb34a2
36 changed files with 895 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC01_000/ov_SC01_000_jr_801789AC.c
+2 -2
View File
@@ -2695,7 +2695,7 @@ s32 func_80178BF8()
extern short D_801A567C;
extern int D_801A578C;
extern int D_801A5690;
extern s16 D_801A5670;
extern s16 D_801A5670[];
extern short D_801A5668;
extern short D_801A566C;
extern int D_801A5840;
@@ -2716,7 +2716,7 @@ s32 func_80178BF8()
D_801A567C = 0;
D_801A578C = 1;
D_801A5690 = 0;
(*(short *)&D_801A5670) = 0;
(D_801A5670[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_001/ov_SC01_001_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_801ED90C;
extern int D_801F306C;
extern int D_801ED920;
extern s16 D_801ED900;
extern s16 D_801ED900[];
extern short D_801ED8F8;
extern short D_801ED8FC;
extern int D_801F3120;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_801ED90C = 0;
D_801F306C = 1;
D_801ED920 = 0;
(*(short *)&D_801ED900) = 0;
(D_801ED900[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_004/ov_SC01_004_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_80190074;
extern int D_80190274;
extern int D_80190088;
extern s16 D_80190068;
extern s16 D_80190068[];
extern short D_80190060;
extern short D_80190064;
extern int D_80190328;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_80190074 = 0;
D_80190274 = 1;
D_80190088 = 0;
(*(short *)&D_80190068) = 0;
(D_80190068[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_005/ov_SC01_005_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_801CD7D4;
extern int D_801CDED4;
extern int D_801CD7E8;
extern s16 D_801CD7C8;
extern s16 D_801CD7C8[];
extern short D_801CD7C0;
extern short D_801CD7C4;
extern int D_801CDF88;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_801CD7D4 = 0;
D_801CDED4 = 1;
D_801CD7E8 = 0;
(*(short *)&D_801CD7C8) = 0;
(D_801CD7C8[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_008/ov_SC01_008_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_801A3284;
extern int D_801A3484;
extern int D_801A3298;
extern s16 D_801A3278;
extern s16 D_801A3278[];
extern short D_801A3270;
extern short D_801A3274;
extern int D_801A3538;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_801A3284 = 0;
D_801A3484 = 1;
D_801A3298 = 0;
(*(short *)&D_801A3278) = 0;
(D_801A3278[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_009/ov_SC01_009_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_801F30E4;
extern int D_801F3304;
extern int D_801F30F8;
extern s16 D_801F30D8;
extern s16 D_801F30D8[];
extern short D_801F30D0;
extern short D_801F30D4;
extern int D_801F33B8;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_801F30E4 = 0;
D_801F3304 = 1;
D_801F30F8 = 0;
(*(short *)&D_801F30D8) = 0;
(D_801F30D8[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_074/ov_SC01_074_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_8019BB64;
extern int D_8019BC14;
extern int D_8019BB78;
extern s16 D_8019BB58;
extern s16 D_8019BB58[];
extern short D_8019BB50;
extern short D_8019BB54;
extern int D_8019BCC8;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_8019BB64 = 0;
D_8019BC14 = 1;
D_8019BB78 = 0;
(*(short *)&D_8019BB58) = 0;
(D_8019BB58[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_077/ov_SC01_077_jr_801789AC.c
+2 -2
View File
@@ -2921,7 +2921,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
extern short D_801DA724;
extern int D_801DA9B0;
extern int D_801DA738;
extern s16 D_801DA718;
extern s16 D_801DA718[];
extern short D_801DA710;
extern short D_801DA714;
extern int D_801DAA88;
@@ -2942,7 +2942,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
D_801DA724 = 0;
D_801DA9B0 = 1;
D_801DA738 = 0;
(*(short *)&D_801DA718) = 0;
(D_801DA718[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_080/ov_SC01_080_jr_801789AC.c
+2 -2
View File
@@ -2699,7 +2699,7 @@ s32 func_80178BF8()
extern short D_801C5994;
extern int D_801C75EC;
extern int D_801C59A8;
extern s16 D_801C5988;
extern s16 D_801C5988[];
extern short D_801C5980;
extern short D_801C5984;
extern int D_801C7EA8;
@@ -2720,7 +2720,7 @@ s32 func_80178BF8()
D_801C5994 = 0;
D_801C75EC = 1;
D_801C59A8 = 0;
(*(short *)&D_801C5988) = 0;
(D_801C5988[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_084/ov_SC01_084_jr_801789AC.c
+2 -2
View File
@@ -2700,7 +2700,7 @@ s32 func_80178BF8()
extern short D_801C743C;
extern int D_801C7754;
extern int D_801C7450;
extern s16 D_801C7430;
extern s16 D_801C7430[];
extern short D_801C7428;
extern short D_801C742C;
extern int D_801C7808;
@@ -2721,7 +2721,7 @@ s32 func_80178BF8()
D_801C743C = 0;
D_801C7754 = 1;
D_801C7450 = 0;
(*(short *)&D_801C7430) = 0;
(D_801C7430[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC01_084/ov_SC01_084_jr_80182A00.c
+4 -4
View File
@@ -1690,7 +1690,7 @@ extern void func_8012B2CC(s32 a0);
extern s32 func_8012C588(s32 a0, s32 a1);
extern void func_8005C2C8(s32 a0, s32 a1);
extern u8 D_801BE010[];
extern s32 D_80186B78;
extern s32 D_80186B78[];
extern u8 D_8018A9C0[];
extern s16 D_8018A91A;
extern s16 D_801C7748;
@@ -1710,7 +1710,7 @@ void func_801849E4(s32 param_1) {
((Unkstruct_800B5CB8 *)param_1)->unk58 = (s32)D_8018A9C0;
CAST_ALIAS(u16, param_1, 0x5C) |= 0x8000;
D_8018A91A = -1;
func_8012A828(param_1, &D_80186B78);
func_8012A828(param_1, D_80186B78);
((Unkstruct_800B5CB8 *)param_1)->unk2 = 1;
((Unkstruct_800B5CB8 *)param_1)->unk1C = 0x14;
((Unkstruct_800B5CB8 *)param_1)->unkE0 = 0;
@@ -2734,7 +2734,7 @@ extern s32 func_80134510(s32 arg);
s32 func_80185E98(s32 param_1) {
extern M2C_UNK D_80186B78;
extern M2C_UNK D_80186B78[0];
extern s32 func_8012C354(s32 a0, s32 a1);
extern void RotMatrixZ(s32, void *);
extern void MulMatrix0(s32, void *, s32);
@@ -2753,7 +2753,7 @@ s32 func_80185E98(s32 param_1) {
if (((s32 (*)(s32, void *))func_8012C354)(param_1, &D_8018AC84) == 0) {
((void (*)(s32))func_8012C218)(param_1);
}
((void(*)(s32, void *))func_8012A828)(param_1, &(*(s32 *)&D_80186B78));
((void(*)(s32, void *))func_8012A828)(param_1, &(D_80186B78[0]));
iVar5 = *(s32 *)(param_1 + 0x20);
*(s16 *)(param_1 + 0x70) = 0x80;
*(s32 *)(iVar5 + 4) |= 0x50000040;
src/ov_SC02_000/ov_SC02_000_jr_801789AC.c
+2 -2
View File
@@ -2697,7 +2697,7 @@ s32 func_80178BF8()
extern short D_801E7F6C;
extern int D_801E8684;
extern int D_801E7F80;
extern s16 D_801E7F60;
extern s16 D_801E7F60[];
extern short D_801E7F58;
extern short D_801E7F5C;
extern int D_801E8758;
@@ -2718,7 +2718,7 @@ s32 func_80178BF8()
D_801E7F6C = 0;
D_801E8684 = 1;
D_801E7F80 = 0;
(*(short *)&D_801E7F60) = 0;
(D_801E7F60[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
src/ov_SC03_003/ov_SC03_003_jr_8013FFD8.c
+2 -2
View File
@@ -915,7 +915,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
extern s32 D_801802CC[];
extern char *D_80180288;
extern s32 D_8018029C[];
extern M2C_UNK D_8018030C;
extern M2C_UNK D_8018030C[];
extern s16 D_80180310[];
extern unsigned char D_8018031C;
extern s32 D_8010F3C4[];
@@ -1005,7 +1005,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
}
ret = D_8010F3C4[s0];
} else {
ret = (*(s32 *)&D_8018030C);
ret = (D_8018030C[0]);
}
}
break;
src/ov_SC03_104/ov_SC03_104_jr_80182038.c
+2 -2
View File
@@ -4331,7 +4331,7 @@ void func_8018428C(void *a0)
extern void func_8012CAE4(void *a0);
extern void func_8001C2C4(s32 a0);
extern s16 D_8019CA60;
extern s32 D_8019CA14;
extern s32 D_8019CA14[];
extern s32 func_8012AD50(void *a0);
void *s0;
@@ -4349,7 +4349,7 @@ void func_8018428C(void *a0)
*(s32 *)((u8 *)s0 + 0x58) = (s32)&D_8019CA60 | 0x40000000;
*(s16 *)((u8 *)s0 + 0x5C) = 0x800;
*(u16 *)((u8 *)s0 + 0x72) |= 0x1000;
*(s32 *)&D_8019CA14 = *(s32 *)((u8 *)s0 + 0xDC);
D_8019CA14[0] = *(s32 *)((u8 *)s0 + 0xDC);
func_8012AD50((void *)s0);
}
src/ov_SC03_114/ov_SC03_114_jr_8013FFD8.c
+2 -2
View File
@@ -915,7 +915,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
extern s32 D_8017FA48[];
extern char *D_8017FA04;
extern s32 D_8017FA18;
extern M2C_UNK D_8017FA88;
extern M2C_UNK D_8017FA88[];
extern char *D_8017FA8C;
extern char *D_8017FA98;
extern s32 D_8010F3C4[];
@@ -1005,7 +1005,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
}
ret = D_8010F3C4[s0];
} else {
ret = (*(s32 *)&D_8017FA88);
ret = (D_8017FA88[0]);
}
}
break;
src/ov_SC03_115/ov_SC03_115_jr_8017BEBC.c
+3 -3
View File
@@ -66,7 +66,7 @@ extern void func_80146360(void);
extern void func_801463A0();
extern void func_8014607C(void);
extern s32 *D_80126B78;
extern u8 D_80078EC1;
extern u8 D_80078EC1[];
extern s32 D_80078EC8;
extern s32 D_80126B9C;
extern s32 D_8011F730;
@@ -5020,9 +5020,9 @@ s32 *func_8017FC5C(s32 *a0, s32 a1, s32 a2) {
}
extern u8 D_80078EC1;
extern u8 D_80078EC1[0];
s32 func_8017FD08(void) {
return *(u8 *)&D_80078EC1 == 0x15;
return D_80078EC1[0] == 0x15;
}
src/ov_SC03_125/ov_SC03_125_jr_80182BA0.c
+8 -8
View File
@@ -3246,7 +3246,7 @@ extern void func_8012F214(s32 arg0, s32 arg1, s32 arg2);
void func_80183240(void) {
extern s32 D_801A6828;
extern s32 D_801C44C4;
extern s32 D_801C44C4[];
s32 a0;
u16 buffer[4];
s32 val;
@@ -3256,7 +3256,7 @@ void func_80183240(void) {
val = buffer[0] | (((s16)buffer[2]) << 16);
p = *(s32**)&D_801C44C4;
p = D_801C44C4[0];
p[1] = val;
}
@@ -3528,25 +3528,25 @@ void *a0;
s32 func_801837F0(void)
{
extern u16 D_80126B5E;
extern u16 D_80126B66;
extern u16 D_80126B62;
extern u16 D_80126B5E[];
extern u16 D_80126B66[];
extern u16 D_80126B62[];
s16 v1;
s32 result;
v1 = *(s16 *)&D_80126B5E;
v1 = D_80126B5E[0];
if (v1 < 0x400) {
result = 0;
} else if (v1 >= 0x501) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B66;
v1 = D_80126B66[0];
if (v1 < 0x580) {
result = 0;
} else if (v1 >= 0x601) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B62;
v1 = D_80126B62[0];
result = (v1 >= -0x200);
}
}
src/ov_SC04_006/ov_SC04_006_jr_8013FFD8.c
+2 -2
View File
@@ -915,7 +915,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
extern unsigned char D_80180BDC[];
extern char *D_80180B98;
extern u16 D_80180BAC;
extern M2C_UNK D_80180C1C;
extern M2C_UNK D_80180C1C[];
extern u16 D_80180C20[];
extern u8 D_80180C2C[];
extern s32 D_8010F3C4[];
@@ -1005,7 +1005,7 @@ s32 func_8013FFD8(s16 arg0, s32 arg1, s32 *arg2) {
}
ret = D_8010F3C4[s0];
} else {
ret = (*(s32 *)&D_80180C1C);
ret = (D_80180C1C[0]);
}
}
break;
src/ov_SC04_008/ov_SC04_008_jr_80140608.c
+3 -3
View File
@@ -885,7 +885,7 @@ extern void func_8013EB7C(void);
extern u16 D_80115112;
extern void func_8013ED6C(void);
extern s32 func_8013EE10();
extern unsigned short D_80115118;
extern unsigned short D_80115118[];
extern void func_8013F138(void);
extern void func_800D2624(void);
extern unsigned short D_80115114;
@@ -1113,7 +1113,7 @@ extern unsigned short D_80115112;
extern u16 D_80115110;
extern u16 D_80115112;
extern unsigned short D_80115118;
extern unsigned short D_80115118[0];
extern volatile u16 D_8011511A;
extern s16 D_80115128;
extern s32 D_80115130;
@@ -1146,7 +1146,7 @@ void func_801418F8(void)
func_800D24A0(1);
D_8011511A = 2;
t = D_8011511A;
(*(s16 *)&D_80115118) = 0;
(D_80115118[0]) = 0;
D_80115130 = 0;
if (t >= 4) {
D_8011511A = t - 3;
src/ov_SC04_015/ov_SC04_015_jr_801820DC.c
+8 -8
View File
@@ -3261,7 +3261,7 @@ extern void func_8012F214(s32 arg0, s32 arg1, s32 arg2);
void func_8018277C(void) {
extern s32 D_801B2A0C;
extern s32 D_801C9364;
extern s32 D_801C9364[];
s32 a0;
u16 buffer[4];
s32 val;
@@ -3271,7 +3271,7 @@ void func_8018277C(void) {
val = buffer[0] | (((s16)buffer[2]) << 16);
p = *(s32**)&D_801C9364;
p = D_801C9364[0];
p[1] = val;
}
@@ -3281,25 +3281,25 @@ void func_8018277C(void) {
s32 func_801827BC(void)
{
extern u16 D_80126B5E;
extern u16 D_80126B66;
extern u16 D_80126B62;
extern u16 D_80126B5E[];
extern u16 D_80126B66[];
extern u16 D_80126B62[];
s16 v1;
s32 result;
v1 = *(s16 *)&D_80126B5E;
v1 = D_80126B5E[0];
if (v1 < 0x400) {
result = 0;
} else if (v1 >= 0x501) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B66;
v1 = D_80126B66[0];
if (v1 < 0x580) {
result = 0;
} else if (v1 >= 0x601) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B62;
v1 = D_80126B62[0];
result = (v1 >= -0x200);
}
}
src/ov_SC04_020/ov_SC04_020_jr_8018254C.c
+8 -8
View File
@@ -3232,7 +3232,7 @@ extern void func_8012F214(s32 arg0, s32 arg1, s32 arg2);
void func_80182BEC(void) {
extern s32 D_801B5F4C;
extern s32 D_801BC734;
extern s32 D_801BC734[];
s32 a0;
u16 buffer[4];
s32 val;
@@ -3242,7 +3242,7 @@ void func_80182BEC(void) {
val = buffer[0] | (((s16)buffer[2]) << 16);
p = *(s32**)&D_801BC734;
p = D_801BC734[0];
p[1] = val;
}
@@ -3347,25 +3347,25 @@ void *a0;
s32 func_80182DBC(void)
{
extern u16 D_80126B5E;
extern u16 D_80126B66;
extern u16 D_80126B62;
extern u16 D_80126B5E[];
extern u16 D_80126B66[];
extern u16 D_80126B62[];
s16 v1;
s32 result;
v1 = *(s16 *)&D_80126B5E;
v1 = D_80126B5E[0];
if (v1 < 0x400) {
result = 0;
} else if (v1 >= 0x501) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B66;
v1 = D_80126B66[0];
if (v1 < 0x580) {
result = 0;
} else if (v1 >= 0x601) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B62;
v1 = D_80126B62[0];
result = (v1 >= -0x200);
}
}
src/ov_SC05_001/ov_SC05_001_jr_8017BEBC.c
+3 -3
View File
@@ -5551,11 +5551,11 @@ void func_80180874(s32 a0) {
}
extern s32 D_80126CD4;
extern s32 D_80126CD4[];
extern void func_8018029C(s32);
void func_8018098C(s32 arg0) {
if (*(s32 *)&D_80126CD4 == arg0) {
((void (*)(s32))func_8018029C)(*(s32 *)&D_80126CD4);
if (D_80126CD4[0] == arg0) {
((void (*)(s32))func_8018029C)(*(s32 *)D_80126CD4);
}
}
src/ov_SC05_009/ov_SC05_009_jr_80140608.c
+3 -3
View File
@@ -885,7 +885,7 @@ extern void func_8013EB7C(void);
extern u16 D_80115112;
extern void func_8013ED6C(void);
extern s32 func_8013EE10();
extern unsigned short D_80115118;
extern unsigned short D_80115118[];
extern void func_8013F138(void);
extern void func_800D2624(void);
extern unsigned short D_80115114;
@@ -1113,7 +1113,7 @@ extern unsigned short D_80115112;
extern u16 D_80115110;
extern u16 D_80115112;
extern unsigned short D_80115118;
extern unsigned short D_80115118[0];
extern volatile u16 D_8011511A;
extern s16 D_80115128;
extern s32 D_80115130;
@@ -1146,7 +1146,7 @@ void func_801418F8(void)
func_800D24A0(1);
D_8011511A = 2;
t = D_8011511A;
(*(s16 *)&D_80115118) = 0;
(D_80115118[0]) = 0;
D_80115130 = 0;
if (t >= 4) {
D_8011511A = t - 3;
src/ov_SC05_018/ov_SC05_018_jr_80185754.c
+8 -8
View File
@@ -3276,7 +3276,7 @@ extern void func_8012F214(s32 arg0, s32 arg1, s32 arg2);
void func_80185DF4(void) {
extern s32 D_801E02E4;
extern s32 D_801E6814;
extern s32 D_801E6814[];
s32 a0;
u16 buffer[4];
s32 val;
@@ -3286,7 +3286,7 @@ void func_80185DF4(void) {
val = buffer[0] | (((s16)buffer[2]) << 16);
p = *(s32**)&D_801E6814;
p = D_801E6814[0];
p[1] = val;
}
@@ -3558,25 +3558,25 @@ void func_801862F8(s32 arg0) {
s32 func_801863A4(void)
{
extern u16 D_80126B5E;
extern u16 D_80126B66;
extern u16 D_80126B62;
extern u16 D_80126B5E[];
extern u16 D_80126B66[];
extern u16 D_80126B62[];
s16 v1;
s32 result;
v1 = *(s16 *)&D_80126B5E;
v1 = D_80126B5E[0];
if (v1 < 0x400) {
result = 0;
} else if (v1 >= 0x501) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B66;
v1 = D_80126B66[0];
if (v1 < 0x580) {
result = 0;
} else if (v1 >= 0x601) {
result = 0;
} else {
v1 = *(s16 *)&D_80126B62;
v1 = D_80126B62[0];
result = (v1 >= -0x200);
}
}
src/ov_SC06_022/ov_SC06_022_jr_801588CC.c
+2 -2
View File
@@ -1377,7 +1377,7 @@ extern void func_80028620(s32, void *);
extern s16 D_800B9AAC[];
extern s16 D_800B9B00;
extern u16 D_801270C0;
extern u16 D_801270C0[];
extern u8 D_800AF630[];
extern u32 D_800AFAE8[];
extern char D_8018F724[];
@@ -1412,7 +1412,7 @@ s32 func_801596F0(s32 param_1) {
} while (q < (u32 *)(base + 0x65AC));
}
(*(s16 *)&D_801270C0) = 3;
(D_801270C0[0]) = 3;
((void (*)(s32))func_80129248)(0);
func_8013C938();
func_8013CB20();
src/ov_SC06_029/ov_SC06_029_jr_801898CC.c
+2 -2
View File
@@ -5120,7 +5120,7 @@ extern s32 func_80134510(s32 arg);
s32 func_8018BFF8(s32 param_1) {
extern M2C_UNK D_8018C894;
extern M2C_UNK D_8018C894[];
extern s32 func_8012C354(s32 a0, s32 a1);
extern void RotMatrixZ(s32, void *);
extern void MulMatrix0(s32, void *, s32);
@@ -5139,7 +5139,7 @@ s32 func_8018BFF8(s32 param_1) {
if (((s32 (*)(s32, void *))func_8012C354)(param_1, &D_801D9948) == 0) {
((void (*)(s32))func_8012C218)(param_1);
}
((void(*)(s32, void *))func_8012A828)(param_1, &(*(s32 *)&D_8018C894));
((void(*)(s32, void *))func_8012A828)(param_1, &(D_8018C894[0]));
iVar5 = *(s32 *)(param_1 + 0x20);
*(s16 *)(param_1 + 0x70) = 0x80;
*(s32 *)(iVar5 + 4) |= 0x50000040;
src/ov_SC07_007/ov_SC07_007_jr_8015C32C.c
+6 -6
View File
@@ -4566,7 +4566,7 @@ void func_80161E08(s32 param_1) {
extern void func_801622C4(void);
extern u16 D_800AF7BC;
extern u16 D_800AF7BE;
extern s16 D_80078EB0;
extern s16 D_80078EB0[];
extern u16 D_800B5BD8;
extern s16 D_800B5C04;
extern u8 D_800B5BFF;
@@ -4629,7 +4629,7 @@ void func_80161E08(s32 param_1) {
}
func_800242D0((s16)func_801620C4(), &D_801C66FC, 0x84);
if ((a2 & 0x7FFF) == (s32)D_80078EB0) {
if ((a2 & 0x7FFF) == (s32)D_80078EB0[0]) {
func_801622C4();
}
}
@@ -4675,7 +4675,7 @@ extern s32 func_800291DC(s32);
s32 func_801621CC(s32 arg0) {
extern u8 D_80078E78[];
extern u8 D_80078EB0;
extern u8 D_80078EB0[0];
extern u8 D_80078EB1;
extern s32 D_80185A6C;
s32 s0 = arg0; /* $s0: arg0, crosses the call */
@@ -4691,7 +4691,7 @@ s32 func_801621CC(s32 arg0) {
return 0;
}
a2 &= 0x7FFF;
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0)) {
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0[0])) {
return (s32)&D_80185A6C;
}
d = s1[0x39] - 1;
@@ -4778,7 +4778,7 @@ extern s32 func_800291DC(s32);
s32 func_80162438(s32 _unused0) {
extern s16 D_80078EB0;
extern s16 D_80078EB0[0];
extern u8 D_800AF630[];
extern void func_80024054(void *, void *);
extern void func_8001CE28(void *, void *);
@@ -4846,7 +4846,7 @@ s32 func_80162438(s32 _unused0) {
D_800B5C52 = -D_800AF7BE / 2 + 0x10;
}
func_800242D0((s16)func_801626B8(), D_801C6758, 0x84);
if ((uVar2 & 0x7FFF) == (s32)(*(s16 *)&D_80078EB0)) {
if ((uVar2 & 0x7FFF) == (s32)(D_80078EB0[0])) {
func_80162760();
}
}
src/ov_SC07_007/ov_SC07_007_jr_801789AC.c
+108 -108
View File
@@ -3246,7 +3246,7 @@ extern void func_8017AE2C(s32 a0);
extern s32 func_801399F0(s32 a0);
extern void func_80178CBC(s32 arg0, s32 arg1);
extern short D_801C7B34;
extern short D_801C7B34[];
extern s32 D_801C7760;
extern s32 D_801C79D0;
extern s32 D_801C734C;
@@ -3261,7 +3261,7 @@ s32 func_801789AC(s32 arg0)
func_8017A4AC();
func_8017AE2C(arg0);
switch ((s16)(D_801C7B34 - 1)) {
switch ((s16)(D_801C7B34[0] - 1)) {
case 0:
ret = func_801399F0(D_801C7760);
D_801C79D0 = ret;
@@ -3363,7 +3363,7 @@ extern void func_80016714(void *a0, s32 a1);
void func_80178BF8(s32 _unused0, s32 _unused1)
{
extern void func_8017B1D8(void);
extern short D_801C7B34;
extern short D_801C7B34[0];
extern int D_801C7760;
extern short D_801C7770;
extern short D_801C776C;
@@ -3371,7 +3371,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
extern short D_801C7764;
extern int D_801C79D0;
extern int D_801C7778;
extern s16 D_801C7758;
extern s16 D_801C7758[];
extern short D_801C7750;
extern short D_801C7754;
extern int D_801C7A90;
@@ -3384,7 +3384,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
iVar2 = 9;
puVar3 = &D_801C77C8;
D_801C7B34 = 0;
D_801C7B34[0] = 0;
D_801C7760 = 0;
D_801C7770 = 0;
D_801C776C = 0;
@@ -3392,7 +3392,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
D_801C7764 = 0;
D_801C79D0 = 1;
D_801C7778 = 0;
(*(short *)&D_801C7758) = 0;
(D_801C7758[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
@@ -3417,11 +3417,11 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1);
void func_80178CBC(s32 arg0, s32 arg1) {
extern s32 D_801C7348;
extern short D_801C7B34;
extern short D_801C7B34[0];
D_801C7348 = arg1;
do {
func_80178D40(arg0, D_801C7348);
} while (D_801C7B34 == 3);
} while (D_801C7B34[0] == 3);
}
@@ -3430,8 +3430,8 @@ extern void func_80174714(void);
void func_80178D18(void) {
extern short D_801C7B34;
D_801C7B34 = 0;
extern short D_801C7B34[0];
D_801C7B34[0] = 0;
func_80174714();
}
@@ -3614,49 +3614,49 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
case 1:
func_80179B28(D_801C7760);
D_801C7760 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801C776C, D_801C7770 ? 0x48 : 0x40);
(*(s16*)&D_801C7B34) = 2;
(D_801C7B34[0]) = 2;
break;
case 0:
func_80179B28(D_801C7760);
D_801C7760 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801C7764, D_801C7768 ? 0x48 : 0x40);
(*(s16*)&D_801C7B34) = 1;
(*(s16*)D_801C7B34) = 1;
break;
case 0x45:
((void (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0));
if (D_801C79C8 != 0) {
func_80179B28(D_801C7760);
D_801C7760 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[1], D_801C7764, D_801C7768 ? 0x48 : 0x40);
(*(s16*)&D_801C7B34) = 1;
(*(s16*)D_801C7B34) = 1;
} else {
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
}
break;
case 0x32:
func_80179B28(D_801C7760);
D_801C7760 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w], D_801C7764,
D_801C7768 ? 0x48 : 0x40);
(*(s16*)&D_801C7B34) = 1;
(*(s16*)D_801C7B34) = 1;
break;
case 2:
func_80179B28(D_801C7760);
if (D_801C7778 != 0) {
D_801C7348 = D_801C7778;
D_801C7778 = 0;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
return;
}
(*(s16*)&D_801C7B34) = 6;
(*(s16*)D_801C7B34) = 6;
break;
case 6:
func_80179DF8();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 3:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179D30(&v10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 4:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3664,11 +3664,11 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x4C:
func_80179D78((void *)((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x4D:
v10.vx = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f0;
@@ -3677,7 +3677,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
v18.pad = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f6;
func_80179D78(&v18);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x15:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3685,33 +3685,33 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0)->unkD4, &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 5:
func_80179DCC(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 7:
func_80179E1C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 8:
func_80179E74(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 9:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179EA0(&v10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0xA:
v10.vx = ((Actor_80178D40 *)arg0)->unk6;
v10.vy = ((Actor_80178D40 *)arg0)->unkA;
v10.vz = ((Actor_80178D40 *)arg0)->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x16: {
Actor_80178D40 *p = ((Actor_80178D40 *)arg0)->unkD4;
@@ -3719,155 +3719,155 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vy = p->unkA;
v10.vz = p->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
}
case 0xB:
func_8017A0F4();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0xC:
func_8017A11C();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0xD:
func_8017A180();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0xE:
func_8017A1A8();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x10:
func_8017A1D0();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x46:
func_8017A1F8();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x59:
func_8017A220();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x5A:
func_8017A248();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x49:
func_8017A144(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x47:
func_8017A270();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x17:
func_80179EE8(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x18:
func_80179F14(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x19:
func_80179F6C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x1A:
func_80179F98(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x51:
func_8017A040(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x1B:
D_801C7798 = ((Cmd_80178D40 *)arg1)->a.w;
func_80179F44();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x1C:
func_8017A338();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x52:
func_8017A360();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x1D:
func_8017A388();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x3B:
func_8017A094(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x3C:
func_8017A0C4(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0xF:
case 0x3F:
(*(s16*)&D_801C7B34) = 4;
(*(s16*)D_801C7B34) = 4;
D_801C734C = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3E:
(*(s16*)&D_801C7B34) = 5;
(*(s16*)D_801C7B34) = 5;
D_801C778C = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x40:
D_801C778C = (s32)func_8017A3B0;
(*(s16*)&D_801C7B34) = 5;
(*(s16*)D_801C7B34) = 5;
break;
case 0x23:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x31:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x24:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unk20->unk12 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x25:
g[0] = 1;
g[2] = ((Actor_80178D40 *)arg0)->unk20->unk12 + ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x48:
g[0] = 1;
g[2] = ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x26:
g[0] = 1;
g[2] = ((s32 (*)(void *))func_8012B8A4)(((Actor_80178D40 *)arg0));
g[1] = 0x1E;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3D:
((void(*)(void *, s32))func_8012E8E0)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x27:
g[0] = 2;
g[4] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x4F:
g[5] = 1;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3877,7 +3877,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
g[5] = 0;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3893,7 +3893,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v28;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x50:
v30.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3905,129 +3905,129 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v38;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x2A:
g[0] = 4;
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x1E:
func_8017B238(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x21:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801C777C);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x54:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801C777C);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x1F:
func_8017B614(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x22:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801C777C);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x55:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801C777C);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x20:
func_8017B7A8(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x4E:
D_801C77A0 = ((Cmd_80178D40 *)arg1)->a.w;
func_8017B940(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x57:
func_8017B824();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x58:
func_8017B880();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x2B:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unk2 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2C:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unk34 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2D:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unkD8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2F:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unk10A = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2E:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
((Actor_80178D40 *)arg0)->unkF8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x11:
func_8017A298();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x12:
func_8017A2C0();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x13:
func_8017A2E8();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x14:
func_8017A310();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x33: {
void (*f)(Actor_80178D40 *) = (void (*)(Actor_80178D40 *))((Cmd_80178D40 *)arg1)->a.w;
D_801C7ABC = (s32)&((Cmd_80178D40 *)arg1)[1];
f(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
}
case 0x30:
if (((Cmd_80178D40 *)arg1)->a.w == 0) {
((void (*)(void *))func_8012E8A8)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
} else {
((void (*)(void *))func_8012E88C)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
}
break;
case 0x4A:
((void(*)())func_80175414)();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x4B:
func_80175454();
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x34:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C7348 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x35:
D_801C7778 = (s32)&((Cmd_80178D40 *)arg1)[1];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C7348 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x36:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C7348 += 8;
if (((s32 (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0)) == 0) {
break;
@@ -4035,12 +4035,12 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
D_801C7348 = *(s32 *)(D_801C7348 + 4);
return;
case 0x37:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C7764 = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_801C7768 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x38:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C776C = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_801C7770 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
@@ -4056,7 +4056,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v48);
w2 = out50[0];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C7764 = w1;
D_801C7768 = (s16)w1 >= (s16)w2;
break;
@@ -4073,42 +4073,42 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v60);
w2 = out50[0];
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
D_801C776C = w2;
D_801C7770 = (s16)w1 < (s16)w2;
break;
}
case 0x41:
((void(*)(s32, s32))func_8002D4C8)(((Cmd_80178D40 *)arg1)->a.uh[0], ((Cmd_80178D40 *)arg1)->a.uh[1]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x42:
func_8017AD0C(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x43:
D_801C778C = (s32)func_8017A3D8;
D_801C7794 = 0;
(*(s16*)&D_801C7B34) = 5;
(*(s16*)D_801C7B34) = 5;
D_801C7790 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x44:
func_8001AAD0(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x53:
func_80179E48(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x56:
func_80179FEC(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
L5B_found:
fp5b = ((Cmd_80178D40 *)arg1)->a.w;
*q5b = fp5b;
((void (*)(Actor_80178D40 *))fp5b)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
case 0x5B:
i5b = 0;
@@ -4120,7 +4120,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
q5b++;
} while (i5b < 10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
L5C_found1:
*q5c = 0;
@@ -4139,7 +4139,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
} while (i5c < 10);
L5C_join:
if (i5c != 10) {
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
}
i5c = 0;
@@ -4150,7 +4150,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
i5c++;
} while (i5c < 10);
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
L5C_found2:
*p5c = 0;
@@ -4168,7 +4168,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
/* fallthrough */
case 0x5D:
L5D:
(*(s16*)&D_801C7B34) = 3;
(*(s16*)D_801C7B34) = 3;
break;
default:
break;
src/ov_SC07_010/ov_SC07_010_jr_8015C32C.c
+6 -6
View File
@@ -3993,7 +3993,7 @@ void func_80161E08(s32 param_1) {
extern void func_801622C4(void);
extern u16 D_800AF7BC;
extern u16 D_800AF7BE;
extern s16 D_80078EB0;
extern s16 D_80078EB0[];
extern u16 D_800B5BD8;
extern s16 D_800B5C04;
extern u8 D_800B5BFF;
@@ -4056,7 +4056,7 @@ void func_80161E08(s32 param_1) {
}
func_800242D0((s16)func_801620C4(), &D_801A6BF4, 0x84);
if ((a2 & 0x7FFF) == (s32)D_80078EB0) {
if ((a2 & 0x7FFF) == (s32)D_80078EB0[0]) {
func_801622C4();
}
}
@@ -4102,7 +4102,7 @@ extern s32 func_800291DC(s32);
s32 func_801621CC(s32 arg0) {
extern u8 D_80078E78[];
extern u8 D_80078EB0;
extern u8 D_80078EB0[0];
extern u8 D_80078EB1;
extern s32 D_80184AFC;
s32 s0 = arg0; /* $s0: arg0, crosses the call */
@@ -4118,7 +4118,7 @@ s32 func_801621CC(s32 arg0) {
return 0;
}
a2 &= 0x7FFF;
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0)) {
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0[0])) {
return (s32)&D_80184AFC;
}
d = s1[0x39] - 1;
@@ -4205,7 +4205,7 @@ extern s32 func_800291DC(s32);
s32 func_80162438(s32 _unused0) {
extern s16 D_80078EB0;
extern s16 D_80078EB0[0];
extern u8 D_800AF630[];
extern void func_80024054(void *, void *);
extern void func_8001CE28(void *, void *);
@@ -4273,7 +4273,7 @@ s32 func_80162438(s32 _unused0) {
D_800B5C52 = -D_800AF7BE / 2 + 0x10;
}
func_800242D0((s16)func_801626B8(), D_801A6C50, 0x84);
if ((uVar2 & 0x7FFF) == (s32)(*(s16 *)&D_80078EB0)) {
if ((uVar2 & 0x7FFF) == (s32)(D_80078EB0[0])) {
func_80162760();
}
}
src/ov_SC07_010/ov_SC07_010_jr_801789AC.c
+108 -108
View File
@@ -2707,7 +2707,7 @@ extern void func_8017AE2C(s32 a0);
extern s32 func_801399F0(s32 a0);
extern void func_80178CBC(s32 arg0, s32 arg1);
extern short D_801A9544;
extern short D_801A9544[];
extern s32 D_801A7C58;
extern s32 D_801A93EC;
extern s32 D_801A7844;
@@ -2722,7 +2722,7 @@ s32 func_801789AC(s32 arg0)
func_8017A4AC();
func_8017AE2C(arg0);
switch ((s16)(D_801A9544 - 1)) {
switch ((s16)(D_801A9544[0] - 1)) {
case 0:
ret = func_801399F0(D_801A7C58);
D_801A93EC = ret;
@@ -2824,7 +2824,7 @@ extern void func_80016714(void *a0, s32 a1);
void func_80178BF8(s32 _unused0, s32 _unused1)
{
extern void func_8017B1D8(void);
extern short D_801A9544;
extern short D_801A9544[0];
extern int D_801A7C58;
extern short D_801A7C68;
extern short D_801A7C64;
@@ -2832,7 +2832,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
extern short D_801A7C5C;
extern int D_801A93EC;
extern int D_801A7C70;
extern s16 D_801A7C50;
extern s16 D_801A7C50[];
extern short D_801A7C48;
extern short D_801A7C4C;
extern int D_801A94A0;
@@ -2845,7 +2845,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
iVar2 = 9;
puVar3 = &D_801A7CC0;
D_801A9544 = 0;
D_801A9544[0] = 0;
D_801A7C58 = 0;
D_801A7C68 = 0;
D_801A7C64 = 0;
@@ -2853,7 +2853,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
D_801A7C5C = 0;
D_801A93EC = 1;
D_801A7C70 = 0;
(*(short *)&D_801A7C50) = 0;
(D_801A7C50[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
@@ -2878,11 +2878,11 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1);
void func_80178CBC(s32 arg0, s32 arg1) {
extern s32 D_801A7840;
extern short D_801A9544;
extern short D_801A9544[0];
D_801A7840 = arg1;
do {
func_80178D40(arg0, D_801A7840);
} while (D_801A9544 == 3);
} while (D_801A9544[0] == 3);
}
@@ -2891,8 +2891,8 @@ extern void func_80174714(void);
void func_80178D18(void) {
extern short D_801A9544;
D_801A9544 = 0;
extern short D_801A9544[0];
D_801A9544[0] = 0;
func_80174714();
}
@@ -3075,49 +3075,49 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
case 1:
func_80179B28(D_801A7C58);
D_801A7C58 = func_80137614(((Cmd_80178D40 *)arg1)->a.w, D_801A7C64, D_801A7C68 ? 0x48 : 0x40);
(*(s16*)&D_801A9544) = 2;
(D_801A9544[0]) = 2;
break;
case 0:
func_80179B28(D_801A7C58);
D_801A7C58 = func_80137614(((Cmd_80178D40 *)arg1)->a.w, D_801A7C5C, D_801A7C60 ? 0x48 : 0x40);
(*(s16*)&D_801A9544) = 1;
(*(s16*)D_801A9544) = 1;
break;
case 0x45:
((void (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0));
if (D_801A93E8 != 0) {
func_80179B28(D_801A7C58);
D_801A7C58 = func_80137614(((Actor_80178D40 *)arg0)->unkDC[1], D_801A7C5C, D_801A7C60 ? 0x48 : 0x40);
(*(s16*)&D_801A9544) = 1;
(*(s16*)D_801A9544) = 1;
} else {
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
}
break;
case 0x32:
func_80179B28(D_801A7C58);
D_801A7C58 = func_80137614(((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w], D_801A7C5C,
D_801A7C60 ? 0x48 : 0x40);
(*(s16*)&D_801A9544) = 1;
(*(s16*)D_801A9544) = 1;
break;
case 2:
func_80179B28(D_801A7C58);
if (D_801A7C70 != 0) {
D_801A7840 = D_801A7C70;
D_801A7C70 = 0;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
return;
}
(*(s16*)&D_801A9544) = 6;
(*(s16*)D_801A9544) = 6;
break;
case 6:
func_80179DF8();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 3:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179D30(&v10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 4:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3125,11 +3125,11 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_8012F214(((Actor_80178D40 *)arg0), &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x4C:
func_80179D78((void *)((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x4D:
v10.vx = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f0;
@@ -3138,7 +3138,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
func_8012F214(((Actor_80178D40 *)arg0), &v10, &v18);
v18.pad = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f6;
func_80179D78(&v18);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x15:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3146,33 +3146,33 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_8012F214(((Actor_80178D40 *)arg0)->unkD4, &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 5:
func_80179DCC(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 7:
func_80179E1C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 8:
func_80179E74(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 9:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179EA0(&v10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0xA:
v10.vx = ((Actor_80178D40 *)arg0)->unk6;
v10.vy = ((Actor_80178D40 *)arg0)->unkA;
v10.vz = ((Actor_80178D40 *)arg0)->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x16: {
Actor_80178D40 *p = ((Actor_80178D40 *)arg0)->unkD4;
@@ -3180,155 +3180,155 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vy = p->unkA;
v10.vz = p->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
}
case 0xB:
func_8017A0F4();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0xC:
func_8017A11C();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0xD:
func_8017A180();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0xE:
func_8017A1A8();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x10:
func_8017A1D0();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x46:
func_8017A1F8();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x59:
func_8017A220();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x5A:
func_8017A248();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x49:
func_8017A144(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x47:
func_8017A270();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x17:
func_80179EE8(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x18:
func_80179F14(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x19:
func_80179F6C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x1A:
func_80179F98(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x51:
func_8017A040(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x1B:
D_801A7C90 = ((Cmd_80178D40 *)arg1)->a.w;
func_80179F44();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x1C:
func_8017A338();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x52:
func_8017A360();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x1D:
func_8017A388();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x3B:
func_8017A094(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x3C:
func_8017A0C4(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0xF:
case 0x3F:
(*(s16*)&D_801A9544) = 4;
(*(s16*)D_801A9544) = 4;
D_801A7844 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3E:
(*(s16*)&D_801A9544) = 5;
(*(s16*)D_801A9544) = 5;
D_801A7C84 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x40:
D_801A7C84 = (s32)func_8017A3B0;
(*(s16*)&D_801A9544) = 5;
(*(s16*)D_801A9544) = 5;
break;
case 0x23:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x31:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x24:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unk20->unk12 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x25:
g[0] = 1;
g[2] = ((Actor_80178D40 *)arg0)->unk20->unk12 + ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x48:
g[0] = 1;
g[2] = ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x26:
g[0] = 1;
g[2] = func_8012B8A4(((Actor_80178D40 *)arg0));
g[1] = 0x1E;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3D:
((void(*)(void *, s32))func_8012E8E0)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x27:
g[0] = 2;
g[4] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x4F:
g[5] = 1;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3338,7 +3338,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
g[5] = 0;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3354,7 +3354,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v28;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x50:
v30.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3366,129 +3366,129 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v38;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x2A:
g[0] = 4;
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x1E:
func_8017B238(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x21:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801A7C74);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x54:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_801A7C74);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x1F:
func_8017B614(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x22:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801A7C74);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x55:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_801A7C74);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x20:
func_8017B7A8(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x4E:
D_801A7C98 = ((Cmd_80178D40 *)arg1)->a.w;
func_8017B940(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x57:
func_8017B824();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x58:
func_8017B880();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x2B:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unk2 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2C:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unk34 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2D:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unkD8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2F:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unk10A = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2E:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
((Actor_80178D40 *)arg0)->unkF8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x11:
func_8017A298();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x12:
func_8017A2C0();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x13:
func_8017A2E8();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x14:
func_8017A310();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x33: {
void (*f)(Actor_80178D40 *) = (void (*)(Actor_80178D40 *))((Cmd_80178D40 *)arg1)->a.w;
D_801A94CC = (s32)&((Cmd_80178D40 *)arg1)[1];
f(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
}
case 0x30:
if (((Cmd_80178D40 *)arg1)->a.w == 0) {
func_8012E8A8(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
} else {
func_8012E88C(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
}
break;
case 0x4A:
((void(*)())func_80175414)();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x4B:
func_80175454();
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x34:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7840 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x35:
D_801A7C70 = (s32)&((Cmd_80178D40 *)arg1)[1];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7840 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x36:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7840 += 8;
if (((s32 (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0)) == 0) {
break;
@@ -3496,12 +3496,12 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
D_801A7840 = *(s32 *)(D_801A7840 + 4);
return;
case 0x37:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7C5C = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_801A7C60 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x38:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7C64 = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_801A7C68 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
@@ -3517,7 +3517,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v48);
w2 = out50[0];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7C5C = w1;
D_801A7C60 = (s16)w1 >= (s16)w2;
break;
@@ -3534,42 +3534,42 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v60);
w2 = out50[0];
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
D_801A7C64 = w2;
D_801A7C68 = (s16)w1 < (s16)w2;
break;
}
case 0x41:
((void(*)(s32, s32))func_8002D4C8)(((Cmd_80178D40 *)arg1)->a.uh[0], ((Cmd_80178D40 *)arg1)->a.uh[1]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x42:
func_8017AD0C(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x43:
D_801A7C84 = (s32)func_8017A3D8;
D_801A7C8C = 0;
(*(s16*)&D_801A9544) = 5;
(*(s16*)D_801A9544) = 5;
D_801A7C88 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x44:
func_8001AAD0(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x53:
func_80179E48(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x56:
func_80179FEC(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
L5B_found:
fp5b = ((Cmd_80178D40 *)arg1)->a.w;
*q5b = fp5b;
((void (*)(Actor_80178D40 *))fp5b)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
case 0x5B:
i5b = 0;
@@ -3581,7 +3581,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
q5b++;
} while (i5b < 10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
L5C_found1:
*q5c = 0;
@@ -3600,7 +3600,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
} while (i5c < 10);
L5C_join:
if (i5c != 10) {
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
}
i5c = 0;
@@ -3611,7 +3611,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
i5c++;
} while (i5c < 10);
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
L5C_found2:
*p5c = 0;
@@ -3629,7 +3629,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
/* fallthrough */
case 0x5D:
L5D:
(*(s16*)&D_801A9544) = 3;
(*(s16*)D_801A9544) = 3;
break;
default:
break;
src/ov_SC07_011/ov_SC07_011_jr_8015C32C.c
+6 -6
View File
@@ -4567,7 +4567,7 @@ void func_80161E08(s32 param_1) {
extern void func_801622C4(void);
extern u16 D_800AF7BC;
extern u16 D_800AF7BE;
extern s16 D_80078EB0;
extern s16 D_80078EB0[];
extern u16 D_800B5BD8;
extern s16 D_800B5C04;
extern u8 D_800B5BFF;
@@ -4630,7 +4630,7 @@ void func_80161E08(s32 param_1) {
}
func_800242D0((s16)func_801620C4(), &D_8018F28C, 0x84);
if ((a2 & 0x7FFF) == (s32)D_80078EB0) {
if ((a2 & 0x7FFF) == (s32)D_80078EB0[0]) {
func_801622C4();
}
}
@@ -4676,7 +4676,7 @@ extern s32 func_800291DC(s32);
s32 func_801621CC(s32 arg0) {
extern u8 D_80078E78[];
extern u8 D_80078EB0;
extern u8 D_80078EB0[0];
extern u8 D_80078EB1;
extern s32 D_801811BC;
s32 s0 = arg0; /* $s0: arg0, crosses the call */
@@ -4692,7 +4692,7 @@ s32 func_801621CC(s32 arg0) {
return 0;
}
a2 &= 0x7FFF;
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0)) {
if (((a2 >> 8) == D_80078EB1) && ((a2 & 0xFF) <= (u32)D_80078EB0[0])) {
return (s32)&D_801811BC;
}
d = s1[0x39] - 1;
@@ -4779,7 +4779,7 @@ extern s32 func_800291DC(s32);
s32 func_80162438(s32 _unused0) {
extern s16 D_80078EB0;
extern s16 D_80078EB0[0];
extern u8 D_800AF630[];
extern void func_80024054(void *, void *);
extern void func_8001CE28(void *, void *);
@@ -4847,7 +4847,7 @@ s32 func_80162438(s32 _unused0) {
D_800B5C52 = -D_800AF7BE / 2 + 0x10;
}
func_800242D0((s16)func_801626B8(), D_8018F2E8, 0x84);
if ((uVar2 & 0x7FFF) == (s32)(*(s16 *)&D_80078EB0)) {
if ((uVar2 & 0x7FFF) == (s32)(D_80078EB0[0])) {
func_80162760();
}
}
src/ov_SC07_011/ov_SC07_011_jr_801789AC.c
+108 -108
View File
@@ -3249,7 +3249,7 @@ extern void func_8017AE2C(s32 a0);
extern s32 func_801399F0(s32 a0);
extern void func_80178CBC(s32 arg0, s32 arg1);
extern short D_801904FC;
extern short D_801904FC[];
extern s32 D_801902F0;
extern s32 D_801903A4;
extern s32 D_8018FEDC;
@@ -3264,7 +3264,7 @@ s32 func_801789AC(s32 arg0)
func_8017A4AC();
func_8017AE2C(arg0);
switch ((s16)(D_801904FC - 1)) {
switch ((s16)(D_801904FC[0] - 1)) {
case 0:
ret = func_801399F0(D_801902F0);
D_801903A4 = ret;
@@ -3366,7 +3366,7 @@ extern void func_80016714(void *a0, s32 a1);
void func_80178BF8(s32 _unused0, s32 _unused1)
{
extern void func_8017B1D8(void);
extern short D_801904FC;
extern short D_801904FC[0];
extern int D_801902F0;
extern short D_80190300;
extern short D_801902FC;
@@ -3374,7 +3374,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
extern short D_801902F4;
extern int D_801903A4;
extern int D_80190308;
extern s16 D_801902E8;
extern s16 D_801902E8[];
extern short D_801902E0;
extern short D_801902E4;
extern int D_80190458;
@@ -3387,7 +3387,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
iVar2 = 9;
puVar3 = &D_80190358;
D_801904FC = 0;
D_801904FC[0] = 0;
D_801902F0 = 0;
D_80190300 = 0;
D_801902FC = 0;
@@ -3395,7 +3395,7 @@ void func_80178BF8(s32 _unused0, s32 _unused1)
D_801902F4 = 0;
D_801903A4 = 1;
D_80190308 = 0;
(*(short *)&D_801902E8) = 0;
(D_801902E8[0]) = 0;
do {
*puVar3 = 0;
iVar2 = iVar2 + -1;
@@ -3420,11 +3420,11 @@ extern M2C_UNK func_80178D40(s32 arg0, s32 arg1);
void func_80178CBC(s32 arg0, s32 arg1) {
extern s32 D_8018FED8;
extern short D_801904FC;
extern short D_801904FC[0];
D_8018FED8 = arg1;
do {
func_80178D40(arg0, D_8018FED8);
} while (D_801904FC == 3);
} while (D_801904FC[0] == 3);
}
@@ -3433,8 +3433,8 @@ extern void func_80174714(void);
void func_80178D18(void) {
extern short D_801904FC;
D_801904FC = 0;
extern short D_801904FC[0];
D_801904FC[0] = 0;
func_80174714();
}
@@ -3617,49 +3617,49 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
case 1:
func_80179B28(D_801902F0);
D_801902F0 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801902FC, D_80190300 ? 0x48 : 0x40);
(*(s16*)&D_801904FC) = 2;
(D_801904FC[0]) = 2;
break;
case 0:
func_80179B28(D_801902F0);
D_801902F0 = ((s32 (*)(s32, s32, s32))func_80137614)(((Cmd_80178D40 *)arg1)->a.w, D_801902F4, D_801902F8 ? 0x48 : 0x40);
(*(s16*)&D_801904FC) = 1;
(*(s16*)D_801904FC) = 1;
break;
case 0x45:
((void (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0));
if (D_801903A0 != 0) {
func_80179B28(D_801902F0);
D_801902F0 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[1], D_801902F4, D_801902F8 ? 0x48 : 0x40);
(*(s16*)&D_801904FC) = 1;
(*(s16*)D_801904FC) = 1;
} else {
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
}
break;
case 0x32:
func_80179B28(D_801902F0);
D_801902F0 = ((s32 (*)(s32, s32, s32))func_80137614)(((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w], D_801902F4,
D_801902F8 ? 0x48 : 0x40);
(*(s16*)&D_801904FC) = 1;
(*(s16*)D_801904FC) = 1;
break;
case 2:
func_80179B28(D_801902F0);
if (D_80190308 != 0) {
D_8018FED8 = D_80190308;
D_80190308 = 0;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
return;
}
(*(s16*)&D_801904FC) = 6;
(*(s16*)D_801904FC) = 6;
break;
case 6:
func_80179DF8();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 3:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179D30(&v10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 4:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3667,11 +3667,11 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x4C:
func_80179D78((void *)((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x4D:
v10.vx = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f0;
@@ -3680,7 +3680,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0), &v10, &v18);
v18.pad = ((Blk_80178D40 *)((Cmd_80178D40 *)arg1)->a.p)->f6;
func_80179D78(&v18);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x15:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3688,33 +3688,33 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
((void (*)(void *, void *, void *))func_8012F214)(((Actor_80178D40 *)arg0)->unkD4, &v10, &v18);
func_80179D30(&v18);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 5:
func_80179DCC(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 7:
func_80179E1C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 8:
func_80179E74(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 9:
v10.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
v10.vy = 0;
v10.vz = ((Cmd_80178D40 *)arg1)->a.uh[1];
func_80179EA0(&v10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0xA:
v10.vx = ((Actor_80178D40 *)arg0)->unk6;
v10.vy = ((Actor_80178D40 *)arg0)->unkA;
v10.vz = ((Actor_80178D40 *)arg0)->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x16: {
Actor_80178D40 *p = ((Actor_80178D40 *)arg0)->unkD4;
@@ -3722,155 +3722,155 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
v10.vy = p->unkA;
v10.vz = p->unkE;
func_80179EA0(&v10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
}
case 0xB:
func_8017A0F4();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0xC:
func_8017A11C();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0xD:
func_8017A180();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0xE:
func_8017A1A8();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x10:
func_8017A1D0();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x46:
func_8017A1F8();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x59:
func_8017A220();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x5A:
func_8017A248();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x49:
func_8017A144(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x47:
func_8017A270();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x17:
func_80179EE8(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x18:
func_80179F14(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x19:
func_80179F6C(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x1A:
func_80179F98(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x51:
func_8017A040(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x1B:
D_80190328 = ((Cmd_80178D40 *)arg1)->a.w;
func_80179F44();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x1C:
func_8017A338();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x52:
func_8017A360();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x1D:
func_8017A388();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x3B:
func_8017A094(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x3C:
func_8017A0C4(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0xF:
case 0x3F:
(*(s16*)&D_801904FC) = 4;
(*(s16*)D_801904FC) = 4;
D_8018FEDC = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3E:
(*(s16*)&D_801904FC) = 5;
(*(s16*)D_801904FC) = 5;
D_8019031C = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x40:
D_8019031C = (s32)func_8017A3B0;
(*(s16*)&D_801904FC) = 5;
(*(s16*)D_801904FC) = 5;
break;
case 0x23:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x31:
((void (*)(void *, s32))func_8012A828)(((Actor_80178D40 *)arg0), ((Actor_80178D40 *)arg0)->unkDC[((Cmd_80178D40 *)arg1)->a.w]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x24:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unk20->unk12 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x25:
g[0] = 1;
g[2] = ((Actor_80178D40 *)arg0)->unk20->unk12 + ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x48:
g[0] = 1;
g[2] = ((Cmd_80178D40 *)arg1)->a.uh[0];
g[1] = 0x1E;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x26:
g[0] = 1;
g[2] = ((s32 (*)(void *))func_8012B8A4)(((Actor_80178D40 *)arg0));
g[1] = 0x1E;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[3] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x3D:
((void(*)(void *, s32))func_8012E8E0)(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x27:
g[0] = 2;
g[4] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x4F:
g[5] = 1;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3880,7 +3880,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
g[5] = 0;
g[0] = 3;
g[6] = ((Cmd_80178D40 *)arg1)->a.uh[0];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[7] = ((Actor_80178D40 *)arg0)->unkA;
g[8] = ((Cmd_80178D40 *)arg1)->a.uh[1];
g[1] = 0x10;
@@ -3896,7 +3896,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v28;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x50:
v30.vx = ((Cmd_80178D40 *)arg1)->a.uh[0];
@@ -3908,129 +3908,129 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
*(SV3_80178D40 *)(g + 6) = v38;
g[1] = 0x10;
g[3] = 4;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x2A:
g[0] = 4;
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
g[1] = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x1E:
func_8017B238(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x21:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_8019030C);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x54:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B238(((Actor_80178D40 *)arg0), (s32)&D_8019030C);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x1F:
func_8017B614(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x22:
func_8017BA3C(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_8019030C);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x55:
func_8017BB34(((Actor_80178D40 *)arg0), ((Cmd_80178D40 *)arg1)->a.w);
func_8017B614(((Actor_80178D40 *)arg0), (s32)&D_8019030C);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x20:
func_8017B7A8(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x4E:
D_80190330 = ((Cmd_80178D40 *)arg1)->a.w;
func_8017B940(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x57:
func_8017B824();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x58:
func_8017B880();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x2B:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unk2 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2C:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unk34 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2D:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unkD8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2F:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unk10A = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x2E:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
((Actor_80178D40 *)arg0)->unkF8 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x11:
func_8017A298();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x12:
func_8017A2C0();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x13:
func_8017A2E8();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x14:
func_8017A310();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x33: {
void (*f)(Actor_80178D40 *) = (void (*)(Actor_80178D40 *))((Cmd_80178D40 *)arg1)->a.w;
D_80190484 = (s32)&((Cmd_80178D40 *)arg1)[1];
f(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
}
case 0x30:
if (((Cmd_80178D40 *)arg1)->a.w == 0) {
((void (*)(void *))func_8012E8A8)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
} else {
((void (*)(void *))func_8012E88C)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
}
break;
case 0x4A:
((void(*)())func_80175414)();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x4B:
func_80175454();
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x34:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_8018FED8 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x35:
D_80190308 = (s32)&((Cmd_80178D40 *)arg1)[1];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_8018FED8 = ((Cmd_80178D40 *)arg1)->a.w;
return;
case 0x36:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_8018FED8 += 8;
if (((s32 (*)(s32))((Cmd_80178D40 *)arg1)->a.w)(((Actor_80178D40 *)arg0)) == 0) {
break;
@@ -4038,12 +4038,12 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
D_8018FED8 = *(s32 *)(D_8018FED8 + 4);
return;
case 0x37:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_801902F4 = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_801902F8 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
case 0x38:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_801902FC = ((Cmd_80178D40 *)arg1)->a.uh[0];
D_80190300 = ((Cmd_80178D40 *)arg1)->a.uh[1];
break;
@@ -4059,7 +4059,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v48);
w2 = out50[0];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_801902F4 = w1;
D_801902F8 = (s16)w1 >= (s16)w2;
break;
@@ -4076,42 +4076,42 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
w1 = out50[0];
func_8012F40C(out50, &v60);
w2 = out50[0];
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
D_801902FC = w2;
D_80190300 = (s16)w1 < (s16)w2;
break;
}
case 0x41:
((void(*)(s32, s32))func_8002D4C8)(((Cmd_80178D40 *)arg1)->a.uh[0], ((Cmd_80178D40 *)arg1)->a.uh[1]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x42:
func_8017AD0C(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x43:
D_8019031C = (s32)func_8017A3D8;
D_80190324 = 0;
(*(s16*)&D_801904FC) = 5;
(*(s16*)D_801904FC) = 5;
D_80190320 = ((Cmd_80178D40 *)arg1)->a.w;
break;
case 0x44:
func_8001AAD0(((Cmd_80178D40 *)arg1)->a.h[0], ((Cmd_80178D40 *)arg1)->a.h[1]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x53:
func_80179E48(((Cmd_80178D40 *)arg1)->a.h[0]);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x56:
func_80179FEC(((Cmd_80178D40 *)arg1)->a.w);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
L5B_found:
fp5b = ((Cmd_80178D40 *)arg1)->a.w;
*q5b = fp5b;
((void (*)(Actor_80178D40 *))fp5b)(((Actor_80178D40 *)arg0));
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
case 0x5B:
i5b = 0;
@@ -4123,7 +4123,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
q5b++;
} while (i5b < 10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
L5C_found1:
*q5c = 0;
@@ -4142,7 +4142,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
} while (i5c < 10);
L5C_join:
if (i5c != 10) {
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
}
i5c = 0;
@@ -4153,7 +4153,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
}
i5c++;
} while (i5c < 10);
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
L5C_found2:
*p5c = 0;
@@ -4171,7 +4171,7 @@ M2C_UNK func_80178D40(s32 arg0, s32 arg1)
/* fallthrough */
case 0x5D:
L5D:
(*(s16*)&D_801904FC) = 3;
(*(s16*)D_801904FC) = 3;
break;
default:
break;