mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 15:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from nonmatch/patch-6

Browse Source
This commit is contained in:
notyourav
2022-01-09 15:39:35 -08:00
committed by GitHub
parent e394539e05 b26882d9b5
commit 177ac7fe63
2 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItemLantern.c
+2 -3
View File
@@ -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))