falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #331 from hatal175/framestate

This commit is contained in:
notyourav 2022-01-29 11:26:17 -08:00 committed by GitHub
parent f610f3f4e8 3c2b1d5522
commit d34aa9166f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/lilypadLarge.c
View File

@ -228,7 +228,7 @@ void sub_08085D10(LilypadLargeEntity* this) {
} }
void sub_08085D28(LilypadLargeEntity* this) { void sub_08085D28(LilypadLargeEntity* this) {
if (((gPlayerState.framestate != 0x13) && ((gPlayerState.flags & 2) != 0)) && if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & 2) != 0)) &&
(sub_080002B4(super, 0, 0x18) == 0x11)) { (sub_080002B4(super, 0, 0x18) == 0x11)) {
super->action = 2; super->action = 2;
super->subAction = 0; super->subAction = 0;
@ -240,7 +240,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
u32 r4; // horizontal direction? u32 r4; // horizontal direction?
u32 r6; // vertical direction? u32 r6; // vertical direction?
if ((gPlayerState.flags & 2) != 0) { if ((gPlayerState.flags & 2) != 0) {
if (gPlayerState.framestate != 0x12) { if (gPlayerState.framestate != PL_STATE_DIE) {
if (gPlayerState.jump_status == 0) { if (gPlayerState.jump_status == 0) {
if ((super->direction & 7) == 0) { // North or South if ((super->direction & 7) == 0) { // North or South
r4 = super->direction; r4 = super->direction;

2
src/object/pullableLever.c
View File

@ -124,7 +124,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) {
super->field_0xf = 2; super->field_0xf = 2;
} }
if (player->animationState >> 1 == super->type2) { if (player->animationState >> 1 == super->type2) {
if (gPlayerState.framestate == 0x1a) { if (gPlayerState.framestate == PL_STATE_PULL) {
if (gPlayerState.heldObject & 2) { if (gPlayerState.heldObject & 2) {
if (gPlayerEntity.frame & 2) { if (gPlayerEntity.frame & 2) {
sub_0809153C(this); sub_0809153C(this);

2
src/respawnPlayer.c
View File

@ -31,7 +31,7 @@ void ResetPlayer() {
case 2: case 2:
case 3: case 3:
case 4: { case 4: {
gPlayerState.framestate = 0; gPlayerState.framestate = PL_STATE_IDLE;
break; break;
} }
} }