IsPartnerImmobile -> IsPlayerImmobile (fixes #1163)

pmret · Nov 4, 2024 · f8c89d2 · f8c89d2
1 parent 89de300
commit f8c89d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c
@@ -81,8 +81,8 @@ API_CALLABLE(N(ModifyBowPos)) {
     return ApiStatus_DONE2;
 }
 
-/// Duplicate of IsPartnerImmobile
-API_CALLABLE(N(IsPartnerImmobile)) {
+/// Duplicate of IsPlayerImmobile
+API_CALLABLE(N(IsPlayerImmobile)) {
     BattleStatus* battleStatus = &gBattleStatus;
     Actor* playerActor = battleStatus->playerActor;
     s32 isImmobile = playerActor->debuff == STATUS_KEY_FEAR
@@ -699,7 +699,7 @@ EvtScript N(outtaSight) = {
     Add(LVar2, 5)
     Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
     Call(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_LINEAR)
-    Call(N(IsPartnerImmobile))
+    Call(N(IsPlayerImmobile))
     IfEq(LVar0, 0)
         Call(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch)
     EndIf

diff --git a/src/battle/player_events.c b/src/battle/player_events.c
@@ -49,7 +49,7 @@ void btl_set_player_idle_anims(void) {
     }
 }
 
-API_CALLABLE(IsPartnerImmobile) {
+API_CALLABLE(IsPlayerImmobile) {
     BattleStatus* battleStatus = &gBattleStatus;
     Actor* playerActor = battleStatus->playerActor;
     s32 isImmobile = playerActor->debuff == STATUS_KEY_FEAR

diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
@@ -6720,7 +6720,7 @@ btl_state_draw_celebration = 0x802601BC; // type:func rom:0x18EA9C
 draw_content_level_up_textbox = 0x80260948; // type:func rom:0x18F228
 draw_content_cant_increase_popup = 0x80260A20; // type:func rom:0x18F300
 btl_set_player_idle_anims = 0x80260A60; // type:func rom:0x18F340
-IsPartnerImmobile = 0x80260AD4; // type:func rom:0x18F3B4
+IsPlayerImmobile = 0x80260AD4; // type:func rom:0x18F3B4
 activate_defend_command = 0x80260B04; // type:func rom:0x18F3E4
 func_80260B70 = 0x80260B70; // type:func rom:0x18F450
 ChoosePlayerCelebrationAnim = 0x80260BF4; // type:func rom:0x18F4D4
@@ -13934,7 +13934,7 @@ func_8023A1B0_70DEC0 = 0x8023A1B0; // type:func rom:0x70DEC0
 func_80238014_710F04 = 0x80238014; // type:func rom:0x710F04
 func_8023808C_710F7C = 0x8023808C; // type:func rom:0x710F7C
 func_802380E4_710FD4 = 0x802380E4; // type:func rom:0x710FD4
-battle_partner_bow_IsPartnerImmobile = 0x80238198; // type:func rom:0x711088
+battle_partner_bow_IsPlayerImmobile = 0x80238198; // type:func rom:0x711088
 func_802381C8_7110B8 = 0x802381C8; // type:func rom:0x7110B8
 battle_partner_bow_AverageTargetStatusChance = 0x802381E8; // type:func rom:0x7110D8
 // func_80238000_714CF0 = 0x80238000; // type:func rom:0x714CF0