From 2c235cbf473b68b2980d0cc201eea3154bca0939 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 14 Mar 2024 21:03:47 -0400 Subject: [PATCH] progress --- decompile/buildList.txt | 1 + ghidra/232.c | 1 + ghidra/zzz_Rest_Of_94426.c | 4 +++- include/ovr_232.h | 10 ++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/decompile/buildList.txt b/decompile/buildList.txt index 1430f645..0612f290 100644 --- a/decompile/buildList.txt +++ b/decompile/buildList.txt @@ -690,6 +690,7 @@ common, exe, VehStuckProc_Tumble_Init, 0x0, General/Vehicle/VehStuckProc_Tumble_ // need VehStuckProc_Warp // need VehTalkMask +//ommon, exe, VehTalkMask_ThTick, 0x0, General/Vehicle/VehTalkMask_ThTick.c // need VehTurbo_ProcessBucket (in wip) common, exe, VehTurbo_ThTick, 0x0, General/Vehicle/VehTurbo_ThTick.c diff --git a/ghidra/232.c b/ghidra/232.c index 4114f312..304e6b4a 100644 --- a/ghidra/232.c +++ b/ghidra/232.c @@ -7296,6 +7296,7 @@ LAB_800b48dc: // AH_MaskHint_SpawnParticles FUN_800b42b4(0x18,&DAT_800b5384,0x1000); + // VehTalkMask_PlayXA FUN_800691e4(DAT_8008d860,(int)DAT_800b5558); // If you're in Adventure Arena diff --git a/ghidra/zzz_Rest_Of_94426.c b/ghidra/zzz_Rest_Of_94426.c index 64b90315..ebedcc4e 100644 --- a/ghidra/zzz_Rest_Of_94426.c +++ b/ghidra/zzz_Rest_Of_94426.c @@ -35682,6 +35682,7 @@ void FUN_80069178(void) // INSTANCE_BirthWithThread // 0x300 flag = SmallStackPool // 0xe = "aku aku" thread bucket + // 0x6 = sizeof(struct MaskHint) iVar1 = FUN_800309a4(0x39,&DAT_8008d660,0x300,0xe,FUN_80068f90,6,0); // get thread from instance @@ -35692,7 +35693,8 @@ void FUN_80069178(void) // object -> 4 *(undefined2 *)(*(int *)(iVar1 + 0x30) + 4) = 0; - return; + + return instance; } diff --git a/include/ovr_232.h b/include/ovr_232.h index f33827b2..ca751a9f 100644 --- a/include/ovr_232.h +++ b/include/ovr_232.h @@ -1,3 +1,13 @@ +#include + +struct MaskHint +{ + struct MaskHint* self; // why? + short scale; + + // end of struct +}; + struct BossGarageDoor { int direction; // 1, 0, -1