From efe60cc88b4e8c365f9d56edaa090dbe43e77aeb Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 21 Sep 2021 10:30:19 +0200 Subject: [PATCH] Use `INV_CONTENT`, `AMMO` macros more --- .../actors/ovl_kaleido_scope/z_kaleido_debug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c index 352ed0206d..ad490728cc 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c @@ -415,17 +415,17 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) { } if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { - if (i != gSaveContext.inventory.items[SLOT(gAmmoItems[i])]) { - gSaveContext.inventory.items[SLOT(gAmmoItems[i])] = gAmmoItems[i]; + if (i != INV_CONTENT(gAmmoItems[i])) { + INV_CONTENT(gAmmoItems[i]) = gAmmoItems[i]; } - gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])]++; - if (gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])] > 99) { - gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])] = 99; + AMMO(gAmmoItems[i])++; + if (AMMO(gAmmoItems[i]) > 99) { + AMMO(gAmmoItems[i]) = 99; } } else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) { - gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])]--; - if (gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])] < 0) { - gSaveContext.inventory.ammo[SLOT(gAmmoItems[i])] = 0; + AMMO(gAmmoItems[i])--; + if (AMMO(gAmmoItems[i]) < 0) { + AMMO(gAmmoItems[i]) = 0; } } } else if (i == SLOT_OCARINA) {