mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Match en_elf func_80A0461C (#774)

Browse source
This commit is contained in:
Synray 2021-04-13 10:33:14 -07:00 • committed by GitHub
parent e3c1b52887
commit c3880c5c99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -1053,8 +1053,6 @@ void func_80A04414(EnElf* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// useless branch near case 11/default in the switch for this->unk_2A8
void func_80A0461C(EnElf* this, GlobalContext* globalCtx) {
s32 temp;
Actor* arrowPointedActor;
@ -1087,7 +1085,7 @@ void func_80A0461C(EnElf* this, GlobalContext* globalCtx) {
if ((player->stateFlags1 & 0x400) || ((YREG(15) & 0x10) && func_800BC56C(globalCtx, 2))) {
temp = 12;
this->unk_2C0 = 100;
} else if ((arrowPointedActor == NULL) || (temp = 1, (arrowPointedActor->category == ACTORCAT_NPC))) {
} else if (arrowPointedActor == NULL || arrowPointedActor->category == ACTORCAT_NPC) {
if (arrowPointedActor != NULL) {
this->unk_2C0 = 100;
player->stateFlags2 |= 0x100000;
@ -1135,6 +1133,8 @@ void func_80A0461C(EnElf* this, GlobalContext* globalCtx) {
break;
}
}
} else {
temp = 1;
}
switch (temp) {
@ -1174,9 +1174,6 @@ void func_80A0461C(EnElf* this, GlobalContext* globalCtx) {
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s")
#endif
void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife) {
static Vec3f sparkleVelocity = { 0.0f, -0.05f, 0.0f };