From ca7a0c3eaca047f67ed3d12dc09bc5182483368a Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Thu, 4 Feb 2021 14:26:24 +0000 Subject: [PATCH] PLAYER -> PLAYER_ACTOR --- include/macros.h | 2 +- src/battle/item/coconut.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/macros.h b/include/macros.h index c779514c50..f593a22294 100644 --- a/include/macros.h +++ b/include/macros.h @@ -24,7 +24,7 @@ #define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false #define BATTLE_STATUS (&gBattleStatus) -#define PLAYER (gBattleStatus.playerActor) +#define PLAYER_ACTOR (gBattleStatus.playerActor) #define GAME_STATUS (*gGameStatusPtr) #define PLAYER_STATUS (&gPlayerStatus) #define UI_STATUS (&gUIStatus) diff --git a/src/battle/item/coconut.c b/src/battle/item/coconut.c index 8651b9b99a..078fed1547 100644 --- a/src/battle/item/coconut.c +++ b/src/battle/item/coconut.c @@ -30,7 +30,7 @@ ApiStatus func_802A1000_72F720(ScriptInstance* script, s32 isInitialCall) { sellValue = gItemTable[battleStatus->selectedItemID].sellValue; posY = battleStatus->playerActor->currentPos.y + battleStatus->playerActor->size.y; - player = PLAYER; + player = PLAYER_ACTOR; // If Refund is equipped, the player gets if (heroes_is_ability_active(battleStatus->playerActor, Ability_REFUND)) {