mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 05:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

All z_scene functions now OK

Browse Source
This commit is contained in:
Kenix3
2020-06-04 20:41:16 -04:00
parent 6046720adc
commit dfbcac539e
3 changed files with 322 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -4
View File
@@ -839,7 +839,7 @@ void func_800B9EF4(GlobalContext* ctxt, int numActors, Actor** actors); // func_
s32 func_800BA2D8(GlobalContext* ctxt, Actor* actor); // func_800BA2D8
s32 func_800BA2FC(GlobalContext* ctxt, Actor* actor, Vec3f* param_3, f32 param_4); // func_800BA2FC
void Actor_DrawAll(GlobalContext* ctxt, ActorContext* aCtxt); // func_800BA42C
void func_800BA6FC(void); // func_800BA6FC
void func_800BA6FC(GlobalContext* ctxt, ActorContext* aCtxt); // func_800BA6FC
void func_800BA798(GlobalContext* ctxt, ActorContext* aCtxt); // func_800BA798
void func_800BA8B8(GlobalContext* ctxt, ActorContext* actCtxt); // func_800BA8B8
void func_800BA9B4(void); // func_800BA9B4
@@ -2431,7 +2431,7 @@ void Scene_ReloadUnloadedObjects(SceneContext* sceneCtxt); // func_8012F4FC
s32 Scene_FindSceneObjectIndex(SceneContext* sceneCtxt, s16 id); // func_8012F608
s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index); // func_8012F668
void Scene_DmaAllObjects(SceneContext* sceneCtxt); // func_8012F698
u32 func_8012F73C(SceneContext* sceneCtxt, s32 iParm2, s16 id); // func_8012F73C
void* func_8012F73C(SceneContext* sceneCtxt, s32 iParm2, s16 id); // func_8012F73C
void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry); // func_8012F79C
void Scene_HeaderCommand01(GlobalContext* ctxt, SceneCmd* entry); // func_8012F90C
void Scene_HeaderCommand02(GlobalContext* ctxt, SceneCmd* entry); // func_8012F954
@@ -2467,7 +2467,7 @@ void Scene_HeaderCommand1A(GlobalContext* ctxt, SceneCmd* entry); // func_801306
void func_801306A4(GlobalContext* ctxt); // func_801306A4
s32 Scene_ProcessHeader(GlobalContext* ctxt, SceneCmd* header); // func_801306E8
u32 Scene_CreateEntrance(u32 sceneIndex, u32 spawnIndex, u32 offset); // func_80130768
void func_80130784(void); // func_80130784
void func_80130784(u32 spawnIndex); // func_80130784
void SceneProc_DrawCurrentSceneAnimatedTextures(GlobalContext* ctxt); // func_801307C0
void SceneProc_DrawSceneConfig0(GlobalContext* ctxt); // func_801307F4
Gfx* SceneProc_SetTile1Layer(GlobalContext* ctxt, ScrollingTextureParams* params); // func_80130834
@@ -2508,7 +2508,7 @@ EntranceRecord* SceneTable_LookupEntrance(u32 entrance); // func_801322C0
s32 SceneTable_LookupEntranceScene(u32 entrance); // func_8013230C
s32 SceneTable_LookupEntranceAbsoluteScene(u32 entrance); // func_80132338
void func_80132374(void); // func_80132374
void func_801323A0(void); // func_801323A0
s16 func_801323A0(u32 entrance); // func_801323A0
void func_801323D0(void); // func_801323D0
void func_80132428(void); // func_80132428
void func_80132494(void); // func_80132494
include/structs.h
+15 -10
View File
@@ -837,7 +837,11 @@ typedef struct {
/* 0x282 */ u16 unk282;
/* 0x284 */ UNK_TYPE1 pad284[0x28];
/* 0x2AC */ u8 cutsceneTrigger;
/* 0x2AD */ UNK_TYPE1 pad2AD[0x17];
/* 0x2AD */ UNK_TYPE1 pad2AD[0x5];
/* 0x2B2 */ u16 environmentTime;
/* 0x2B4 */ UNK_TYPE1 pad2B4[0x4];
/* 0x2B8 */ s16 unk2b8;
/* 0x2BA */ UNK_TYPE1 pad2BA[0xA];
/* 0x2C4 */ f32 unk2C4;
/* 0x2C8 */ CycleSceneFlags cycleSceneFlags[120];
} SaveContextExtra; // size = 0xC28
@@ -915,7 +919,7 @@ typedef struct {
} SceneEntranceTableEnty; // size = 0xC
typedef struct {
/* 0x00 */ s16 scenes[27];
/* 0x00 */ u16 scenes[27];
} SceneIdList; // size = 0x36
typedef struct {
@@ -923,8 +927,8 @@ typedef struct {
/* 0x02 */ UNK_TYPE1 pad2[0x2];
/* 0x04 */ void* vramAddr;
/* 0x08 */ DmaRequest dmaReq;
/* 0x28 */ OSMesgQueue unk28;
/* 0x40 */ UNK_TYPE1 pad40[0x4];
/* 0x28 */ OSMesgQueue loadQueue;
/* 0x40 */ OSMesg loadMsg;
} SceneObject; // size = 0x44
typedef struct {
@@ -1433,7 +1437,7 @@ typedef struct {
typedef struct {
/* 0x0000 */ u32 entranceIndex; // bits 0-3 : offset; 4-8: spawn index; 9-15: scene index
/* 0x0004 */ UNK_TYPE1 pad4[0x4];
/* 0x0008 */ u32 cutscene;
/* 0x0008 */ s32 cutscene;
/* 0x000C */ u16 time;
/* 0x000E */ UNK_TYPE1 padE[0xA];
/* 0x0018 */ u32 day;
@@ -1461,8 +1465,8 @@ typedef struct {
/* 0x000 */ void* objectVramStart;
/* 0x004 */ void* objectVramEnd;
/* 0x008 */ u8 objectCount;
/* 0x009 */ u8 unk9;
/* 0x00A */ u8 unkA;
/* 0x009 */ u8 spawnedObjectCount;
/* 0x00A */ u8 mainKeepIndex;
/* 0x00B */ u8 keepObjectId;
/* 0x00C */ SceneObject objects[35];
} SceneContext; // size = 0x958
@@ -1646,8 +1650,7 @@ typedef struct {
typedef struct {
/* 0x00 */ UNK_TYPE1 unk0;
/* 0x01 */ UNK_TYPE1 unk1;
/* 0x02 */ UNK_TYPE1 unk2;
/* 0x03 */ UNK_TYPE1 unk3;
/* 0x02 */ u16 unk2;
/* 0x04 */ f32 unk4;
/* 0x08 */ f32 unk8;
/* 0x0C */ f32 unkC;
@@ -2828,7 +2831,9 @@ struct GlobalContext {
/* 0x18876 */ UNK_TYPE1 pad18876[0x4];
/* 0x1887A */ u16 unk1887A;
/* 0x1887C */ s8 unk1887C;
/* 0x1887D */ UNK_TYPE1 pad1887D[0x7];
/* 0x1887D */ UNK_TYPE1 pad1887D[0x2];
/* 0x1887F */ u8 unk1887F;
/* 0x18880 */ UNK_TYPE1 pad18880[0x4];
/* 0x18884 */ CollisionCheckContext colCheckCtx;
/* 0x18B20 */ UNK_TYPE1 pad18B20[0x28];
/* 0x18B48 */ u8 curSpawn;