diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 1 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 3 | ||||
| -rw-r--r-- | src/code/z_snap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e85d82504..5162f95b2 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -825,6 +825,7 @@ void Actor_FreeOverlay(ActorOverlay* entry) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD6E4.asm") +// This function is very similar to OoT's func_80034A14 #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD888.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_actor//func_800BD9A0.asm") diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index c8e54ec09..7d65b22f5 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1121,8 +1121,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 params = 0xD0; dropId = ITEM00_MAGIC_LARGE; dropQuantity = 1; - } else if ((gSaveContext.magicLevel != 0) && - ((gSaveContext.magicLevel >> 1) >= gSaveContext.magic)) { + } else if ((gSaveContext.magicLevel != 0) && ((gSaveContext.magicLevel >> 1) >= gSaveContext.magic)) { params = 0xD0; dropId = ITEM00_MAGIC_LARGE; dropQuantity = 1; diff --git a/src/code/z_snap.c b/src/code/z_snap.c index b51dde076..cae6f3e16 100644 --- a/src/code/z_snap.c +++ b/src/code/z_snap.c @@ -95,7 +95,7 @@ void func_8013A46C(s32 flag) { u32 func_8013A4C4(s32 flag) { SaveContext* saveCtx = &gSaveContext; - + if (flag < 0x20) { return saveCtx->roomInf[123][3] & (1 << flag); } else { |