From 3aeadb42b8a195b3d2f67ce71fcd184ddf26d856 Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Wed, 13 Oct 2021 03:27:29 +1100
Subject: Macros: `PLAYER` -> `GET_PLAYER(globalCtx)` and `ACTIVE_CAM` ->
 `GET_ACTIVE_CAM(globalCtx)` (#283)

* PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* formatter

* PR Suggestions

* `FIRST_ENEMY` -> `GET_FIRST_ENEMY(globalCtx)`

* Fix merge conflicts
---
 src/code/code_800E8EA0.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/code/code_800E8EA0.c')

diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c
index ca2e9e841..754b8759d 100644
--- a/src/code/code_800E8EA0.c
+++ b/src/code/code_800E8EA0.c
@@ -54,7 +54,7 @@ s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4)
 }
 
 s32 func_800E9138(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, f32 param_5) {
-    Player* player = PLAYER;
+    Player* player = GET_PLAYER(globalCtx);
     s16 sVar3;
     Vec3f local_14;
     s16 sVar3A;
@@ -83,7 +83,7 @@ s32 func_800E9138(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s*
 }
 
 s32 func_800E9250(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, Vec3f param_5) {
-    Player* player = PLAYER;
+    Player* player = GET_PLAYER(globalCtx);
     s16 sVar3;
     Vec3f local_14;
     s16 sVar3A;
-- 
cgit v1.2.3