falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match EnItem00_Update (#381)

This commit is contained in:
Tom Overton 2021-11-03 10:56:12 -07:00 committed by GitHub
parent b3438c8513
commit 8250fd0941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/code/z_en_item00.c
View File

@ -434,15 +434,13 @@ void func_800A6A40(EnItem00* this, GlobalContext* globalCtx) {
} }
} }
#ifdef NON_MATCHING
// Minor regalloc issue where it uses v1 instead of v0
void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = THIS; EnItem00* this = THIS;
s32 pad; s32 pad;
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
s32 sp38 = player->stateFlags3 & 0x1000; s32 sp38 = player->stateFlags3 & 0x1000;
s32 getItemId = GI_NONE; s32 getItemId = GI_NONE;
s32 pad2; s32 params;
if (this->unk152 > 0) { if (this->unk152 > 0) {
this->unk152--; this->unk152--;
@ -471,8 +469,8 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider); Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if ((this->actor.params == ITEM00_SHIELD_HERO) || (this->actor.params == ITEM00_MAP) || params = this->actor.params;
(this->actor.params == ITEM00_COMPASS)) { if ((params == ITEM00_SHIELD_HERO) || (params == ITEM00_MAP) || (params == ITEM00_COMPASS)) {
this->actor.shape.yOffset = fabsf(Math_CosS(this->actor.shape.rot.x) * 37.0f); this->actor.shape.yOffset = fabsf(Math_CosS(this->actor.shape.rot.x) * 37.0f);
} }
@ -622,9 +620,6 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
this->unk14A = 0; this->unk14A = 0;
this->actionFunc = func_800A6A40; this->actionFunc = func_800A6A40;
} }
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/EnItem00_Update.s")
#endif
void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx); void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx);
void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx); void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx);