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

Merge pull request #688 from KEKW555/KEKW555-patch-2

This commit is contained in:
Theo 2024-01-21 00:19:51 -08:00 committed by GitHub
parent a804fd336f 12f51699d4
commit eaaeb3a617
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/playerUtils.c
View File

@ -1179,9 +1179,29 @@ void ResetPossibleInteraction(void) {
gPossibleInteraction.currentObject = (InteractableObject*)&gNoInteraction; gPossibleInteraction.currentObject = (InteractableObject*)&gNoInteraction;
} }
static inline bool32 InlinePlayerStateCheck() {
u8 frameState;
if ((gPlayerState.field_0x27[0] | gPlayerState.swim_state) != 0) {
return TRUE;
}
if (gPlayerState.framestate == 0) {
frameState = gPlayerState.framestate_last;
} else {
frameState = gPlayerState.framestate;
}
switch (frameState) {
case PL_STATE_SWORD:
case PL_STATE_GUSTJAR:
case PL_STATE_DIE:
case PL_STATE_ITEMGET:
case PL_STATE_DROWN:
return TRUE;
}
return FALSE;
}
// determines which (if any) object the player is currently able to interact with // determines which (if any) object the player is currently able to interact with
InteractableObject* sub_080784E4(void) { InteractableObject* sub_080784E4(void) {
u8 frameState;
PlayerFlags r7; PlayerFlags r7;
s32 r3; s32 r3;
PlayerFlags PVar4; PlayerFlags PVar4;
@ -1198,26 +1218,12 @@ InteractableObject* sub_080784E4(void) {
if (gPossibleInteraction.isUpdated != 0) { if (gPossibleInteraction.isUpdated != 0) {
return gPossibleInteraction.currentObject; return gPossibleInteraction.currentObject;
} }
if ((gPlayerState.field_0x27[0] | gPlayerState.swim_state) != 0) {
goto l;
}
if (gPlayerState.framestate == 0) { if (InlinePlayerStateCheck()) {
frameState = gPlayerState.framestate_last; gPossibleInteraction.currentIndex = 0xFF;
} else { gPossibleInteraction.currentObject = (InteractableObject*)&gNoInteraction;
frameState = gPlayerState.framestate; gPossibleInteraction.isUpdated = 1;
} return gPossibleInteraction.currentObject;
switch (frameState) {
case PL_STATE_SWORD:
case PL_STATE_GUSTJAR:
case PL_STATE_DIE:
case PL_STATE_ITEMGET:
case PL_STATE_DROWN:
l:
gPossibleInteraction.currentIndex = 0xFF;
gPossibleInteraction.currentObject = (InteractableObject*)&gNoInteraction;
gPossibleInteraction.isUpdated = 1;
return gPossibleInteraction.currentObject;
} }
if (!(gPlayerState.flags & PL_MINISH)) { if (!(gPlayerState.flags & PL_MINISH)) {