diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2021-11-03 10:56:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 14:56:12 -0300 |
| commit | 8250fd0941b3227d64aa4de253c96e7b9ed902ba (patch) | |
| tree | 309ce2d241d43802d46f43e631c26874e5314ee2 /src/code | |
| parent | b3438c85136bc3448cb29517662e685a2ca56139 (diff) | |
Match EnItem00_Update (#381)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_en_item00.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 7d4c050d4..c55bab0e1 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -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) { EnItem00* this = THIS; s32 pad; Player* player = GET_PLAYER(globalCtx); s32 sp38 = player->stateFlags3 & 0x1000; s32 getItemId = GI_NONE; - s32 pad2; + s32 params; if (this->unk152 > 0) { this->unk152--; @@ -471,8 +469,8 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); - if ((this->actor.params == ITEM00_SHIELD_HERO) || (this->actor.params == ITEM00_MAP) || - (this->actor.params == ITEM00_COMPASS)) { + params = this->actor.params; + 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); } @@ -622,9 +620,6 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk14A = 0; 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_DrawSprite(EnItem00* this, GlobalContext* globalCtx); |