From 4fd83717cd62a4a2c91cbe7762e86936b591d308 Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Sun, 30 Apr 2023 20:21:45 +0200 Subject: [PATCH] Name sub_08078180 --- include/player.h | 4 ++-- src/interrupts.c | 2 +- src/playerUtils.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/player.h b/include/player.h index 489b305c..eb347479 100644 --- a/include/player.h +++ b/include/player.h @@ -12,7 +12,7 @@ enum PlayerActions { PLAYER_JUMP, PLAYER_PUSH, 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_MINISH, PLAYER_MINISHDIE, @@ -534,7 +534,7 @@ bool32 IsItemActive(ItemBehavior*); bool32 IsItemActivatedThisFrame(ItemBehavior*); bool32 IsItemActiveByInput(ItemBehavior*, PlayerInputState); bool32 sub_08077FEC(u32); -void sub_08078180(void); +void DetermineRButtonInteraction(void); void ResetPossibleInteraction(); void AddInteractableFuser(Entity*, u32); void AddInteractableSmallKeyLock(Entity*); diff --git a/src/interrupts.c b/src/interrupts.c index 3d5dbcf1..23934487 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -325,7 +325,7 @@ static void sub_080171F0(void) { if (gPlayerState.flags & PL_CLONING) gUnk_0200AF00.rActionPlayerState = R_ACTION_CANCEL; - sub_08078180(); + DetermineRButtonInteraction(); gPlayerState.field_0x7 &= ~0x80; gPlayerState.field_0xa &= 0xf; gPlayerState.keepFacing &= ~0x80; diff --git a/src/playerUtils.c b/src/playerUtils.c index 33be1be5..8147a443 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -971,7 +971,7 @@ void ForceSetPlayerState(u32 framestate) { sub_08078B48(); } -void sub_08078180(void) { +void DetermineRButtonInteraction(void) { u8 rAction; InteractableObject* interaction;