diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2021-12-06 01:11:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-05 19:11:38 -0500 |
| commit | a9284494f2b6f53a0e8f95b5567faf1b2162e91c (patch) | |
| tree | b09701e147c47f177fdcae2e8bcf6ea90a5bb85b /src/code/z_debug.c | |
| parent | 79220ba58ae550441e42b4d2c79af7f7e4b9787b (diff) | |
Use defines for actor flags (#873)
* Add ACTOR_FLAG_ defines
* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere
* Remove unused ACTOR_FLAG_* constants
* actor flags in bigokuta & ko
* actor flags in obj_mure
* actor flags in stalfos, twinrova & ganon2
* actor flags in morpha & barinade
* name some previously missed actor flags
* found some comments using hex for actor flags
* Actor flags in ovl_En_Ganon_Mant
* Actor flags in EnWf
* Flags in en_zf
* Actor flags in BossGanon (FeelsOKMan)
* Remove `ACTOR_FLAG_NONE`
* Wrap expansion of `FLAGS` in parentheses
* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`
* Move `CHECK_FLAG_ALL` to `macros.h`
* Run formatter
Diffstat (limited to 'src/code/z_debug.c')
| -rw-r--r-- | src/code/z_debug.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 2949f0ef9..8b2a6fe93 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -151,19 +151,15 @@ void func_8006390C(Input* input) { gGameInfo->dpadLast = dpad; } - 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_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) - : 0; + 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_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) + : 0; gGameInfo->data[gGameInfo->regCur + regGroup] += increment; if (CHECK_BTN_ANY(dpad, BTN_DUP)) { |