diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2022-06-19 16:57:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 00:57:23 +0100 |
| commit | 9682995b04f93732c1ae143f66d2933b29dfd5b5 (patch) | |
| tree | 12aadb7978a6e7dc1c0527b94194d2965fa30dbd /src/code/z_message.c | |
| parent | d318b1f2854e98e2510812dd09e7c84b14f17622 (diff) | |
Controller Macros Update (#852)
* macros
* Format, I will remember 1 day
Diffstat (limited to 'src/code/z_message.c')
| -rw-r--r-- | src/code/z_message.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |