diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-11-05 19:15:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 23:15:47 -0300 |
| commit | 49f55ff0052340d29cffe2767fdc7d2ee5adb9f4 (patch) | |
| tree | 775d90129d6d9bc8b7e960e55e62f1e030cd8f7b /src | |
| parent | 2907da61c3268f440e9ebb706ac1939f21a5aa7e (diff) | |
EnvFlags OK (#404)
* Matched
* Remove magic number
* Rename system to EnvFlags
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/code_800F12D0.c | 9 | ||||
| -rw-r--r-- | src/code/z_env_flags.c | 33 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 2 |
3 files changed, 34 insertions, 10 deletions
diff --git a/src/code/code_800F12D0.c b/src/code/code_800F12D0.c deleted file mode 100644 index d34f11e81..000000000 --- a/src/code/code_800F12D0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F12D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F1304.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F1374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F12D0/func_800F13E8.s") diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c new file mode 100644 index 000000000..d76681512 --- /dev/null +++ b/src/code/z_env_flags.c @@ -0,0 +1,33 @@ +#include "global.h" + +void EnvFlags_UnsetAll(GlobalContext* globalCtx) { + u8 i; + + for (i = 0; i < ARRAY_COUNT(globalCtx->envFlags); i++) { + globalCtx->envFlags[i] = 0; + } +} + +void EnvFlags_Set(GlobalContext* globalCtx, s16 flag) { + s16 index = flag / 16; + s16 bit = flag % 16; + s16 mask = 1 << bit; + + globalCtx->envFlags[index] |= mask; +} + +void EnvFlags_Unset(GlobalContext* globalCtx, s16 flag) { + s16 index = flag / 16; + s16 bit = flag % 16; + s16 mask = (1 << bit) ^ 0xFFFF; + + globalCtx->envFlags[index] &= mask; +} + +s32 EnvFlags_Get(GlobalContext* globalCtx, s16 flag) { + s16 index = flag / 16; + s16 bit = flag % 16; + s16 mask = 1 << bit; + + return globalCtx->envFlags[index] & mask; +} diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index ed485a110..fb983aa6f 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -98,7 +98,7 @@ void DoorAna_WaitClosed(DoorAna* this, GlobalContext* globalCtx) { if (grottoType == DOORANA_TYPE_UNK) { // in OOT decomp its marked as open with storms, but does not seem to open with storms in MM - if ((this->actor.xyzDistToPlayerSq < 40000.0f) && (func_800F13E8(globalCtx, 5))) { + if ((this->actor.xyzDistToPlayerSq < 40000.0f) && (EnvFlags_Get(globalCtx, 5))) { grottoIsOpen = 1; this->actor.flags &= ~0x10; // always update OFF } |