falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalize line endings

This commit is contained in:
rozlette 2020-02-19 11:18:03 -06:00
parent bfcc1d6a9a
commit e45d0ef673
15 changed files with 7727 additions and 7728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/code/z_scene.c
View File

@ -12,9 +12,9 @@ GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_FindSceneObjectIndex.asm")
s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index) { s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index) {
if (iParm1->objects[index].id > 0) { if (iParm1->objects[index].id > 0) {
return 1; return 1;
} else { } else {
return 0; return 0;
} }
} }
GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_DmaAllObjects.asm") GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_DmaAllObjects.asm")
@ -25,7 +25,6 @@ GLOBAL_ASM("./asm/nonmatching/z_scene/func_8012F73C.asm")
#ifdef NONMATCHING #ifdef NONMATCHING
// Regalloc differences only // Regalloc differences only
void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) { void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) {
ActorEntry* linkEntry; ActorEntry* linkEntry;
s32 loadReturn; s32 loadReturn;
void* objectVramAddr; void* objectVramAddr;
@ -116,7 +115,7 @@ void Scene_HeaderCommand07(GlobalContext* ctxt, SceneCmd* entry) {
} }
if (entry->base.unk1 != 0) { if (entry->base.unk1 != 0) {
// TODO: // TODO:
// OOT has D_801C2650's equivalent as a list of navi messages that store SceneTableEntry structs. // OOT has D_801C2650's equivalent as a list of navi messages that store SceneTableEntry structs.
// This needs to be something like (SceneTableEntry*)(&D_801C2650[entry->unk1]) // This needs to be something like (SceneTableEntry*)(&D_801C2650[entry->unk1])
// Currently D_801C2650 is not typed so that can't be completed at this moment. // Currently D_801C2650 is not typed so that can't be completed at this moment.