diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 18 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b0a92b62e..2ceef0159 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -242,8 +242,8 @@ void Actor_TitleCardContextInit(GlobalContext* globalCtx, TitleCardContext* titl titleCardCtx->alpha = 0; } -void Actor_TitleCardCreate(GlobalContext* globalCtx, TitleCardContext* titleCardCtx, u32 texture, s16 param_4, s16 param_5, - u8 param_6, u8 param_7) { +void Actor_TitleCardCreate(GlobalContext* globalCtx, TitleCardContext* titleCardCtx, u32 texture, s16 param_4, + s16 param_5, u8 param_6, u8 param_7) { titleCardCtx->texture = texture; titleCardCtx->unk4 = param_4; titleCardCtx->unk6 = param_5; @@ -568,7 +568,7 @@ s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7678.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B78B8.asm") +#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//Actor_UpdateBgCheckInfo.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B7E04.asm") @@ -624,9 +624,9 @@ s32 Actor_IsActorFacingActorAndWithinRange(Actor* actor, Actor* other, f32 range u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { if (actor->parent != NULL) { - return 1; + return true; } else { - return 0; + return false; } } @@ -638,7 +638,13 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BD0.asm") -#pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8BFC.asm") +s32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx) { + if (!actor->parent) { + return true; + } else { + return false; + } +} #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800B8C20.asm") diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index bffd14ba2..b0c0eda13 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -461,7 +461,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.gravity != 0.0f) { Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); - func_800B78B8(globalCtx, &this->actor, 20.0f, 15.0f, 15.0f, 0x1D); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 15.0f, 15.0f, 0x1D); if (this->actor.floorHeight <= -32000.0f) { Actor_MarkForDeath(&this->actor); |