diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-09 15:39:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 15:39:35 -0800 |
| commit | 177ac7fe63c5309e3fbc02bfeba58756c188c84c (patch) | |
| tree | 935101f14edf5a5377672abfdd26a51bb5887b45 /src | |
| parent | e394539e057b5704c1d08c0f4c07161096da6992 (diff) | |
| parent | b26882d9b55d04a36746b379de1efbdf6375bb98 (diff) | |
Merge pull request #265 from nonmatch/patch-6
Diffstat (limited to 'src')
| -rw-r--r-- | src/playerItem/playerItemLantern.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/playerItem/playerItemLantern.c b/src/playerItem/playerItemLantern.c index 9bfdc127..3b7071df 100644 --- a/src/playerItem/playerItemLantern.c +++ b/src/playerItem/playerItemLantern.c @@ -12,13 +12,13 @@ void PlayerItemLantern(Entity* this) { this->bitfield = 0; } -NONMATCH("asm/non_matching/playerItemLantern/sub_08054A60.inc", void sub_08054A60(Entity* this)) { +void sub_08054A60(Entity* this) { this->flags |= 0xa0; this->action = 0x01; this->actionDelay = 0x04; this->frameIndex = -1; // TODO regalloc and mov 6 too early - this->updatePriority = (this->updatePriority & 0xf0) | 6; + this->updatePriority = 6; this->field_0x3c = 7; this->flags2 = -0x80; this->animationState = gPlayerEntity.animationState & 0xe; @@ -29,6 +29,5 @@ NONMATCH("asm/non_matching/playerItemLantern/sub_08054A60.inc", void sub_08054A6 LoadSwapGFX(this, 1, 3); sub_08054AC8(this); } -END_NONMATCH ASM_FUNC("asm/non_matching/playerItemLantern/sub_08054AC8.inc", void sub_08054AC8(Entity* this)) |