mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-29 01:02:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Henny022p
2022-01-31 17:30:51 +01:00
parent 9b60d9c5e2 2b8d880ffc
commit 2a53ee4bf2
545 changed files with 17306 additions and 89017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItem13.c
+1 -1
View File
@@ -20,7 +20,7 @@ ASM_FUNC("asm/non_matching/playerItem13/sub_080AD27C.inc", void sub_080AD27C(Ent
bool32 sub_080AD32C(Entity* this) {
bool32 result = FALSE;
if (((this->field_0x16 & 0xf0) == 0x10) || ((this->kind == 6 && ((this->id == 5 || (this->id == 0x7d)))))) {
if (((this->field_0x16 & 0xf0) == 0x10) || ((this->kind == OBJECT && ((this->id == 5 || (this->id == 0x7d)))))) {
result = TRUE;
}
return result;
src/playerItem/playerItem3.c
+1 -5
View File
@@ -23,15 +23,11 @@ void PlayerItem3(Entity* this) {
this->field_0xf--;
if ((this->field_0xf & 0xf) == 0) {
EnqueueSFX(0xfb);
EnqueueSFX(SFX_FB);
}
}
#ifdef EU
ASM_FUNC("asm/non_matching/eu/sub_0801B4C8.inc", void sub_0801B4C8(Entity* this))
#else
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B4C8.inc", void sub_0801B4C8(Entity* this))
#endif
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B584.inc", void sub_0801B584(Entity* this))
src/playerItem/playerItemC.c
+2 -2
View File
@@ -19,7 +19,7 @@ void PlayerItemC(Entity* this) {
void sub_0801B8B0(Entity* this) {
if (gPlayerState.dash_state != 0) {
gPlayerState.item = this;
this->flags |= 0x20;
this->flags |= ENT_PERSIST;
this->action = 0x01;
this->flags2 = 8;
LoadSwapGFX(this, 1, 3);
@@ -41,7 +41,7 @@ void sub_0801B8FC(Entity* this) {
gPlayerState.item = NULL;
DeleteThisEntity();
} else {
pbVar1->flags |= 0x80;
pbVar1->flags |= ENT_COLLIDE;
pbVar1->field_0x3c = 0x21;
sub_0801B938(pbVar1);
}
src/playerItem/playerItemLantern.c
+1 -1
View File
@@ -13,7 +13,7 @@ void PlayerItemLantern(Entity* this) {
}
void sub_08054A60(Entity* this) {
this->flags |= 0xa0;
this->flags |= (ENT_PERSIST | ENT_COLLIDE);
this->action = 0x01;
this->actionDelay = 0x04;
this->frameIndex = -1;