diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-06-09 18:38:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 18:38:35 -0400 |
| commit | 83e263ab12c82135ef1ff92dc59f23c614fe4df0 (patch) | |
| tree | aa2a8c9037883b7cbd4ac098241677339d8237e6 /src/code | |
| parent | b6904aa2cc756e1b553d65cce2f04410d21d0210 (diff) | |
`ovl_En_Ma_Yts` OK and partially documented (#164)
* destroy
* moar
* limbdraw
* some setups identified
* func_80B8D6F8
* func_80B8E0BC
* fix unmatching
* func_80B8D12C
* func_80B8D1E8
* func_80B8DBB8
* some renaiming
* some renaimings
* symbols
* small renaming and a few functions
* Almost every function done
* lots of renames
* Fix merge conflicts
* misc notes
* struct_800BD888_arg1
* some renamings and enum
* func_80B8D2D8
* func_80B8DA28
* import data and cleanup
* format
* minor changes
* Documentation pass
* update enum name
* Remove object XML
* run format
* Move EN_MA_YTS_PARSE_TYPE to header
* fix conflicts
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* move struct to z64animation
* Change PARSE_TYPE macro to accept actor param
* format
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
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 { |