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

Document the function that handles the Giant's Mask cutscene in Boss02 (#1345)

Browse Source 
* Document the function that handles the Giant's Mask cutscene in Boss02

* Remove newline between fallthrough and next case
This commit is contained in:
Tom Overton
2023-08-04 13:06:36 +10:00
committed by GitHub
parent 5625603b56
commit 27ccadc77e
4 changed files with 264 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+246 -173
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_02/z_boss_02.h
+11 -11
View File
@@ -87,8 +87,8 @@ typedef struct Boss02 {
/* 0x1C28 */ ColliderJntSph colliderSphere2;
/* 0x1C48 */ ColliderJntSphElement colliderSphere2Elements[2];
/* 0x1CC8 */ ColliderCylinder colliderCylinder;
/* 0x1D14 */ u32 unk_1D14;
/* 0x1D18 */ s16 unk_1D18;
/* 0x1D14 */ u32 giantsMaskCsTimer;
/* 0x1D18 */ s16 giantsMaskCsState;
/* 0x1D1A */ s16 unk_1D1A;
/* 0x1D1C */ u32 unk_1D1C;
/* 0x1D20 */ s16 unk_1D20;
@@ -97,17 +97,17 @@ typedef struct Boss02 {
/* 0x1D30 */ Vec3f subCamAt;
/* 0x1D3C */ Vec3f subCamUp;
/* 0x1D48 */ Vec3f subCamAtNext;
/* 0x1D54 */ f32 unk_1D54;
/* 0x1D58 */ f32 unk_1D58;
/* 0x1D54 */ f32 subCamUpRotZ;
/* 0x1D58 */ f32 subCamUpRotZScale;
/* 0x1D5C */ f32 subCamAtVel;
/* 0x1D60 */ UNK_TYPE1 unk1D60[0x4];
/* 0x1D64 */ f32 unk_1D64;
/* 0x1D68 */ f32 unk_1D68;
/* 0x1D6C */ f32 unk_1D6C;
/* 0x1D70 */ f32 unk_1D70;
/* 0x1D74 */ f32 unk_1D74;
/* 0x1D78 */ u8 unk_1D78;
/* 0x1D7A */ s16 unk_1D7A;
/* 0x1D64 */ f32 subCamDistZFromPlayer;
/* 0x1D68 */ f32 subCamEyeOffsetY;
/* 0x1D6C */ f32 subCamAtOffsetY;
/* 0x1D70 */ f32 playerScale;
/* 0x1D74 */ f32 fogNear;
/* 0x1D78 */ u8 giantsMaskCsFlashState;
/* 0x1D7A */ s16 giantsMaskCsFlashAlpha;
/* 0x1D7C */ s16 unk_1D7C;
/* 0x1D7E */ s16 unk_1D7E;
} Boss02; // size = 0x1D80
tools/disasm/functions.txt
+4 -4
View File
@@ -9292,9 +9292,9 @@
0x809D6C98:("func_809D6C98",),
0x809D6E7C:("func_809D6E7C",),
0x809D73D4:("func_809D73D4",),
0x809DA1D0:("func_809DA1D0",),
0x809DA22C:("func_809DA22C",),
0x809DA24C:("func_809DA24C",),
0x809DA1D0:("Boss02_FillScreen",),
0x809DA22C:("Boss02_SetFillScreenAlpha",),
0x809DA24C:("Boss02_StopFillScreen",),
0x809DA264:("Boss02_SpawnEffectSand",),
0x809DA344:("Boss02_SpawnEffectFragment",),
0x809DA460:("Boss02_SpawnEffectFlash",),
@@ -9313,7 +9313,7 @@
0x809DD0A8:("Boss02_Static_Draw",),
0x809DD0CC:("Boss02_UpdateEffects",),
0x809DD2F8:("Boss02_DrawEffects",),
0x809DD934:("func_809DD934",),
0x809DD934:("Boss02_HandleGiantsMaskCutscene",),
0x809DEAC4:("func_809DEAC4",),
0x809E2760:("Boss03_PlayUnderwaterSfx",),
0x809E2788:("Boss03_SpawnEffectWetSpot",),
tools/disasm/variables.txt
+3 -3
View File
@@ -10109,9 +10109,9 @@
0x809DFD34:("D_809DFD34","f32","",0x4),
0x809DFD38:("D_809DFD38","f32","",0x4),
0x809DFD3C:("D_809DFD3C","f32","",0x4),
0x809E0420:("D_809E0420","UNK_TYPE1","",0x1),
0x809E0421:("D_809E0421","UNK_TYPE1","",0x1),
0x809E0422:("D_809E0422","UNK_TYPE1","",0x1),
0x809E0420:("sCanSkipMaskOnCs","UNK_TYPE1","",0x1),
0x809E0421:("sCanSkipMaskOffCs","UNK_TYPE1","",0x1),
0x809E0422:("sIsInGiantMode","UNK_TYPE1","",0x1),
0x809E0424:("sRedTwinmold","UNK_TYPE4","",0x4),
0x809E0428:("sBlueTwinmold","UNK_TYPE4","",0x4),
0x809E042C:("sTwinmoldStatic","UNK_TYPE4","",0x4),