mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Door_Spiral OK (from zel) (#87)

Browse Source 
* Door_Spiral OK

* Cleanup
This commit is contained in:
Rozelette
2021-03-27 11:17:42 -05:00
committed by GitHub
parent e64d4d8bf2
commit 6e4d156ad7
11 changed files with 374 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -1946,7 +1946,7 @@ void func_80104CF4(GlobalContext* ctxt);
// void func_8010534C(void);
void func_8010549C(GlobalContext* ctxt, void* segmentAddress);
void func_8010565C(GlobalContext* ctxt, u8 num, void* segmentAddress);
void func_80105818(GlobalContext* ctxt, u32 uParm2, TransitionActorInit* puParm3);
void func_80105818(GlobalContext* ctxt, u32 uParm2, TransitionActorEntry* puParm3);
// void func_80105A40(void);
// void func_80105B34(void);
// void func_80105C40(void);
@@ -2203,7 +2203,7 @@ void func_801229A0(GlobalContext* globalCtx, ActorPlayer* player);
// void func_80122D44(void);
// void func_80122ED8(void);
// void func_80122EEC(void);
// void func_80122F28(void);
void func_80122F28(ActorPlayer* player, GlobalContext* globalCtx, Actor* actor);
// void func_80122F9C(void);
// void func_80122FCC(void);
// void func_8012300C(void);
include/segment.h
+3
View File
@@ -27,4 +27,7 @@ extern UNK_PTR D_04062060[];
extern UNK_PTR D_04062000[];
extern Gfx D_040622C0[];
extern Gfx D_0501D980[];
extern Gfx D_050219E0[];
#endif
include/z64.h
+10 -12
View File
@@ -404,17 +404,15 @@ typedef struct {
} TitleCardContext; // size = 0x10
typedef struct {
/* 0x0 */ s8 unk0;
/* 0x1 */ UNK_TYPE1 pad1[0x1];
/* 0x2 */ s8 unk2;
/* 0x3 */ UNK_TYPE1 pad3[0x1];
/* 0x4 */ s16 actorIndex; // negative means already loaded?
/* 0x6 */ s16 x;
/* 0x8 */ s16 y;
/* 0xA */ s16 z;
/* 0xC */ s16 yRot; // lower 7 bits contain cutscene number
/* 0xE */ u16 variable;
} TransitionActorInit; // size = 0x10
struct {
s8 room; // Room to switch to
s8 effects; // How the camera reacts during the transition
} /* 0x00 */ sides[2]; // 0 = front, 1 = back
/* 0x04 */ s16 id;
/* 0x06 */ Vec3s pos;
/* 0x0C */ s16 rotY;
/* 0x0E */ s16 params;
} TransitionActorEntry; // size = 0x10
typedef struct {
/* 0x0 */ s32 topY;
@@ -1630,7 +1628,7 @@ struct GlobalContext {
/* 0x186E0 */ RoomContext roomContext;
/* 0x18760 */ u8 transitionActorCount;
/* 0x18761 */ UNK_TYPE1 pad18761[0x3];
/* 0x18764 */ TransitionActorInit* transitionActorList;
/* 0x18764 */ TransitionActorEntry* transitionActorList;
/* 0x18768 */ UNK_TYPE1 pad18768[0x48];
/* 0x187B0 */ z_Matrix unk187B0;
/* 0x187F0 */ UNK_TYPE1 pad187F0[0xC];
include/z64actor.h
+7 -1
View File
@@ -226,7 +226,13 @@ typedef struct {
/* 0x34C */ Actor* heldActor;
/* 0x350 */ UNK_TYPE1 pad350[0x18];
/* 0x368 */ Vec3f unk368;
/* 0x374 */ UNK_TYPE1 pad374[0x20];
/* 0x374 */ UNK_TYPE1 pad374[0x8];
/* 0x37C */ s8 doorType;
/* 0x37D */ s8 doorDirection;
/* 0x37E */ s8 doorTimer;
/* 0x37F */ s8 unk37F;
/* 0x380 */ Actor* doorActor;
/* 0x384 */ UNK_TYPE1 unk384[0x10];
/* 0x394 */ u8 unk394;
/* 0x395 */ UNK_TYPE1 pad395[0x37];
/* 0x3CC */ s16 unk3CC;