diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2020-08-23 23:50:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-23 17:50:30 -0400 |
| commit | 49609dd78bb586c8ab3349105ceedeb2eb0d91ea (patch) | |
| tree | c076c98bff5e83feb342219344ed027718519acf /src/code/fault.c | |
| parent | 281aaa0cb6a55f19eceb322871a8d27da9e0e8b2 (diff) | |
Match/Improve a bunch of non matchings (#342)
Diffstat (limited to 'src/code/fault.c')
| -rw-r--r-- | src/code/fault.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/code/fault.c b/src/code/fault.c index 3862d381f..e47441792 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -536,21 +536,21 @@ void Fault_Wait5Seconds(void) { sFaultStructPtr->faultActive = true; } -#ifdef NON_MATCHING -// regalloc differences void Fault_WaitForButtonCombo() { Input* curInput = &sFaultStructPtr->padInput; - Input** curInputPtr = &curInput; s32 state; u32 s1; u32 s2; u32 kDown; u32 kCur; + if (1) {} + if (1) {} + osSyncPrintf( VT_FGCOL(WHITE) "KeyWaitB (ＬＲＺ " VT_FGCOL(WHITE) "上" VT_FGCOL(YELLOW) "下 " VT_FGCOL(YELLOW) "上" VT_FGCOL(WHITE) "下 " VT_FGCOL(WHITE) "左" VT_FGCOL( - YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) - VT_RST "\n"); + YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST + "\n"); osSyncPrintf(VT_FGCOL(WHITE) "KeyWaitB'(ＬＲ左" VT_FGCOL(YELLOW) "右 +" VT_FGCOL(RED) "START" VT_FGCOL( WHITE) ")" VT_RST "\n"); @@ -568,10 +568,8 @@ void Fault_WaitForButtonCombo() { kDown = curInput->press.in.button; kCur = curInput->cur.in.button; - if (kCur == 0) { - if (s1 == s2) { - s1 = 0; - } + if ((kCur == 0) && (s1 == s2)) { + s1 = 0; } else if (kDown != 0) { if (s1 == s2) { state = 0; @@ -682,9 +680,6 @@ void Fault_WaitForButtonCombo() { osWritebackDCacheAll(); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_WaitForButtonCombo.s") -#endif void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) { u32* alignedAddr; |