mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-09-30 07:31:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(decomp): ox wave dk overlays — 2 banked

Browse Source 
Committed before the main batch: gate_main reverts on failure and would take these with it.
This commit is contained in:
Drew T
2026-08-25 12:37:47 -06:00
parent c95dde87a8
commit 7891069c4b
4 changed files with 78 additions and 5080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/overlays.mk
-5077
View File
File diff suppressed because it is too large Load Diff
src/md_SC05_029/md_SC05_029.c
+56 -1
View File
@@ -305,7 +305,62 @@ void func_801EE10C(void) {
void func_801EE114(void) {
}
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EE11C);
extern u8 *D_80126B10;
extern s32 func_801789AC(s32 arg0);
extern void func_80178CBC(s32 a0, s32 a1);
extern void func_80174438(s32 a0);
extern void func_800D1724(void *);
extern s32 func_80186150();
extern void func_80186160(s32 a0);
void func_801EE11C(void *a0) {
extern s32 D_801EE5A0;
extern s32 D_801EE604;
extern s32 D_801EE61C;
extern s32 D_800D39CC;
switch (*(u16 *)((s32)a0 + 0x34)) {
case 0: {
s32 v1 = func_801789AC((s32)a0);
switch (v1) {
case 1:
*(u16 *)((s32)a0 + 0x34) = 2;
func_80186160(5);
break;
case 2:
func_80178CBC((s32)a0, (s32)&D_801EE604);
*(u16 *)((s32)a0 + 0x34) = 0;
break;
case 3:
func_80178CBC((s32)a0, (s32)&D_801EE61C);
*(u16 *)((s32)a0 + 0x34) = 3;
break;
}
break;
}
case 1:
break;
case 2: {
s32 v0 = func_80186150();
if ((v0 << 16) != 0) {
func_800D1724((void *)&D_800D39CC);
*(u16 *)((s32)a0 + 0x34) = 1;
} else {
func_80178CBC((s32)a0, (s32)&D_801EE5A0);
*(u16 *)((s32)a0 + 0x34) = 0;
}
break;
}
case 3:
if (func_801789AC((s32)a0) != 0) {
func_80174438((s32)D_80126B10);
*(u16 *)((s32)a0 + 0x34) = 1;
}
break;
}
}
src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c
+9 -1
View File
@@ -3549,7 +3549,15 @@ extern s32 func_80171990(u8 *a0);
}
INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_8017BE9C", func_8017D8DC);
extern void func_800D1724(s32 a0);
extern void func_80171928(void *a0);
void func_8017D8DC(s32 a0) {
extern void (*D_80182050[])(void);
func_800D1724((s32)D_80182050);
func_80171928((void *)a0);
}
INCLUDE_ASM("asm/ov_SC01_074/nonmatchings/ov_SC01_074_jr_8017BE9C", func_8017D918);
src/ov_SC02_005/ov_SC02_005_jr_80181D30.c
+13 -1
View File
@@ -8674,7 +8674,19 @@ void func_8018B6E8(s32 param_1) {
}
INCLUDE_ASM("asm/ov_SC02_005/nonmatchings/ov_SC02_005_jr_80181D30", func_8018B7A4);
extern s32 func_80128ED8(s32, s32*);
extern void func_801292C8(u8*);
void func_8018B7A4(s32 param_1)
{
if (func_80128ED8(*(s32 *)(param_1 + 0x20), (s32 *)(param_1 + 0x24)) != 0) {
if (*(s32 *)(param_1 + 0x2C) != 0) {
*(s16 *)(*(s32 *)(param_1 + 0x2C) + 0xFC) = 1;
}
func_801292C8((u8 *)param_1);
}
}
#include "common.h"