diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2021-08-21 19:12:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-22 01:12:57 +0200 |
| commit | 556cdad7eba75560ec57533e3d60e850fd1acf4c (patch) | |
| tree | b7dba0a5409edf92ccd500aa4d1b13a53bbe5975 /src/code/z_debug.c | |
| parent | 17c79a8f60fed52b974f757ab2cfaa94ae4d466c (diff) | |
Big cleanup (#775)
* Adult and child2 macros OK
* ICHAIN cleanup
* almost all overlay data
* format.sh
* func_8002FBAC NON_EQUIVALENT
* PR fixes (MZXrules)
* fix
* change //@ bug to //! @bug
* merge master and missed a //@bug
* fix ruto
* some more cleanup (#2)
* more `! @bug` formatting cleanup
* parenthesis cleanup
* hex naviEnemyId
* run formatter
* replace `IS_NOT_` macros with `!IS_`
* run formatter
* run formatter
* PR fixes (fig)
* Missed something
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'src/code/z_debug.c')
| -rw-r--r-- | src/code/z_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 6cb76f846..21b0fee3e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -151,13 +151,13 @@ void func_8006390C(Input* input) { gGameInfo->dpadLast = dpad; } - increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) + increment = CHECK_BTN_ANY(dpad, BTN_DRIGHT) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? 1000 : CHECK_BTN_ALL(input->cur.button, BTN_A) ? 100 : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1) - : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) + : CHECK_BTN_ANY(dpad, BTN_DLEFT) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? -1000 : CHECK_BTN_ALL(input->cur.button, BTN_A) |