mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-09-26 21:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(phase-31): propagate func_80183814 (gate lane)

Browse Source
This commit is contained in:
Drew T
2026-08-15 08:05:40 -06:00
parent 58b0547859
commit 62bda0dc38
4 changed files with 135 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/dedup.us.yaml
+7
View File
@@ -14971,3 +14971,10 @@ groups:
func: DEFINE_func_80186424
vram: 0x80186424
binaries: [ov_SC02_000, ov_SC02_003]
- id: E_func_80183814
tier: h_exact
hash: 7a31a7eddbb172b8c3239b58061f746ce286b5e2
source: src/shared/engine_core.h
func: DEFINE_func_80183814
vram: 0x80183814
binaries: [ov_SC02_000, ov_SC02_003]
src/ov_SC02_000/ov_SC02_000_jr_8018173C.c
+1 -68
View File
@@ -3309,74 +3309,7 @@ void func_80183754(s32 *a0) {
#include "common.h"
extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3);
extern s32 func_80171CC4(void *a0, void *a1);
extern void func_80181D0C(void);
extern void func_80181C10(void);
extern void func_80175414(s32 _arg0);
extern void func_801839C4(void *a0);
extern void func_80183BA4(void *a0);
extern void func_80183C9C(s32 a0);
extern void func_800D1724(s32 a0);
extern s16 D_800B9AAC[];
extern s16 D_801274E8;
extern u8 D_8018EDC8[];
extern u8 D_8018EA48[];
extern s32 D_801E8770;
void func_80183814(void *a0_) {
register void *a0 __asm__("$17") = a0_;
s16 state;
s16 v;
state = *(s16 *)((s32)a0 + 0xE);
if (state >= 0x1391) {
*(u16 *)((s32)a0 + 0xAE) = 0x8080;
*(u16 *)((s32)a0 + 0xAA) &= 0x5FBF;
*(u16 *)((s32)a0 + 0xAC) &= 0x5FBF;
func_80171CC4(a0, D_8018EDC8);
D_801274E8 = *(u16 *)((s32)a0 + 0x6);
} else if (state < -0x1700) {
s16 *p = &D_801274E8;
*p = (s16)func_80012F74(*p, 0, 10, 1);
}
switch (*(s32 *)((s32)a0 + 0x208)) {
case 0:
if (*(s16 *)((s32)a0 + 0xE) < 0x1700) {
func_80181D0C();
*(s32 *)((s32)a0 + 0x208) += 1;
}
break;
case 1:
if (*(s16 *)((s32)a0 + 0xE) < 0x1380) {
func_80181C10();
*(s32 *)((s32)a0 + 0x208) += 1;
((void (*)(void))func_80175414)();
}
break;
}
if (*(s32 *)((s32)a0 + 0x204) != 0) {
*(s32 *)((s32)a0 + 0x204) -= 1;
return;
}
func_801839C4(a0);
func_80183BA4(a0);
func_80183C9C((s32)a0);
if ((u32)(*(u16 *)((s32)a0 + 0xE) - 1) < 0xEFF) {
D_800B9AAC[0] = 0x7FFF;
}
v = *(s16 *)((s32)a0 + 0xE);
if (v < 0 && v < -0x1950) {
if (D_801E8770 != 0) {
func_800D1724((s32)D_8018EA48);
}
}
}
DEFINE_func_80183814() /* dedup: shared engine-core @0x80183814 (src/shared) */
void func_801839C4(void *a0) {
src/ov_SC02_003/ov_SC02_003_jr_8018173C.c
+1 -1
View File
@@ -3064,7 +3064,7 @@ void func_80183718(void *a0) {
INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80183754);
INCLUDE_ASM("asm/ov_SC02_003/nonmatchings/ov_SC02_003_jr_8018173C", func_80183814);
DEFINE_func_80183814() /* dedup: shared engine-core @0x80183814 (src/shared) */
void func_801839C4(void *a0) {
src/shared/engine_core.h
+126
View File
@@ -61651,6 +61651,69 @@
D_801E8278 = vec.c; \
}
#define DEFINE_func_80183814() \
extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); \
extern s32 func_80171CC4(void *a0, void *a1); \
extern void func_80181D0C(void); \
extern void func_80181C10(void); \
extern void func_80175414(s32 _arg0); \
extern void func_801839C4(void *a0); \
extern void func_80183BA4(void *a0); \
extern void func_80183C9C(s32 a0); \
extern void func_800D1724(s32 a0); \
extern s16 D_800B9AAC[]; \
extern s16 D_801274E8; \
extern u8 D_8018EDC8[]; \
extern u8 D_8018EA48[]; \
extern s32 D_801E8770; \
void func_80183814(void *a0_) { \
register void *a0 __asm__("$17") = a0_; \
s16 state; \
s16 v; \
state = *(s16 *)((s32)a0 + 0xE); \
if (state >= 0x1391) { \
*(u16 *)((s32)a0 + 0xAE) = 0x8080; \
*(u16 *)((s32)a0 + 0xAA) &= 0x5FBF; \
*(u16 *)((s32)a0 + 0xAC) &= 0x5FBF; \
func_80171CC4(a0, D_8018EDC8); \
D_801274E8 = *(u16 *)((s32)a0 + 0x6); \
} else if (state < -0x1700) { \
s16 *p = &D_801274E8; \
*p = (s16)func_80012F74(*p, 0, 10, 1); \
} \
switch (*(s32 *)((s32)a0 + 0x208)) { \
case 0: \
if (*(s16 *)((s32)a0 + 0xE) < 0x1700) { \
func_80181D0C(); \
*(s32 *)((s32)a0 + 0x208) += 1; \
} \
break; \
case 1: \
if (*(s16 *)((s32)a0 + 0xE) < 0x1380) { \
func_80181C10(); \
*(s32 *)((s32)a0 + 0x208) += 1; \
((void (*)(void))func_80175414)(); \
} \
break; \
} \
if (*(s32 *)((s32)a0 + 0x204) != 0) { \
*(s32 *)((s32)a0 + 0x204) -= 1; \
return; \
} \
func_801839C4(a0); \
func_80183BA4(a0); \
func_80183C9C((s32)a0); \
if ((u32)(*(u16 *)((s32)a0 + 0xE) - 1) < 0xEFF) { \
D_800B9AAC[0] = 0x7FFF; \
} \
v = *(s16 *)((s32)a0 + 0xE); \
if (v < 0 && v < -0x1950) { \
if (D_801E8770 != 0) { \
func_800D1724((s32)D_8018EA48); \
} \
} \
}
#endif
#define DEFINE_func_80128EA8() \
@@ -152707,4 +152770,67 @@
D_801E8278 = vec.c; \
}
#define DEFINE_func_80183814() \
extern s32 func_80012F74(s32 a0, s32 a1, s32 a2, s32 a3); \
extern s32 func_80171CC4(void *a0, void *a1); \
extern void func_80181D0C(void); \
extern void func_80181C10(void); \
extern void func_80175414(s32 _arg0); \
extern void func_801839C4(void *a0); \
extern void func_80183BA4(void *a0); \
extern void func_80183C9C(s32 a0); \
extern void func_800D1724(s32 a0); \
extern s16 D_800B9AAC[]; \
extern s16 D_801274E8; \
extern u8 D_8018EDC8[]; \
extern u8 D_8018EA48[]; \
extern s32 D_801E8770; \
void func_80183814(void *a0_) { \
register void *a0 __asm__("$17") = a0_; \
s16 state; \
s16 v; \
state = *(s16 *)((s32)a0 + 0xE); \
if (state >= 0x1391) { \
*(u16 *)((s32)a0 + 0xAE) = 0x8080; \
*(u16 *)((s32)a0 + 0xAA) &= 0x5FBF; \
*(u16 *)((s32)a0 + 0xAC) &= 0x5FBF; \
func_80171CC4(a0, D_8018EDC8); \
D_801274E8 = *(u16 *)((s32)a0 + 0x6); \
} else if (state < -0x1700) { \
s16 *p = &D_801274E8; \
*p = (s16)func_80012F74(*p, 0, 10, 1); \
} \
switch (*(s32 *)((s32)a0 + 0x208)) { \
case 0: \
if (*(s16 *)((s32)a0 + 0xE) < 0x1700) { \
func_80181D0C(); \
*(s32 *)((s32)a0 + 0x208) += 1; \
} \
break; \
case 1: \
if (*(s16 *)((s32)a0 + 0xE) < 0x1380) { \
func_80181C10(); \
*(s32 *)((s32)a0 + 0x208) += 1; \
((void (*)(void))func_80175414)(); \
} \
break; \
} \
if (*(s32 *)((s32)a0 + 0x204) != 0) { \
*(s32 *)((s32)a0 + 0x204) -= 1; \
return; \
} \
func_801839C4(a0); \
func_80183BA4(a0); \
func_80183C9C((s32)a0); \
if ((u32)(*(u16 *)((s32)a0 + 0xE) - 1) < 0xEFF) { \
D_800B9AAC[0] = 0x7FFF; \
} \
v = *(s16 *)((s32)a0 + 0xE); \
if (v < 0 && v < -0x1950) { \
if (D_801E8770 != 0) { \
func_800D1724((s32)D_8018EA48); \
} \
} \
}
#endif