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

Name sub_08078180

This commit is contained in:
Catobat 2023-04-30 20:21:45 +02:00
parent b4995417d3
commit 4fd83717cd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/player.h
View File

@ -12,7 +12,7 @@ enum PlayerActions {
PLAYER_JUMP, PLAYER_JUMP,
PLAYER_PUSH, PLAYER_PUSH,
PLAYER_BOUNCE, PLAYER_BOUNCE,
PLAYER_08070E9C, // sub_080782C0, only when PLAYER_INPUT_1000 is newInput PLAYER_08070E9C, // sub_080782C0, only when pressing L to start a Kinstone Fusion
PLAYER_ITEMGET, PLAYER_ITEMGET,
PLAYER_MINISH, PLAYER_MINISH,
PLAYER_MINISHDIE, PLAYER_MINISHDIE,
@ -534,7 +534,7 @@ bool32 IsItemActive(ItemBehavior*);
bool32 IsItemActivatedThisFrame(ItemBehavior*); bool32 IsItemActivatedThisFrame(ItemBehavior*);
bool32 IsItemActiveByInput(ItemBehavior*, PlayerInputState); bool32 IsItemActiveByInput(ItemBehavior*, PlayerInputState);
bool32 sub_08077FEC(u32); bool32 sub_08077FEC(u32);
void sub_08078180(void); void DetermineRButtonInteraction(void);
void ResetPossibleInteraction(); void ResetPossibleInteraction();
void AddInteractableFuser(Entity*, u32); void AddInteractableFuser(Entity*, u32);
void AddInteractableSmallKeyLock(Entity*); void AddInteractableSmallKeyLock(Entity*);

2
src/interrupts.c
View File

@ -325,7 +325,7 @@ static void sub_080171F0(void) {
if (gPlayerState.flags & PL_CLONING) if (gPlayerState.flags & PL_CLONING)
gUnk_0200AF00.rActionPlayerState = R_ACTION_CANCEL; gUnk_0200AF00.rActionPlayerState = R_ACTION_CANCEL;
sub_08078180(); DetermineRButtonInteraction();
gPlayerState.field_0x7 &= ~0x80; gPlayerState.field_0x7 &= ~0x80;
gPlayerState.field_0xa &= 0xf; gPlayerState.field_0xa &= 0xf;
gPlayerState.keepFacing &= ~0x80; gPlayerState.keepFacing &= ~0x80;

2
src/playerUtils.c
View File

@ -971,7 +971,7 @@ void ForceSetPlayerState(u32 framestate) {
sub_08078B48(); sub_08078B48();
} }
void sub_08078180(void) { void DetermineRButtonInteraction(void) {
u8 rAction; u8 rAction;
InteractableObject* interaction; InteractableObject* interaction;