From b3f4cce2f5e4aea27d10acc6cd8d1d785b47da3d Mon Sep 17 00:00:00 2001 From: AntonioCastelli Date: Wed, 1 Dec 2021 19:25:15 -0800 Subject: [PATCH] Use magic code macros Co-authored-by: Faschz --- src/unknown_00BC20.c | 2 +- src/unknown_0348C0.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 0a97609c..da8148be 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -656,7 +656,7 @@ void func_8000E2B4(void) { if (get_filtered_cheats() & CHEAT_BIG_CHARACTERS) { player->scale *= 1.4f; } - if ((get_filtered_cheats() & 0x20) != 0) { + if (get_filtered_cheats() & CHEAT_SMALL_CHARACTERS) { player->scale *= 0.714f; } player->unk3C_a.unk3C = 0; diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index d5eca7eb..887a79d0 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -1202,15 +1202,15 @@ void func_8003DFCC(Object *arg0, unknown_struct_8003DFCC *arg1) { arg0->unk4C->unk11 = 4; arg0->unk4C->unk10 = 0x14; temp_v0 = get_filtered_cheats(); - if (temp_v0 & 0x20000) { + if (temp_v0 & CHEAT_ALL_BALLOONS_ARE_BLUE) { arg1->unk9 = 0U; - } else if (temp_v0 & 0x08000) { + } else if (temp_v0 & CHEAT_ALL_BALLOONS_ARE_RED) { arg1->unk9 = 1U; - } else if (temp_v0 & 0x10000) { + } else if (temp_v0 & CHEAT_ALL_BALLOONS_ARE_GREEN) { arg1->unk9 = 2U; - } else if (temp_v0 & 0x40000) { + } else if (temp_v0 & CHEAT_ALL_BALLOONS_ARE_YELLOW) { arg1->unk9 = 3U; - } else if (temp_v0 & 0x80000) { + } else if (temp_v0 & CHEAT_ALL_BALLOONS_ARE_RAINBOW) { arg1->unk9 = 4U; } if ((s32) arg1->unk8 >= 6) { @@ -1230,7 +1230,7 @@ void func_8003DFCC(Object *arg0, unknown_struct_8003DFCC *arg1) { arg0->unk64->unk4 = 0; arg0->unk64->unk0_a.unk0 = arg0->scale; arg0->unk7C.word = 0; - if ((get_filtered_cheats() & 0x800) != 0) { + if (get_filtered_cheats() & CHEAT_DISABLE_WEAPONS) { gParticlePtrList_addObject(arg0); } }