From c141eb1d8c0628a93f889d9dd2ddc3c90c390506 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Tue, 14 Sep 2021 08:30:39 -0400 Subject: [PATCH] Link headers, and update object types for it --- src/unknown_0348C0.c | 3 ++- src/unknown_06B2B0.c | 1 + src/unknown_0ABDF0.c | 4 ++-- src/unknown_0ABDF0.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 4e215dff..c60ca9d0 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -10,6 +10,7 @@ #include "video.h" #include "camera.h" #include "menu.h" // For cheats +#include "unknown_0ABDF0.h" /************ .data ************/ @@ -1763,7 +1764,7 @@ void func_8004092C(s32 arg0, s32 arg1) { } void func_8004094C(Object *arg0, s16 *arg1, s32 arg2) { - func_800ACF60(); + func_800ACF60(arg0); arg0->scale = arg1[4]; arg0->scale /= 40.0f; } diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 76fea608..b3a29691 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -18,6 +18,7 @@ #include "printf.h" #include "thread0_epc.h" #include "thread30.h" +#include "unknown_0ABDF0.h" /************ .rodata ************/ diff --git a/src/unknown_0ABDF0.c b/src/unknown_0ABDF0.c index dd5170fc..76fe4df7 100644 --- a/src/unknown_0ABDF0.c +++ b/src/unknown_0ABDF0.c @@ -155,7 +155,7 @@ s32 D_80127C24; s32 D_80127C28; s32 D_80127C2C; s32 D_80127C30[4]; -s32 D_80127C40[16]; +Object *D_80127C40[16]; /******************************/ @@ -190,7 +190,7 @@ void func_800AC880(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800AC8A8.s") GLOBAL_ASM("asm/non_matchings/unknown_09F8F0/func_800ACA20.s") -void func_800ACF60(s32 arg0) { +void func_800ACF60(Object *arg0) { if (D_800E2A88 < 0x10) { D_80127C40[D_800E2A88] = arg0; D_800E2A88++; diff --git a/src/unknown_0ABDF0.h b/src/unknown_0ABDF0.h index 4e7b6bac..1b8cc70f 100644 --- a/src/unknown_0ABDF0.h +++ b/src/unknown_0ABDF0.h @@ -65,7 +65,7 @@ extern u32 osTvType; void func_800AB308(s16 arg0, s16 arg1); void func_800AC880(s32 arg0); -void func_800ACF60(s32 arg0); +void func_800ACF60(Object *arg0); void func_800AD220(void); void func_800AD2C4(s32 arg0, s32 arg1, f32 arg2);