mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-11 03:39:59 +00:00
Merge branch 'master' of https://github.com/zeldaret/oot
This commit is contained in:
commit
febc0b4f17
2 changed files with 4 additions and 19 deletions
|
@ -58,20 +58,12 @@ void BgSpot15Saku_Destroy(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
|||
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// regalloc differences
|
||||
void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
||||
void* temp = this->unk_168;
|
||||
void* temp2 = this->unk_16C;
|
||||
|
||||
if ((temp != NULL || temp2 != NULL) && !(gSaveContext.inf_table[7] & 2)) {
|
||||
if (this->unk_168 && !(gSaveContext.inf_table[7] & 2)) {
|
||||
this->unk_17C = 2;
|
||||
this->actionFunc = func_808B4978;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s")
|
||||
#endif
|
||||
|
||||
void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
||||
Actor* thisx = &this->dyna.actor;
|
||||
|
@ -86,18 +78,12 @@ void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// single regalloc difference
|
||||
void func_808B4A04(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_17C == 0) {
|
||||
this->unk_168 = 0 & 0xFFFFFFFFFFFFFFFF;
|
||||
this->unk_16C = 0 & 0xFFFFFFFFFFFFFFFF;
|
||||
if (!this->unk_17C) {
|
||||
this->unk_168 = 0;
|
||||
this->actionFunc = func_808B4930;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s")
|
||||
#endif
|
||||
|
||||
void BgSpot15Saku_Update(BgSpot15Saku* this, GlobalContext* globalCtx) {
|
||||
DECR(this->unk_17C);
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
typedef struct {
|
||||
/* 0x0000 */ DynaPolyActor dyna;
|
||||
/* 0x0164 */ ActorFunc actionFunc;
|
||||
/* 0x0168 */ UNK_PTR unk_168;
|
||||
/* 0x016C */ UNK_PTR unk_16C;
|
||||
/* 0x0168 */ u64 unk_168;
|
||||
/* 0x0170 */ f32 unk_170;
|
||||
/* 0x0174 */ f32 unk_174;
|
||||
/* 0x0174 */ f32 unk_178;
|
||||
|
|
Loading…
Reference in a new issue