From 9682995b04f93732c1ae143f66d2933b29dfd5b5 Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Sun, 19 Jun 2022 16:57:23 -0700
Subject: Controller Macros Update (#852)

* macros

* Format, I will remember 1 day
---
 src/code/flg_set.c         | 2 +-
 src/code/z_kaleido_setup.c | 2 +-
 src/code/z_message.c       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/code')

diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 53be7b68d..715d3756f 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -135,7 +135,7 @@ static s32 sTimer = 0;
 
 void FlagSet_Update(GameState* gameState) {
     GlobalContext* globalCtx = (GlobalContext*)gameState;
-    Input* input = CONTROLLER1(globalCtx);
+    Input* input = CONTROLLER1(&globalCtx->state);
 
     /* Intra-byte navigation */
 
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 5a234ea44..5ed36d551 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -60,7 +60,7 @@ void func_800F4A10(GlobalContext* globalCtx) {
 }
 
 void KaleidoSetup_Update(GlobalContext* globalCtx) {
-    Input* input = CONTROLLER1(globalCtx);
+    Input* input = CONTROLLER1(&globalCtx->state);
     MessageContext* msgCtx = &globalCtx->msgCtx;
     Player* player = GET_PLAYER(globalCtx);
     PauseContext* pauseCtx = &globalCtx->pauseCtx;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 2a90f38ca..d8e2d5c8a 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -67,7 +67,7 @@ void func_80147564(GlobalContext* globalCtx) {
 
 s32 Message_ShouldAdvance(GlobalContext* globalCtx) {
     MessageContext* msgCtx = &globalCtx->msgCtx;
-    Input* controller = CONTROLLER1(globalCtx);
+    Input* controller = CONTROLLER1(&globalCtx->state);
 
     if ((msgCtx->unk12020 == 0x10) || (msgCtx->unk12020 == 0x11)) {
         if (CHECK_BTN_ALL(controller->press.button, BTN_A)) {
@@ -86,7 +86,7 @@ s32 Message_ShouldAdvance(GlobalContext* globalCtx) {
 
 s32 Message_ShouldAdvanceSilent(GlobalContext* globalCtx) {
     MessageContext* msgCtx = &globalCtx->msgCtx;
-    Input* controller = CONTROLLER1(globalCtx);
+    Input* controller = CONTROLLER1(&globalCtx->state);
 
     if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
         return CHECK_BTN_ALL(controller->press.button, BTN_A);
@@ -117,7 +117,7 @@ void func_801477B4(GlobalContext* globalCtx) {
 void func_80148B98(GlobalContext* globalCtx, u8 arg1) {
     static s16 held = 0;
     MessageContext* msgCtx = &globalCtx->msgCtx;
-    Input* curInput = CONTROLLER1(globalCtx);
+    Input* curInput = CONTROLLER1(&globalCtx->state);
 
     if ((curInput->rel.stick_y > 29) && held == 0) {
         held = 1;
-- 
cgit v1.2.3