mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-20 14:15:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document various fields

Browse Source
This commit is contained in:
Tal Hayon
2022-07-29 20:58:24 +03:00
parent b6c1671203
commit 3a151b343d
24 changed files with 205 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/bakerOven.c
+3 -3
View File
@@ -58,12 +58,12 @@ void BakerOven_Action1(Entity* this) {
if (this->type) {
GetNextFrame(this);
frames = &this->frame;
if (*frames & 1) {
*frames &= 0xfe;
if (this->frame & 1) {
this->frame &= ~1;
this->y.HALF.HI++;
}
if ((*frames & 0x80) && this->frameDuration == 1) {
if ((*frames & ANIM_DONE) && this->frameDuration == 1) {
this->action = 2;
this->spriteSettings.draw = 0;
}
src/object/cutsceneMiscObject.c
+3 -3
View File
@@ -418,12 +418,12 @@ void sub_08094FA8(CutsceneMiscObjectEntity* this) {
super->action = 4;
#ifndef EU
if (!CheckGlobalFlag(BIN_DOGFOOD)) {
CreateItemEntity(0x1c, 0, 0);
CreateItemEntity(ITEM_BOTTLE1, 0, 0);
SetGlobalFlag(BIN_DOGFOOD);
super->timer = 60;
}
#else
CreateItemEntity(0x1c, 0, 0);
CreateItemEntity(ITEM_BOTTLE1, 0, 0);
#endif
}
break;
@@ -459,7 +459,7 @@ void sub_08095088(CutsceneMiscObjectEntity* this) {
break;
case 2:
if ((gMessage.doTextBox & 0x7F) == 0) {
CreateItemEntity(0x5b, 0, 0);
CreateItemEntity(ITEM_JABBERNUT, 0, 0);
DeleteThisEntity();
}
break;
src/object/heartContainer.c
+1 -1
View File
@@ -68,7 +68,7 @@ static void HeartContainer_Action3(Entity* this) {
sub_08080CB4(this);
if (!(gPlayerState.flags & PL_MINISH) && IsCollidingPlayer(this)) {
SetFlag(this->cutsceneBeh.HWORD);
CreateItemEntity(0x62, 0, 0);
CreateItemEntity(ITEM_HEART_CONTAINER, 0, 0);
DeleteThisEntity();
}
}
src/object/lavaPlatform.c
+3 -3
View File
@@ -141,7 +141,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
super->action = 3;
super->flags &= ~ENT_COLLIDE;
super->timer = 20;
gPlayerState.field_0x3f = 0xfd;
gPlayerState.spriteOffsetY = -3;
}
}
}
@@ -149,7 +149,7 @@ void LavaPlatform_Type1Action2(LavaPlatformEntity* this) {
/** Player is standing on the platform. */
void LavaPlatform_Type1Action3(LavaPlatformEntity* this) {
if (LavaPlatform_IsPlayerOnPlatform(this)) {
gPlayerState.field_0x3f = 0xfd;
gPlayerState.spriteOffsetY = -3;
}
if (--super->timer == 0) {
super->action = 4;
@@ -219,7 +219,7 @@ void LavaPlatform_Type1Action6(LavaPlatformEntity* this) {
if ((super->frame & ANIM_DONE) != 0) {
sub_0809264C(this);
if (tmp) {
gPlayerState.field_0x3f = 0xfd;
gPlayerState.spriteOffsetY = -3;
}
}
}
src/object/object1F.c
+1 -1
View File
@@ -69,7 +69,7 @@ void Object1F_Action1(Object1FEntity* this) {
if (this->unk6c) {
this->unk6c--;
uVar1 = gPlayerState.field_0x3c[1];
uVar1 = gPlayerState.moleMittsState;
} else {
ProcessMovement2(super);
uVar1 = GravityUpdate(super, Q_8_8(40.0));
src/object/whirlwind.c
+1 -1
View File
@@ -61,7 +61,7 @@ void Whirlwind_Action1(Entity* this) {
}
if (this->spriteSettings.draw != 0) {
GetNextFrame(this);
if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c[0] == 0)) &&
if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c == 0)) &&
((gPlayerEntity.action == 4 || ((gPlayerEntity.flags & ENT_COLLIDE) != 0)))) &&
((gPlayerEntity.action != 6 && (sub_0800419C(this, &gPlayerEntity, 0xc, 0xc) != 0)))) {
if (((gPlayerState.flags & PL_PARACHUTE) == 0) && (gPlayerEntity.action != 4)) {