mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-27 16:12:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Controller Macros Update (#852)

Browse Source 
* macros

* Format, I will remember 1 day
This commit is contained in:
Derek Hensley
2022-06-19 16:57:23 -07:00
committed by GitHub
parent d318b1f285
commit 9682995b04
16 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/flg_set.c
+1 -1
View File
@@ -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 */
src/code/z_kaleido_setup.c
+1 -1
View File
@@ -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;
src/code/z_message.c
+3 -3
View File
@@ -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;