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

This commit is contained in:
Drew T
2026-08-15 00:23:53 -06:00
parent 26e1017081
commit d7c3f880ce
4 changed files with 29 additions and 11 deletions
+7
View File
@@ -14803,3 +14803,10 @@ groups:
func: DEFINE_func_8018BDA4
vram: 0x8018BDA4
binaries: [ov_SC04_018, ov_SC04_019]
- id: E_func_8018B660
tier: h_exact
hash: 92e9a1efdbf7c0262343b15f2b109aa6bd159631
source: src/shared/engine_core.h
func: DEFINE_func_8018B660
vram: 0x8018B660
binaries: [ov_SC04_018, ov_SC04_019]
+1 -10
View File
@@ -4592,16 +4592,7 @@ void func_8018B614(void *a0) {
#include "common.h"
void func_8018B660(s32 a0) {
s32 *v1;
v1 = *(s32 **)((s32)a0 + 0xCC);
*(s32 *)((s32)v1 + 0xB0) = 2;
if (func_8018B5AC() == 0) {
*(s16 *)((s32)a0 + 0x2) = 1;
}
}
DEFINE_func_8018B660() /* dedup: shared engine-core @0x8018B660 (src/shared) */
void func_8018B6A0(void *a0) {
+1 -1
View File
@@ -3998,7 +3998,7 @@ INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B5A
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B614);
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_80188E1C", func_8018B660);
DEFINE_func_8018B660() /* dedup: shared engine-core @0x8018B660 (src/shared) */
extern s32 func_8012E57C(s32 a0, s32 a1);
+20
View File
@@ -60985,6 +60985,16 @@
*(s32 *)(a0 + 0xCC) = func_8012E57C(0x61, 0xA); \
}
#define DEFINE_func_8018B660() \
void func_8018B660(s32 a0) { \
s32 *v1; \
v1 = *(s32 **)((s32)a0 + 0xCC); \
*(s32 *)((s32)v1 + 0xB0) = 2; \
if (func_8018B5AC() == 0) { \
*(s16 *)((s32)a0 + 0x2) = 1; \
} \
}
#endif
#define DEFINE_func_80128EA8() \
@@ -151375,4 +151385,14 @@
*(s32 *)(a0 + 0xCC) = func_8012E57C(0x61, 0xA); \
}
#define DEFINE_func_8018B660() \
void func_8018B660(s32 a0) { \
s32 *v1; \
v1 = *(s32 **)((s32)a0 + 0xCC); \
*(s32 *)((s32)v1 + 0xB0) = 2; \
if (func_8018B5AC() == 0) { \
*(s16 *)((s32)a0 + 0x2) = 1; \
} \
}
#endif