From 434d8c0976a409420a4fec00dd3ad425da27df7a Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Tue, 25 Aug 2026 17:41:12 -0600 Subject: [PATCH] =?UTF-8?q?feat(decomp):=20ox=20wave=20em=20overlays=20?= =?UTF-8?q?=E2=80=94=201=20banked?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Committed before the main batch: gate_main reverts on failure and would take these with it. --- src/md_MAIN_019/md_MAIN_019.c | 37 ++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/md_MAIN_019/md_MAIN_019.c b/src/md_MAIN_019/md_MAIN_019.c index e5e6ea470..3ec850239 100644 --- a/src/md_MAIN_019/md_MAIN_019.c +++ b/src/md_MAIN_019/md_MAIN_019.c @@ -467,7 +467,42 @@ void func_800CBD0C(void *arg0) { } -INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBD68); +void func_800CBD68(s32 a0) { + extern s32 D_800CC830; + extern s32 D_800CC834; + extern void func_80146578(void); + extern void func_8001CD9C(s32 a0, s32 a1); + extern void func_800233CC(void *a0, u16 a1); + extern void func_800CBF80(void *a0); + extern void func_80149374(s32 a0, s32 a1); + extern void func_800D1FC8(void *a0, s32 a1); + extern void func_80146CA0(void *a0); + extern void func_80162CCC_w19(void *a0) __asm__("func_80162CCC"); + + s32 iVar1; + s32 iVar2; + void *ptr; + + iVar1 = *(s32 *)(a0 + 0x4C); + iVar2 = ((s32 (*)(void))func_80146578)(); + ptr = &D_800CC830; + *(s32 *)(a0 + 0x20) = iVar2; + if (iVar2 != 0) { + func_8001CD9C(iVar2, (s32)ptr); + func_800233CC(ptr, 0x60); + *(u16 *)(iVar2 + 0x1A) = 0x3000; + *(u16 *)(iVar2 + 0x18) = 0x3000; + D_800CC834 = 0; + func_800CBF80((void *)a0); + *(s32 *)(iVar2 + 4) = *(s32 *)(iVar2 + 4) | 0x50000000; + func_80149374(iVar1, a0 + 4); + func_800D1FC8((void *)a0, 6); + func_80146CA0((void *)a0); + } else { + func_80162CCC_w19((void *)a0); + } +} + extern void func_800CBF80(void *a0); extern void func_80146E90(s32 *a0, s32 a1);