mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-09 20:11:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

name remaining entity fields

Browse Source
This commit is contained in:
theo3
2022-03-28 19:51:32 -07:00
parent 755571834d
commit 92240d4314
348 changed files with 3850 additions and 3850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item/itemMoleMitts.c
+3 -3
View File
@@ -72,8 +72,8 @@ void sub_080771C8(ItemBehavior* this, u32 idx) {
if (this->field_0x5[3] != 0xff) {
object = CreateObjectWithParent(&gPlayerEntity, 0x1f, 0, this->field_0x2[1]);
if (object != NULL) {
object->actionDelay = this->field_0x5[2];
object->field_0xf = this->field_0x5[3];
object->timer = this->field_0x5[2];
object->subtimer = this->field_0x5[3];
object->animationState = gPlayerEntity.animationState & 6;
gPlayerEntity.frame = 0;
gPlayerEntity.frameDuration = gUnk_0811BE14[this->field_0x5[3]];
@@ -138,7 +138,7 @@ void sub_080772A8(ItemBehavior* this, u32 idx) {
if (effect != NULL) {
effect->animationState = this->field_0x5[5];
effect->spritePriority.b0 = gPlayerEntity.spritePriority.b0 - 1;
effect->field_0xf = 1;
effect->subtimer = 1;
}
this->stateID = 3;
this->field_0x5[0] = 1;
src/item/itemTryPickupObject.c
+2 -2
View File
@@ -23,7 +23,7 @@ void ItemPickupCheck(ItemBehavior* this, u32 idx) {
switch (sub_080789A8()) {
case 2:
if (((gCarriedEntity.unk_8)->field_0x16 & 0xf) == 0) {
if (((gCarriedEntity.unk_8)->carryFlags & 0xf) == 0) {
sub_08076088(this, gCarriedEntity.unk_8, idx);
return;
}
@@ -75,7 +75,7 @@ void sub_08076488(ItemBehavior* this, u32 idx) {
if (this->field_0x5[2] == 0) {
if (PlayerTryDropObject(this, idx) != 0) {
if ((((this->field_0x18->field_0x16) & 0xf0) == 0x10) && ((gRoomTransition.frameCount & 1U) != 0)) {
if ((((this->field_0x18->carryFlags) & 0xf0) == 0x10) && ((gRoomTransition.frameCount & 1U) != 0)) {
return;
}
UpdateItemAnim(this);