From 234e9463f8c6d60fca7afa6c677b739418396f06 Mon Sep 17 00:00:00 2001 From: Mittenz Date: Tue, 25 Aug 2020 00:37:33 -0500 Subject: [PATCH] c: func_80012CE8 --- include/structs.h | 2 +- src/unknown_00BC20.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/structs.h b/include/structs.h index c684ef3b..00a9b503 100644 --- a/include/structs.h +++ b/include/structs.h @@ -225,7 +225,7 @@ typedef struct Player_40 { u8 pad10[0x43]; s8 unk53; s8 unk54; - s8 unk55; + s8 unk55; //size of array pointed by Player->unk68 u8 pad56[0x02]; u8 pad58[0x18]; u8 unk70; diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index fbf5bedb..57639ede 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -832,7 +832,13 @@ void func_80012C30(void) { D_8011ADA4 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012C3C.s") +void func_80012C3C(Gfx** dlist){ + s32 i; + Gfx *tmp; + for(i = 0; iunk6 & 0x8000) == 0 - && currObj->descriptor_ptr->unk53 == 0 - ){ + if( (currObj->unk6 & 0x8000) == 0 && currObj->descriptor_ptr->unk53 == 0){ for(j=0; jdescriptor_ptr->unk55; j++){ curr_68 = currObj->unk68[j]; if( curr_68 != NULL && curr_68->unk20 > 0){