izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

DoorAna: OK (#90)

Browse Source 
* DoorAna: OK

* DoorAna: changed z_lib functionname to match new master

* DoorAna: requested changes

* DoorAna: requested changes

* DoorAna: Renamed nextEntranceIndex

* DoorAna: some changes requested

Co-authored-by: isghj8 <isghj8@gmail.com>
This commit is contained in:
Isghj
2021-04-18 14:16:14 -04:00
committed by GitHub
co-authored by isghj8
parent d327f3e6c3
commit 768ca0839b
9 changed files with 202 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -4
View File
@@ -815,7 +815,7 @@ UNK_TYPE4 func_800B8A1C(Actor* actor, GlobalContext* ctxt, s32 iParm3, f32 fParm
// void func_800B8BD0(void);
// void func_800B8BFC(void);
// void func_800B8C20(void);
// void func_800B8C50(void);
void func_800B8C50(Actor* actor, GlobalContext* globalCtx);
// void func_800B8C78(void);
// void func_800B8C9C(void);
// void func_800B8CEC(void);
@@ -1654,7 +1654,7 @@ void func_800F0568(GlobalContext* ctxt, Vec3f* position, s32 param_3, s16 sfxId)
void func_800F12D0(GlobalContext* ctxt);
void func_800F1304(GlobalContext* ctxt, s16 param_2);
void func_800F1374(s32 param_1, s16 param_2);
// void func_800F13E8(void);
s16 func_800F13E8(GlobalContext* ctxt, s16 param_2);
s16 func_800F1460(s16 param_1);
ActorCutscene* ActorCutscene_GetCutsceneImpl(s16 index);
void ActorCutscene_Init(GlobalContext* ctxt, ActorCutscene* cutscenes, s32 num);
@@ -3013,7 +3013,7 @@ void func_80167DE4(GlobalContext* ctxt);
void func_80168090(GlobalContext* ctxt);
void func_80168DAC(GlobalContext* ctxt);
void Play_Update(GlobalContext* ctxt);
// void func_801690CC(void);
s32 func_801690CC(GlobalContext* gCtx);
// void func_80169100(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_801691F0(void);
void* Play_LoadScene(GlobalContext* ctxt, ObjectFileTableEntry* entry);
@@ -3040,7 +3040,7 @@ void func_801699D4(GlobalContext* ctxt, s16 param_2, s16 param_3);
// void convert_scene_number_among_shared_scenes(void);
void func_80169D40(GlobalContext* ctxt);
// void func_80169DCC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
// void func_80169E6C(void);
void func_80169E6C(GlobalContext* gCtx, s32 param_1, s32 param_2);
// void func_80169ECC(void);
// void func_80169EFC(void);
// void func_80169F78(void);
include/segment.h
+1
View File
@@ -30,6 +30,7 @@ extern Gfx D_04075B30[];
extern Gfx D_04076BC0[];
extern Gfx D_04077480[];
extern Gfx D_05000C40[];
extern Gfx D_05017EA0[]; // pot displaylist
extern Gfx D_05018090[]; // pot break shard displaylist
extern Gfx D_0501D980[];
include/z64.h
+9 -4
View File
@@ -329,7 +329,11 @@ typedef struct {
/* 0x010 */ s32 unk10;
/* 0x014 */ UNK_TYPE1 pad14[0x2E];
/* 0x042 */ s16 unk42;
/* 0x044 */ UNK_TYPE1 pad44[0x43];
/* 0x044 */ UNK_TYPE1 pad44[0x34];
/* 0x078 */ f32 unk78;
/* 0x07C */ UNK_TYPE1 pad7C[0x4];
/* 0x080 */ s16 unk80;
/* 0x082 */ UNK_TYPE1 pad82[0x5];
/* 0x087 */ s8 unk87;
/* 0x088 */ UNK_TYPE1 pad88[0x1EE];
/* 0x276 */ u8 unk276;
@@ -1674,13 +1678,14 @@ struct GlobalContext {
/* 0x18845 */ u8 unk18845;
/* 0x18846 */ u16 sceneNumActorsToLoad;
/* 0x18848 */ u8 numRooms;
/* 0x18849 */ UNK_TYPE1 pad18849[0x3];
/* 0x18849 */ UNK_TYPE1 pad18849;
/* 0x1884A */ s16 unk1884A;
/* 0x1884C */ RoomFileLocation* roomList;
/* 0x18850 */ ActorEntry* linkActorEntry;
/* 0x18854 */ ActorEntry* setupActorList;
/* 0x18858 */ UNK_PTR unk18858;
/* 0x1885C */ EntranceEntry* setupEntranceList;
/* 0x18860 */ void* setupExitList;
/* 0x18860 */ u16* setupExitList;
/* 0x18864 */ void* setupPathList;
/* 0x18868 */ UNK_PTR unk18868;
/* 0x1886C */ AnimatedTexture* sceneTextureAnimations;
@@ -1688,7 +1693,7 @@ struct GlobalContext {
/* 0x18874 */ u8 unk18874;
/* 0x18875 */ s8 unk18875;
/* 0x18876 */ UNK_TYPE1 pad18876[0x4];
/* 0x1887A */ u16 unk1887A;
/* 0x1887A */ u16 nextEntranceIndex;
/* 0x1887C */ s8 unk1887C;
/* 0x1887D */ UNK_TYPE1 pad1887D[0x2];
/* 0x1887F */ u8 unk1887F;
include/z64actor.h
+3 -1
View File
@@ -255,7 +255,9 @@ typedef struct {
/* 0xADE */ u8 unkADE;
/* 0xADF */ UNK_TYPE1 padADF[0x4];
/* 0xAE3 */ s8 unkAE3;
/* 0xAE4 */ UNK_TYPE1 padAE4[0x44];
/* 0xAE4 */ UNK_TYPE1 padAE4[0x3];
/* 0xAE7 */ s8 unkAE7;
/* 0xAE8 */ UNK_TYPE1 padAE8[0x40];
/* 0xB28 */ s16 unkB28;
/* 0xB2A */ UNK_TYPE1 padB2A[0x72];
/* 0xB9C */ Vec3f unkB9C;