Import Camera Data (#1097)

* import camera data

* cleanup

* easier-to-read cam-hud-visibility

* PR Suggestions

* fix camflag macros

* fix bss

* camera data summary

* small cleanup

* cleanup camera data

* cam data mode enums

include/functions.h

@@ -960,115 +960,6 @@ s32 DynaPolyActor_IsInSwitchPressedState(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_IsInHeavySwitchPressedState(DynaPolyActor* dynaActor);
 s32 DynaPolyActor_ValidateMove(PlayState* play, DynaPolyActor* dynaActor, s16 startRadius, s16 endRadius, s16 startHeight);
 
-// void func_800CBC84(void);
-// void func_800CBFA4(void);
-// void func_800CC000(void);
-// void func_800CC128(void);
-// void func_800CC1C4(void);
-// void func_800CC260(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE2 param_6);
-// void func_800CC488(void);
-// void func_800CC56C(void);
-// void func_800CC5C8(void);
-// void Camera_GetBgCamOrActorCsCamSetting(void);
-// void Camera_GetBgCamOrActorCsCamFuncData(void);
-// void Camera_GetBgCamIndex(void);
-// void Camera_GetWaterBoxBgCamSetting(void);
-// void func_800CC938(void);
-// void func_800CC958(void);
-// void func_800CC9C0(void);
-// void func_800CCCEC(void);
-// void func_800CD04C(void);
-// void func_800CD288(void);
-// void func_800CD2E0(void);
-// void func_800CD2F0(void);
-// void func_800CD3E4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
-// void func_800CD44C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
-// void func_800CD634(void);
-// void func_800CD6CC(void);
-// void func_800CD6F8(void);
-// void func_800CD834(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
-// void func_800CDA14(void);
-// void func_800CDB6C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE2 param_6);
-// void func_800CDE6C(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_TYPE4 param_7, UNK_TYPE2 param_8);
-// void func_800CE2B8(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_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE2 param_9);
-// void func_800CE5E0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
-// void func_800CE79C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
-// void func_800CE930(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
-// void func_800CEAD8(void);
-// void func_800CEC38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
-// void func_800CED90(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_TYPE4 param_7);
-s32 Camera_ModeNop(Camera* camera);
-s32 Camera_ModeNORM1(Camera* camera);
-s32 Camera_ModeNORM2(Camera* camera);
-s32 Camera_ModeNORM3(Camera* camera);
-s32 Camera_ModeNORM4(Camera* camera);
-s32 Camera_ModeNORM0(Camera* camera);
-s32 Camera_ModePARA1(Camera* camera);
-s32 Camera_ModePARA2(Camera* camera);
-s32 Camera_ModePARA3(Camera* camera);
-s32 Camera_ModePARA4(Camera* camera);
-s32 Camera_ModePARA0(Camera* camera);
-s32 Camera_ModeJUMP1(Camera* camera);
-s32 Camera_ModeJUMP2(Camera* camera);
-s32 Camera_ModeJUMP3(Camera* camera);
-s32 Camera_ModeJUMP4(Camera* camera);
-s32 Camera_ModeJUMP0(Camera* camera);
-s32 Camera_ModeBATT1(Camera* camera);
-s32 Camera_ModeBATT2(Camera* camera);
-s32 Camera_ModeBATT3(Camera* camera);
-s32 Camera_ModeBATT4(Camera* camera);
-s32 Camera_ModeBATT0(Camera* camera);
-s32 Camera_ModeKEEP1(Camera* camera);
-s32 Camera_ModeKEEP2(Camera* camera);
-s32 Camera_ModeKEEP3(Camera* camera);
-s32 Camera_ModeKEEP4(Camera* camera);
-// void func_800D7C44(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6, UNK_TYPE1 param_7, UNK_TYPE1 param_8, UNK_TYPE1 param_9, UNK_TYPE1 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12);
-s32 Camera_ModeKEEP0(Camera* camera);
-s32 Camera_ModeFIXD1(Camera* camera);
-s32 Camera_ModeFIXD2(Camera* camera);
-s32 Camera_ModeFIXD3(Camera* camera);
-s32 Camera_ModeFIXD4(Camera* camera);
-s32 Camera_ModeFIXD0(Camera* camera);
-s32 Camera_ModeSUBJ1(Camera* camera);
-s32 Camera_ModeSUBJ2(Camera* camera);
-s32 Camera_ModeSUBJ3(Camera* camera);
-s32 Camera_ModeSUBJ4(Camera* camera);
-s32 Camera_ModeSUBJ0(Camera* camera);
-s32 Camera_ModeDATA0(Camera* camera);
-s32 Camera_ModeDATA1(Camera* camera);
-s32 Camera_ModeDATA2(Camera* camera);
-s32 Camera_ModeDATA3(Camera* camera);
-s32 Camera_ModeDATA4(Camera* camera);
-s32 Camera_ModeUNIQ1(Camera* camera);
-s32 Camera_ModeUNIQ2(Camera* camera);
-s32 Camera_ModeUNIQ3(Camera* camera);
-s32 Camera_ModeUNIQ4(Camera* camera);
-s32 Camera_ModeUNIQ5(Camera* camera);
-s32 Camera_ModeUNIQ0(Camera* camera);
-s32 Camera_ModeUNIQ6(Camera* camera);
-s32 Camera_ModeUNIQ7(Camera* camera);
-s32 Camera_ModeUNIQ8(Camera* camera);
-s32 Camera_ModeUNIQ9(Camera* camera);
-s32 Camera_ModeDEMO1(Camera* camera);
-s32 Camera_ModeDEMO2(Camera* camera);
-s32 Camera_ModeDEMO3(Camera* camera);
-s32 Camera_ModeDEMO4(Camera* camera);
-s32 Camera_ModeDEMO5(Camera* camera);
-s32 Camera_ModeDEMO6(Camera* camera);
-s32 Camera_ModeDEMO7(Camera* camera);
-s32 Camera_ModeDEMO8(Camera* camera);
-s32 Camera_ModeDEMO9(Camera* camera);
-s32 Camera_ModeDEMO0(Camera* camera);
-s32 Camera_ModeSPEC0(Camera* camera);
-s32 Camera_ModeSPEC1(Camera* camera);
-s32 Camera_ModeSPEC2(Camera* camera);
-s32 Camera_ModeSPEC3(Camera* camera);
-s32 Camera_ModeSPEC4(Camera* camera);
-s32 Camera_ModeSPEC5(Camera* camera);
-s32 Camera_ModeSPEC6(Camera* camera);
-s32 Camera_ModeSPEC7(Camera* camera);
-s32 Camera_ModeSPEC8(Camera* camera);
-s32 Camera_ModeSPEC9(Camera* camera);
 Camera* Camera_Alloc(View* view, CollisionContext* bg, PlayState* play);
 void Camera_Free(Camera* camera);
 void Camera_Init(Camera* camera, View* view, CollisionContext* bg, PlayState* play);
@@ -1102,7 +993,7 @@ s32 Camera_SetViewParam(Camera* camera, s32 viewFlag, void* param);
 // UNK_TYPE4 func_800DFF44(void);
 s16 Camera_SetFlags(Camera* iParm1, s16 flags);
 s16 Camera_ClearFlags(Camera* camera, s16 flags);
-s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamDataId, f32 arg3, s16 timer1, s16 timer2, s16 timer3);
+s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 arg3, s16 timer1, s16 timer2, s16 timer3);
 s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera);
 // UNK_TYPE4 func_800E01AC(void);
 Vec3f* Camera_GetQuakeOffset(Vec3f* dst, Camera* camera);
@@ -1113,6 +1004,7 @@ void Camera_SetToTrackActor(Camera* camera, Actor* actor);
 void Camera_SetTargetActor(Camera* camera, Actor* actor);
 f32 Camera_GetWaterYPos(Camera* camera);
 void func_800E0348(Camera* camera);
+
 DamageTable* DamageTable_Get(s32 index);
 void DamageTable_Clear(DamageTable* damageTable);
 f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* at, ColliderInfo* atInfo, Collider* ac, ColliderInfo* acInfo, u32* effect);

include/variables.h

@@ -433,392 +433,7 @@ extern s32 gMaxActorId;
 extern BgCheckSceneSubdivisionEntry sSceneSubdivisionList[];
 extern BgSpecialSceneMaxObjects sCustomDynapolyMem[];
 // extern UNK_TYPE1 D_801B4708;
-// extern UNK_TYPE1 D_801B4710;
-// extern UNK_TYPE1 D_801B4738;
-// extern UNK_TYPE1 D_801B4768;
-// extern UNK_TYPE1 D_801B4798;
-// extern UNK_TYPE1 D_801B47CC;
-// extern UNK_TYPE1 D_801B47F0;
-// extern UNK_TYPE1 D_801B4824;
-// extern UNK_TYPE1 D_801B4848;
-// extern UNK_TYPE1 D_801B486C;
-// extern UNK_TYPE1 D_801B4890;
-// extern UNK_TYPE1 D_801B48B0;
-// extern UNK_TYPE1 D_801B48D4;
-// extern UNK_TYPE1 D_801B48F8;
-// extern UNK_TYPE1 D_801B491C;
-// extern UNK_TYPE1 D_801B4944;
-// extern UNK_TYPE1 D_801B4974;
-// extern UNK_TYPE1 D_801B49A4;
-// extern UNK_TYPE1 D_801B49D4;
-// extern UNK_TYPE1 D_801B4A04;
-// extern UNK_TYPE1 D_801B4A34;
-// extern UNK_TYPE1 D_801B4A5C;
-// extern UNK_TYPE1 D_801B4A8C;
-// extern UNK_TYPE1 D_801B4ABC;
-// extern UNK_TYPE1 D_801B4AE0;
-// extern UNK_TYPE1 D_801B4B08;
-// extern UNK_TYPE1 D_801B4B38;
-// extern UNK_TYPE1 D_801B4B60;
-// extern UNK_TYPE1 D_801B4B90;
-// extern UNK_TYPE1 D_801B4BB8;
-// extern UNK_TYPE1 D_801B4BDC;
-// extern UNK_TYPE1 D_801B4C04;
-// extern UNK_TYPE1 D_801B4C34;
-// extern UNK_TYPE1 D_801B4C5C;
-// extern UNK_TYPE1 D_801B4C84;
-// extern UNK_TYPE1 D_801B4CAC;
-// extern UNK_TYPE1 D_801B4CD4;
-// extern UNK_TYPE1 D_801B4CFC;
-// extern UNK_TYPE1 D_801B4D24;
-// extern UNK_TYPE1 D_801B4D34;
-// extern UNK_TYPE1 D_801B4D44;
-// extern UNK_TYPE1 D_801B4D68;
-// extern UNK_TYPE1 D_801B4D8C;
-// extern UNK_TYPE1 D_801B4DB0;
-// extern UNK_TYPE1 D_801B4DD4;
-// extern UNK_TYPE1 D_801B4DF8;
-// extern UNK_TYPE1 D_801B4E2C;
-// extern UNK_TYPE1 D_801B4E5C;
-// extern UNK_TYPE1 D_801B4E90;
-// extern UNK_TYPE1 D_801B4EB4;
-// extern UNK_TYPE1 D_801B4ED8;
-// extern UNK_TYPE1 D_801B4EDC;
-// extern UNK_TYPE1 D_801B4EE4;
-// extern UNK_TYPE1 D_801B4EF0;
-// extern UNK_TYPE1 D_801B4EF4;
-// extern UNK_TYPE1 D_801B4EF8;
-// extern UNK_TYPE1 D_801B4F20;
-// extern UNK_TYPE1 D_801B4F50;
-// extern UNK_TYPE1 D_801B4F78;
-// extern UNK_TYPE1 D_801B4FA0;
-// extern UNK_TYPE1 D_801B4FC8;
-// extern UNK_TYPE1 D_801B4FF0;
-// extern UNK_TYPE1 D_801B5018;
-// extern UNK_TYPE1 D_801B5034;
-// extern UNK_TYPE1 D_801B5050;
-// extern UNK_TYPE1 D_801B506C;
-// extern UNK_TYPE1 D_801B507C;
-// extern UNK_TYPE1 D_801B5094;
-// extern UNK_TYPE1 D_801B50BC;
-// extern UNK_TYPE1 D_801B50EC;
-// extern UNK_TYPE1 D_801B511C;
-// extern UNK_TYPE1 D_801B5150;
-// extern UNK_TYPE1 D_801B5180;
-// extern UNK_TYPE1 D_801B51A8;
-// extern UNK_TYPE1 D_801B51D8;
-// extern UNK_TYPE1 D_801B51FC;
-// extern UNK_TYPE1 D_801B5220;
-// extern UNK_TYPE1 D_801B5250;
-// extern UNK_TYPE1 D_801B5280;
-// extern UNK_TYPE1 D_801B52B0;
-// extern UNK_TYPE1 D_801B52E0;
-// extern UNK_TYPE1 D_801B5308;
-// extern UNK_TYPE1 D_801B5338;
-// extern UNK_TYPE1 D_801B535C;
-// extern UNK_TYPE1 D_801B5380;
-// extern UNK_TYPE1 D_801B53A4;
-// extern UNK_TYPE1 D_801B53C8;
-// extern UNK_TYPE1 D_801B53EC;
-// extern UNK_TYPE1 D_801B5410;
-// extern UNK_TYPE1 D_801B5434;
-// extern UNK_TYPE1 D_801B5458;
-// extern UNK_TYPE1 D_801B547C;
-// extern UNK_TYPE1 D_801B54A0;
-// extern UNK_TYPE1 D_801B54C4;
-// extern UNK_TYPE1 D_801B54E8;
-// extern UNK_TYPE1 D_801B550C;
-// extern UNK_TYPE1 D_801B5530;
-// extern UNK_TYPE1 D_801B5554;
-// extern UNK_TYPE1 D_801B5578;
-// extern UNK_TYPE1 D_801B559C;
-// extern UNK_TYPE1 D_801B55C0;
-// extern UNK_TYPE1 D_801B55E4;
-// extern UNK_TYPE1 D_801B5608;
-// extern UNK_TYPE1 D_801B562C;
-// extern UNK_TYPE1 D_801B5650;
-// extern UNK_TYPE1 D_801B5674;
-// extern UNK_TYPE1 D_801B5698;
-// extern UNK_TYPE1 D_801B56BC;
-// extern UNK_TYPE1 D_801B56E0;
-// extern UNK_TYPE1 D_801B5704;
-// extern UNK_TYPE1 D_801B5728;
-// extern UNK_TYPE1 D_801B574C;
-// extern UNK_TYPE1 D_801B5770;
-// extern UNK_TYPE1 D_801B577C;
-// extern UNK_TYPE1 D_801B57A4;
-// extern UNK_TYPE1 D_801B57CC;
-// extern UNK_TYPE1 D_801B57F4;
-// extern UNK_TYPE1 D_801B5824;
-// extern UNK_TYPE1 D_801B5834;
-// extern UNK_TYPE1 D_801B5844;
-// extern UNK_TYPE1 D_801B5864;
-// extern UNK_TYPE1 D_801B5884;
-// extern UNK_TYPE1 D_801B58A0;
-// extern UNK_TYPE1 D_801B58BC;
-// extern UNK_TYPE1 D_801B58D8;
-// extern UNK_TYPE1 D_801B58F4;
-// extern UNK_TYPE1 D_801B5904;
-// extern UNK_TYPE1 D_801B5928;
-// extern UNK_TYPE1 D_801B5950;
-// extern UNK_TYPE1 D_801B5978;
-// extern UNK_TYPE1 D_801B59A8;
-// extern UNK_TYPE1 D_801B59D0;
-// extern UNK_TYPE1 D_801B59F4;
-// extern UNK_TYPE1 D_801B5A00;
-// extern UNK_TYPE1 D_801B5A0C;
-// extern UNK_TYPE1 D_801B5A30;
-// extern UNK_TYPE1 D_801B5A64;
-// extern UNK_TYPE1 D_801B5A94;
-// extern UNK_TYPE1 D_801B5ABC;
-// extern UNK_TYPE1 D_801B5AF0;
-// extern UNK_TYPE1 D_801B5B18;
-// extern UNK_TYPE1 D_801B5B40;
-// extern UNK_TYPE1 D_801B5B70;
-// extern UNK_TYPE1 D_801B5B98;
-// extern UNK_TYPE1 D_801B5BC8;
-// extern UNK_TYPE1 D_801B5BFC;
-// extern UNK_TYPE1 D_801B5C30;
-// extern UNK_TYPE1 D_801B5C58;
-// extern UNK_TYPE1 D_801B5C80;
-// extern UNK_TYPE1 D_801B5CB0;
-// extern UNK_TYPE1 D_801B5CCC;
-// extern UNK_TYPE1 D_801B5CE8;
-// extern UNK_TYPE1 D_801B5D10;
-// extern UNK_TYPE1 D_801B5D40;
-// extern UNK_TYPE1 D_801B5D74;
-// extern UNK_TYPE1 D_801B5D9C;
-// extern UNK_TYPE1 D_801B5DC4;
-// extern UNK_TYPE1 D_801B5DD4;
-// extern UNK_TYPE1 D_801B5DFC;
-// extern UNK_TYPE1 D_801B5E2C;
-// extern UNK_TYPE1 D_801B5E48;
-// extern UNK_TYPE1 D_801B5E64;
-// extern UNK_TYPE1 D_801B5E8C;
-// extern UNK_TYPE1 D_801B5EB4;
-// extern UNK_TYPE1 D_801B5EDC;
-// extern UNK_TYPE1 D_801B5F0C;
-// extern UNK_TYPE1 D_801B5F34;
-// extern UNK_TYPE1 D_801B5F5C;
-// extern UNK_TYPE1 D_801B5F8C;
-// extern UNK_TYPE1 D_801B5FB0;
-// extern UNK_TYPE1 D_801B5FD4;
-// extern UNK_TYPE1 D_801B5FF8;
-// extern UNK_TYPE1 D_801B601C;
-// extern UNK_TYPE1 D_801B6044;
-// extern UNK_TYPE1 D_801B6074;
-// extern UNK_TYPE1 D_801B60A4;
-// extern UNK_TYPE1 D_801B60D8;
-// extern UNK_TYPE1 D_801B610C;
-// extern UNK_TYPE1 D_801B6130;
-// extern UNK_TYPE1 D_801B6154;
-// extern UNK_TYPE1 D_801B617C;
-// extern UNK_TYPE1 D_801B61AC;
-// extern UNK_TYPE1 D_801B61DC;
-// extern UNK_TYPE1 D_801B620C;
-// extern UNK_TYPE1 D_801B623C;
-// extern UNK_TYPE1 D_801B626C;
-// extern UNK_TYPE1 D_801B6294;
-// extern UNK_TYPE1 D_801B62C4;
-// extern UNK_TYPE1 D_801B62F4;
-// extern UNK_TYPE1 D_801B631C;
-// extern UNK_TYPE1 D_801B634C;
-// extern UNK_TYPE1 D_801B6374;
-// extern UNK_TYPE1 D_801B63A4;
-// extern UNK_TYPE1 D_801B63CC;
-// extern UNK_TYPE1 D_801B63FC;
-// extern UNK_TYPE1 D_801B6418;
-// extern UNK_TYPE1 D_801B6434;
-// extern UNK_TYPE1 D_801B645C;
-// extern UNK_TYPE1 D_801B648C;
-// extern UNK_TYPE1 D_801B64B4;
-// extern UNK_TYPE1 D_801B64D8;
-// extern UNK_TYPE1 D_801B64FC;
-// extern UNK_TYPE1 D_801B652C;
-// extern UNK_TYPE1 D_801B655C;
-// extern UNK_TYPE1 D_801B6584;
-// extern UNK_TYPE1 D_801B65AC;
-// extern UNK_TYPE1 D_801B65DC;
-// extern UNK_TYPE1 D_801B660C;
-// extern UNK_TYPE1 D_801B6640;
-// extern UNK_TYPE1 D_801B6674;
-// extern UNK_TYPE1 D_801B6698;
-// extern UNK_TYPE1 D_801B66C0;
-// extern UNK_TYPE1 D_801B66E8;
-// extern UNK_TYPE1 D_801B6710;
-// extern UNK_TYPE1 D_801B6740;
-// extern UNK_TYPE1 D_801B6774;
-// extern UNK_TYPE1 D_801B679C;
-// extern UNK_TYPE1 D_801B67C4;
-// extern UNK_TYPE1 D_801B67EC;
-// extern UNK_TYPE1 D_801B681C;
-// extern UNK_TYPE1 D_801B684C;
-// extern UNK_TYPE1 D_801B6880;
-// extern UNK_TYPE1 D_801B68A8;
-// extern UNK_TYPE1 D_801B68D0;
-// extern UNK_TYPE1 D_801B68F8;
-// extern UNK_TYPE1 D_801B692C;
-// extern UNK_TYPE1 D_801B6954;
-// extern UNK_TYPE1 D_801B697C;
-// extern UNK_TYPE1 D_801B69A4;
-// extern UNK_TYPE1 D_801B69CC;
-// extern UNK_TYPE1 D_801B69FC;
-// extern UNK_TYPE1 D_801B6A30;
-// extern UNK_TYPE1 D_801B6A58;
-// extern UNK_TYPE1 D_801B6A80;
-// extern UNK_TYPE1 D_801B6AA8;
-// extern UNK_TYPE1 D_801B6AD0;
-// extern UNK_TYPE1 D_801B6AF8;
-// extern UNK_TYPE1 D_801B6B28;
-// extern UNK_TYPE1 D_801B6B50;
-// extern UNK_TYPE1 D_801B6B78;
-// extern UNK_TYPE1 D_801B6BA0;
-// extern UNK_TYPE1 D_801B6BC8;
-// extern UNK_TYPE1 D_801B6BF0;
-// extern UNK_TYPE1 D_801B6C18;
-// extern UNK_TYPE1 D_801B6C48;
-// extern UNK_TYPE1 D_801B6C70;
-// extern UNK_TYPE1 D_801B6C98;
-// extern UNK_TYPE1 D_801B6CC0;
-// extern UNK_TYPE1 D_801B6CF0;
-// extern UNK_TYPE1 D_801B6D24;
-// extern UNK_TYPE1 D_801B6D4C;
-// extern UNK_TYPE1 D_801B6D74;
-// extern UNK_TYPE1 D_801B6D90;
-// extern UNK_TYPE1 D_801B6DB8;
-// extern UNK_TYPE1 D_801B6DE0;
-// extern UNK_TYPE1 D_801B6E08;
-// extern UNK_TYPE1 D_801B6E30;
-// extern UNK_TYPE1 D_801B6E58;
-// extern UNK_TYPE1 D_801B6E80;
-// extern UNK_TYPE1 D_801B6EA8;
-// extern UNK_TYPE1 D_801B6ED0;
-// extern UNK_TYPE1 D_801B6EF8;
-// extern UNK_TYPE1 D_801B6F20;
-// extern UNK_TYPE1 D_801B6F50;
-// extern UNK_TYPE1 D_801B6F78;
-// extern UNK_TYPE1 D_801B6FA0;
-// extern UNK_TYPE1 D_801B6FB0;
-// extern UNK_TYPE1 D_801B6FD8;
-// extern UNK_TYPE1 D_801B7008;
-// extern UNK_TYPE1 D_801B703C;
-// extern UNK_TYPE1 D_801B7064;
-// extern UNK_TYPE1 D_801B708C;
-// extern UNK_TYPE1 D_801B70BC;
-// extern UNK_TYPE1 D_801B70E4;
-// extern UNK_TYPE1 D_801B7114;
-// extern UNK_TYPE1 D_801B7148;
-// extern UNK_TYPE1 D_801B7170;
-// extern UNK_TYPE1 D_801B71A0;
-// extern UNK_TYPE1 D_801B71D4;
-// extern UNK_TYPE1 D_801B7204;
-// extern UNK_TYPE1 D_801B7210;
-// extern UNK_TYPE1 D_801B7244;
-// extern UNK_TYPE1 D_801B7278;
-// extern UNK_TYPE1 D_801B729C;
-// extern UNK_TYPE1 D_801B72C0;
-// extern UNK_TYPE1 D_801B72E4;
-// extern UNK_TYPE1 D_801B7308;
-// extern UNK_TYPE1 D_801B732C;
-// extern UNK_TYPE1 D_801B7354;
-// extern UNK_TYPE1 D_801B7384;
-// extern UNK_TYPE1 D_801B73AC;
-// extern UNK_TYPE1 D_801B73D4;
-// extern UNK_TYPE1 D_801B74C4;
-// extern UNK_TYPE1 D_801B759C;
-// extern UNK_TYPE1 D_801B75F4;
-// extern UNK_TYPE1 D_801B767C;
-// extern UNK_TYPE1 D_801B7684;
-// extern UNK_TYPE1 D_801B768C;
-// extern UNK_TYPE1 D_801B7694;
-// extern UNK_TYPE1 D_801B769C;
-// extern UNK_TYPE1 D_801B76A4;
-// extern UNK_TYPE1 D_801B76AC;
-// extern UNK_TYPE1 D_801B777C;
-// extern UNK_TYPE1 D_801B784C;
-// extern UNK_TYPE1 D_801B791C;
-// extern UNK_TYPE1 D_801B7984;
-// extern UNK_TYPE1 D_801B79EC;
-// extern UNK_TYPE1 D_801B79F4;
-// extern UNK_TYPE1 D_801B7AE4;
-// extern UNK_TYPE1 D_801B7B14;
-// extern UNK_TYPE1 D_801B7B44;
-// extern UNK_TYPE1 D_801B7B74;
-// extern UNK_TYPE1 D_801B7BA4;
-// extern UNK_TYPE1 D_801B7BAC;
-// extern UNK_TYPE1 D_801B7BDC;
-// extern UNK_TYPE1 D_801B7C0C;
-// extern UNK_TYPE1 D_801B7C3C;
-// extern UNK_TYPE1 D_801B7C44;
-// extern UNK_TYPE1 D_801B7C54;
-// extern UNK_TYPE1 D_801B7C5C;
-// extern UNK_TYPE1 D_801B7C64;
-// extern UNK_TYPE1 D_801B7D34;
-// extern UNK_TYPE1 D_801B7D3C;
-// extern UNK_TYPE1 D_801B7D44;
-// extern UNK_TYPE1 D_801B7D4C;
-// extern UNK_TYPE1 D_801B7D54;
-// extern UNK_TYPE1 D_801B7D5C;
-// extern UNK_TYPE1 D_801B7D64;
-// extern UNK_TYPE1 D_801B7DCC;
-// extern UNK_TYPE1 D_801B7DD4;
-// extern UNK_TYPE1 D_801B7E3C;
-// extern UNK_TYPE1 D_801B7F0C;
-// extern UNK_TYPE1 D_801B7F14;
-// extern UNK_TYPE1 D_801B7F1C;
-// extern UNK_TYPE1 D_801B7F24;
-// extern UNK_TYPE1 D_801B7F2C;
-// extern UNK_TYPE1 D_801B7F34;
-// extern UNK_TYPE1 D_801B7F3C;
-// extern UNK_TYPE1 D_801B7FAC;
-// extern UNK_TYPE1 D_801B807C;
-// extern UNK_TYPE1 D_801B8084;
-// extern UNK_TYPE1 D_801B8154;
-// extern UNK_TYPE1 D_801B8224;
-// extern UNK_TYPE1 D_801B82F4;
-// extern UNK_TYPE1 D_801B82FC;
-// extern UNK_TYPE1 D_801B8304;
-// extern UNK_TYPE1 D_801B83D4;
-// extern UNK_TYPE1 D_801B83DC;
-// extern UNK_TYPE1 D_801B8434;
-// extern UNK_TYPE1 D_801B843C;
-// extern UNK_TYPE1 D_801B8444;
-// extern UNK_TYPE1 D_801B8514;
-// extern UNK_TYPE1 D_801B85E4;
-// extern UNK_TYPE1 D_801B8664;
-// extern UNK_TYPE1 D_801B8754;
-// extern UNK_TYPE1 D_801B875C;
-// extern UNK_TYPE1 D_801B87C4;
-// extern UNK_TYPE1 D_801B8894;
-// extern UNK_TYPE1 D_801B8964;
-// extern UNK_TYPE1 D_801B8A34;
-// extern UNK_TYPE1 D_801B8B04;
-// extern UNK_TYPE1 D_801B8BD4;
-// extern UNK_TYPE1 D_801B8CAC;
-// extern UNK_TYPE1 D_801B8CB4;
-// extern UNK_TYPE1 D_801B8D8C;
-// extern UNK_TYPE1 D_801B8E5C;
-// extern UNK_TYPE1 D_801B8F2C;
-// extern UNK_TYPE1 D_801B8F34;
-// extern UNK_TYPE1 D_801B900C;
-// extern UNK_TYPE1 D_801B90D4;
-// extern UNK_TYPE1 D_801B91A4;
-// extern UNK_TYPE1 D_801B91AC;
-// extern UNK_TYPE1 D_801B927C;
-// extern UNK_TYPE1 D_801B9354;
-// extern UNK_TYPE1 D_801B9424;
-// extern UNK_TYPE1 D_801B94F4;
-// extern UNK_TYPE1 D_801B95C4;
-// extern UNK_TYPE1 D_801B95CC;
-// extern UNK_TYPE1 D_801B969C;
-// extern UNK_TYPE1 D_801B976C;
-// extern UNK_TYPE1 D_801B979C;
-// extern CameraStateParams cameraStates[91];
-// extern UNK_TYPE1 D_801B9CE2;
-// extern UNK_PTR D_801B9CE4;
-// extern camera_update_func cameraUpdateFuncs[71];
-// extern UNK_TYPE2 D_801B9E04;
-// extern UNK_TYPE4 D_801B9E08;
+
 // extern UNK_TYPE4 D_801B9E0C;
 // extern UNK_TYPE4 D_801B9E10;
 // extern UNK_TYPE4 D_801B9E14;
@@ -833,8 +448,8 @@ extern BgSpecialSceneMaxObjects sCustomDynapolyMem[];
 // extern UNK_TYPE1 D_801B9E84;
 // extern UNK_TYPE4 D_801B9EB4;
 // extern UNK_TYPE4 D_801B9ED4;
-// extern UNK_TYPE4 D_801B9F04;
-// extern UNK_TYPE2 D_801B9F0C;
+// extern UNK_TYPE4 sEarthquakeFreq;
+// extern UNK_TYPE2 sEarthquakeTimer;
 extern UNK_TYPE4 D_801B9F10;
 extern DamageTable sDamageTablePresets[23];
 extern f32 damageMultipliers[16];

include/z64.h

@@ -111,17 +111,6 @@ typedef struct {
     /* 0x8 */ void* end;
 } PolygonType2; // size = 0xC
 
-typedef struct {
-    /* 0x0 */ s16 func;
-    /* 0x2 */ UNK_TYPE1 pad2[0x6];
-} CameraModeParams; // size = 0x8
-
-typedef struct {
-    /* 0x0 */ u32 validModes;
-    /* 0x4 */ UNK_TYPE1 pad4[0x4];
-    /* 0x8 */ CameraModeParams* modes;
-} CameraStateParams; // size = 0xC
-
 typedef struct {
     /* 0x0 */ s16 x;
     /* 0x2 */ s16 y;

include/z64bgcheck.h

@@ -108,7 +108,7 @@ typedef struct {
     // 0x0008_0000 = ?
     // 0x0007_E000 = room index, 0x3F = all rooms
     // 0x0000_1F00 = lighting setting index
-    // 0x0000_00FF = CamData index
+    // 0x0000_00FF = bgCam index
 } WaterBox; // size = 0x10
 
 typedef struct {
@@ -122,7 +122,7 @@ typedef struct {
     // 0x001C_0000 = ?
     // 0x0003_E000 = ?
     // 0x0000_1F00 = scene exit index
-    // 0x0000_00FF = CamData index
+    // 0x0000_00FF = bgCam index
     // Word 1
     // 0x0800_0000 = wall damage
     // 0x07E0_0000 = conveyor direction

include/z64scene.h

@@ -289,7 +289,7 @@ typedef struct {
 typedef struct {
     struct {
         s8 room;    // Room to switch to
-        s8 bgCamDataId; // How the camera reacts during the transition. -2 for spiral staircase. -1 for generic door. 0+ will index scene CamData
+        s8 bgCamIndex; // How the camera reacts during the transition. -2 for spiral staircase. -1 for generic door. 0+ will index scene CamData
     } /* 0x0 */ sides[2]; // 0 = front, 1 = back
     /* 0x4 */ s16   id;
     /* 0x6 */ Vec3s pos;

spec

@@ -451,8 +451,6 @@ beginseg
     include "build/src/code/z_bg_collect.o"
     include "build/src/code/z_bg_item.o"
     include "build/src/code/z_camera.o"
-    include "build/data/code/z_camera.data.o"
-    include "build/data/code/z_camera.bss.o"
     include "build/src/code/z_collision_btltbls.o"
     pad_text
     include "build/src/code/z_collision_check.o"

src/boot_O2_g3/idle.c

@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 
 u8 D_80096B20 = 1;

src/code/z_camera.c

@@ -1,8 +1,23 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64quake.h"
 #include "z64shrink_window.h"
 #include "z64view.h"
 
+#include "z_camera_data.inc.c"
+
+// BSS
+s16 D_801EDBF0;
+f32 D_801EDBF4;
+f32 D_801EDBF8;
+CameraCollision D_801EDC00;
+
+PlayState* sCamPlayState;
+SwingAnimation D_801EDC30[4];
+Vec3f D_801EDDD0;
+Vec3f D_801EDDE0;
+Vec3f D_801EDDF0;
+
 /**
  * Returns the absolute value for floats
  */
@@ -535,6 +550,9 @@ s32 Camera_GetWaterBoxBgCamSetting(Camera* camera, f32* waterY) {
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CC9C0.s")
 
+s32 D_801B9E5C = 0;
+f32 D_801B9E60 = 0.0f;
+
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CCCEC.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CD04C.s")
@@ -577,147 +595,175 @@ s32 Camera_GetWaterBoxBgCamSetting(Camera* camera, f32* waterY) {
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800CED90.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNop.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Noop.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeNORM0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Normal0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModePARA0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Parallel0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeJUMP0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Jump0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeBATT0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Battle0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeKEEP0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_KeepOn0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeFIXD0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Fixed0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subject1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subject2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subject3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subject4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSUBJ0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Subject0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDATA4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Data4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ5.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique5.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ6.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique6.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ7.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique7.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ8.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique8.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeUNIQ9.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Unique9.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO2.s")
+// Data for opening chests (default)
+VecSph D_801B9E64[] = {
+    { 50.0f, 0xEE3A, 0xD558 },
+    { 75.0f, 0x0000, 0x8008 },
+    { 80.0f, 0xEE3A, 0x8008 },
+    { 15.0f, 0xEE3A, 0x8008 },
+};
+Vec3f D_801B9E84[] = {
+    { 0.0f, 40.0f, 20.0f },
+    { 0.0f, 40.0f, 0.0f },
+    { 0.0f, 3.0f, -3.0f },
+    { 0.0f, 3.0f, -3.0f },
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO3.s")
+// Data for opening chests (goron)
+VecSph D_801B9EB4[] = {
+    { 60.0f, 0xEE3A, 0xD558 },
+    { 95.0f, 0x0000, 0x8008 },
+    { 90.0f, 0xEE3A, 0x8008 },
+    { 20.0f, 0xEE3A, 0x8008 },
+};
+Vec3f D_801B9ED4[] = {
+    { 0.0f, 40.0f, 20.0f },
+    { 0.0f, 40.0f, 0.0f },
+    { 0.0f, 3.0f, -3.0f },
+    { 0.0f, 3.0f, -3.0f },
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO5.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO6.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO7.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo5.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO8.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo6.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO9.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo7.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeDEMO0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo8.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo9.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC1.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Demo0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC2.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC3.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special1.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special2.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC5.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special3.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC6.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC7.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special5.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC8.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special6.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ModeSPEC9.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special7.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Special9.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Alloc.s")
 
@@ -735,6 +781,14 @@ s32 Camera_GetWaterBoxBgCamSetting(Camera* camera, f32* waterY) {
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE324.s")
 
+s16 sEarthquakeFreq[] = {
+    0xFFC, // 1 Large Earthquake  between CLOCK_TIME(0, 00) to CLOCK_TIME(1, 30)
+    0x7FC, // 2 Large Earthquakes between CLOCK_TIME(1, 30) to CLOCK_TIME(3, 00)
+    0x3FC, // 4 Large Earthquakes between CLOCK_TIME(3, 00) to CLOCK_TIME(4, 30)
+    0x1FC, // 8 Large Earthquakes between CLOCK_TIME(4, 30) to CLOCK_TIME(6, 00)
+};
+s16 sEarthquakeTimer = 0;
+
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE62C.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DE840.s")
@@ -745,6 +799,8 @@ s32 Camera_GetWaterBoxBgCamSetting(Camera* camera, f32* waterY) {
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_Update.s")
 
+s32 sModeChangeFlags = 0;
+
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800DF498.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_SetMode.s")

tools/disasm/functions.txt

@@ -1182,77 +1182,77 @@
     0x800CEAD8:("func_800CEAD8",),
     0x800CEC38:("func_800CEC38",),
     0x800CED90:("func_800CED90",),
-    0x800CF3A4:("Camera_ModeNop",),
-    0x800CF3B4:("Camera_ModeNORM1",),
-    0x800D0874:("Camera_ModeNORM2",),
-    0x800D0894:("Camera_ModeNORM3",),
-    0x800D1228:("Camera_ModeNORM4",),
-    0x800D12B8:("Camera_ModeNORM0",),
-    0x800D1A78:("Camera_ModePARA1",),
-    0x800D2AA8:("Camera_ModePARA2",),
-    0x800D2AC8:("Camera_ModePARA3",),
-    0x800D2AE8:("Camera_ModePARA4",),
-    0x800D2B08:("Camera_ModePARA0",),
-    0x800D2B28:("Camera_ModeJUMP1",),
-    0x800D2B48:("Camera_ModeJUMP2",),
-    0x800D3520:("Camera_ModeJUMP3",),
-    0x800D41E0:("Camera_ModeJUMP4",),
-    0x800D4200:("Camera_ModeJUMP0",),
-    0x800D4220:("Camera_ModeBATT1",),
-    0x800D55A8:("Camera_ModeBATT2",),
-    0x800D55C8:("Camera_ModeBATT3",),
-    0x800D55E8:("Camera_ModeBATT4",),
-    0x800D5608:("Camera_ModeBATT0",),
-    0x800D5628:("Camera_ModeKEEP1",),
-    0x800D67DC:("Camera_ModeKEEP2",),
-    0x800D67FC:("Camera_ModeKEEP3",),
-    0x800D73C8:("Camera_ModeKEEP4",),
-    0x800D7FA4:("Camera_ModeKEEP0",),
-    0x800D7FC4:("Camera_ModeFIXD1",),
-    0x800D83C8:("Camera_ModeFIXD2",),
-    0x800D8E08:("Camera_ModeFIXD3",),
-    0x800D8E28:("Camera_ModeFIXD4",),
-    0x800D8E48:("Camera_ModeFIXD0",),
-    0x800D8E68:("Camera_ModeSUBJ1",),
-    0x800D947C:("Camera_ModeSUBJ2",),
-    0x800D949C:("Camera_ModeSUBJ3",),
-    0x800D94BC:("Camera_ModeSUBJ4",),
-    0x800D94DC:("Camera_ModeSUBJ0",),
-    0x800D94FC:("Camera_ModeDATA0",),
-    0x800D951C:("Camera_ModeDATA1",),
-    0x800D953C:("Camera_ModeDATA2",),
-    0x800D955C:("Camera_ModeDATA3",),
-    0x800D957C:("Camera_ModeDATA4",),
-    0x800D959C:("Camera_ModeUNIQ1",),
-    0x800D95BC:("Camera_ModeUNIQ2",),
-    0x800D99D0:("Camera_ModeUNIQ3",),
-    0x800D9A2C:("Camera_ModeUNIQ4",),
-    0x800D9A88:("Camera_ModeUNIQ5",),
-    0x800D9AE4:("Camera_ModeUNIQ0",),
-    0x800DA3B8:("Camera_ModeUNIQ6",),
-    0x800DA4EC:("Camera_ModeUNIQ7",),
-    0x800DA50C:("Camera_ModeUNIQ8",),
-    0x800DA52C:("Camera_ModeUNIQ9",),
-    0x800DA54C:("Camera_ModeDEMO1",),
-    0x800DAD10:("Camera_ModeDEMO2",),
-    0x800DB804:("Camera_ModeDEMO3",),
-    0x800DBB14:("Camera_ModeDEMO4",),
-    0x800DC270:("Camera_ModeDEMO5",),
-    0x800DC718:("Camera_ModeDEMO6",),
-    0x800DC738:("Camera_ModeDEMO7",),
-    0x800DC758:("Camera_ModeDEMO8",),
-    0x800DC778:("Camera_ModeDEMO9",),
-    0x800DC798:("Camera_ModeDEMO0",),
-    0x800DCC90:("Camera_ModeSPEC0",),
-    0x800DCCB0:("Camera_ModeSPEC1",),
-    0x800DCCD0:("Camera_ModeSPEC2",),
-    0x800DCCF0:("Camera_ModeSPEC3",),
-    0x800DCD10:("Camera_ModeSPEC4",),
-    0x800DCD30:("Camera_ModeSPEC5",),
-    0x800DD0FC:("Camera_ModeSPEC6",),
-    0x800DD11C:("Camera_ModeSPEC7",),
-    0x800DD13C:("Camera_ModeSPEC8",),
-    0x800DD5B8:("Camera_ModeSPEC9",),
+    0x800CF3A4:("Camera_Noop",),
+    0x800CF3B4:("Camera_Normal1",),
+    0x800D0874:("Camera_Normal2",),
+    0x800D0894:("Camera_Normal3",),
+    0x800D1228:("Camera_Normal4",),
+    0x800D12B8:("Camera_Normal0",),
+    0x800D1A78:("Camera_Parallel1",),
+    0x800D2AA8:("Camera_Parallel2",),
+    0x800D2AC8:("Camera_Parallel3",),
+    0x800D2AE8:("Camera_Parallel4",),
+    0x800D2B08:("Camera_Parallel0",),
+    0x800D2B28:("Camera_Jump1",),
+    0x800D2B48:("Camera_Jump2",),
+    0x800D3520:("Camera_Jump3",),
+    0x800D41E0:("Camera_Jump4",),
+    0x800D4200:("Camera_Jump0",),
+    0x800D4220:("Camera_Battle1",),
+    0x800D55A8:("Camera_Battle2",),
+    0x800D55C8:("Camera_Battle3",),
+    0x800D55E8:("Camera_Battle4",),
+    0x800D5608:("Camera_Battle0",),
+    0x800D5628:("Camera_KeepOn1",),
+    0x800D67DC:("Camera_KeepOn2",),
+    0x800D67FC:("Camera_KeepOn3",),
+    0x800D73C8:("Camera_KeepOn4",),
+    0x800D7FA4:("Camera_KeepOn0",),
+    0x800D7FC4:("Camera_Fixed1",),
+    0x800D83C8:("Camera_Fixed2",),
+    0x800D8E08:("Camera_Fixed3",),
+    0x800D8E28:("Camera_Fixed4",),
+    0x800D8E48:("Camera_Fixed0",),
+    0x800D8E68:("Camera_Subject1",),
+    0x800D947C:("Camera_Subject2",),
+    0x800D949C:("Camera_Subject3",),
+    0x800D94BC:("Camera_Subject4",),
+    0x800D94DC:("Camera_Subject0",),
+    0x800D94FC:("Camera_Data0",),
+    0x800D951C:("Camera_Data1",),
+    0x800D953C:("Camera_Data2",),
+    0x800D955C:("Camera_Data3",),
+    0x800D957C:("Camera_Data4",),
+    0x800D959C:("Camera_Unique1",),
+    0x800D95BC:("Camera_Unique2",),
+    0x800D99D0:("Camera_Unique3",),
+    0x800D9A2C:("Camera_Unique4",),
+    0x800D9A88:("Camera_Unique5",),
+    0x800D9AE4:("Camera_Unique0",),
+    0x800DA3B8:("Camera_Unique6",),
+    0x800DA4EC:("Camera_Unique7",),
+    0x800DA50C:("Camera_Unique8",),
+    0x800DA52C:("Camera_Unique9",),
+    0x800DA54C:("Camera_Demo1",),
+    0x800DAD10:("Camera_Demo2",),
+    0x800DB804:("Camera_Demo3",),
+    0x800DBB14:("Camera_Demo4",),
+    0x800DC270:("Camera_Demo5",),
+    0x800DC718:("Camera_Demo6",),
+    0x800DC738:("Camera_Demo7",),
+    0x800DC758:("Camera_Demo8",),
+    0x800DC778:("Camera_Demo9",),
+    0x800DC798:("Camera_Demo0",),
+    0x800DCC90:("Camera_Special0",),
+    0x800DCCB0:("Camera_Special1",),
+    0x800DCCD0:("Camera_Special2",),
+    0x800DCCF0:("Camera_Special3",),
+    0x800DCD10:("Camera_Special4",),
+    0x800DCD30:("Camera_Special5",),
+    0x800DD0FC:("Camera_Special6",),
+    0x800DD11C:("Camera_Special7",),
+    0x800DD13C:("Camera_Special8",),
+    0x800DD5B8:("Camera_Special9",),
     0x800DDD58:("Camera_Alloc",),
     0x800DDDA8:("Camera_Free",),
     0x800DDDD0:("Camera_Init",),

tools/disasm/variables.txt

@@ -454,87 +454,100 @@
     0x801B46DC:("sSceneSubdivisionList","BgCheckSceneSubdivisionEntry","[3]",0x24),
     0x801B4700:("sCustomDynapolyMem","BgSpecialSceneMaxObjects","[1]",0x8),
     0x801B4708:("D_801B4708","UNK_TYPE1","",0x1),
-    0x801B4710:("D_801B4710","UNK_TYPE1","",0x1),
-    0x801B4738:("D_801B4738","UNK_TYPE1","",0x1),
-    0x801B4768:("D_801B4768","UNK_TYPE1","",0x1),
-    0x801B4798:("D_801B4798","UNK_TYPE1","",0x1),
-    0x801B47CC:("D_801B47CC","UNK_TYPE1","",0x1),
-    0x801B47F0:("D_801B47F0","UNK_TYPE1","",0x1),
-    0x801B4824:("D_801B4824","UNK_TYPE1","",0x1),
-    0x801B4848:("D_801B4848","UNK_TYPE1","",0x1),
-    0x801B486C:("D_801B486C","UNK_TYPE1","",0x1),
-    0x801B4890:("D_801B4890","UNK_TYPE1","",0x1),
-    0x801B48B0:("D_801B48B0","UNK_TYPE1","",0x1),
-    0x801B48D4:("D_801B48D4","UNK_TYPE1","",0x1),
-    0x801B48F8:("D_801B48F8","UNK_TYPE1","",0x1),
-    0x801B491C:("D_801B491C","UNK_TYPE1","",0x1),
-    0x801B4944:("D_801B4944","UNK_TYPE1","",0x1),
-    0x801B4974:("D_801B4974","UNK_TYPE1","",0x1),
-    0x801B49A4:("D_801B49A4","UNK_TYPE1","",0x1),
-    0x801B49D4:("D_801B49D4","UNK_TYPE1","",0x1),
-    0x801B4A04:("D_801B4A04","UNK_TYPE1","",0x1),
-    0x801B4A34:("D_801B4A34","UNK_TYPE1","",0x1),
-    0x801B4A5C:("D_801B4A5C","UNK_TYPE1","",0x1),
-    0x801B4A8C:("D_801B4A8C","UNK_TYPE1","",0x1),
-    0x801B4ABC:("D_801B4ABC","UNK_TYPE1","",0x1),
-    0x801B4AE0:("D_801B4AE0","UNK_TYPE1","",0x1),
-    0x801B4B08:("D_801B4B08","UNK_TYPE1","",0x1),
-    0x801B4B38:("D_801B4B38","UNK_TYPE1","",0x1),
-    0x801B4B60:("D_801B4B60","UNK_TYPE1","",0x1),
-    0x801B4B90:("D_801B4B90","UNK_TYPE1","",0x1),
-    0x801B4BB8:("D_801B4BB8","UNK_TYPE1","",0x1),
-    0x801B4BDC:("D_801B4BDC","UNK_TYPE1","",0x1),
-    0x801B4C04:("D_801B4C04","UNK_TYPE1","",0x1),
-    0x801B4C34:("D_801B4C34","UNK_TYPE1","",0x1),
-    0x801B4C5C:("D_801B4C5C","UNK_TYPE1","",0x1),
-    0x801B4C84:("D_801B4C84","UNK_TYPE1","",0x1),
-    0x801B4CAC:("D_801B4CAC","UNK_TYPE1","",0x1),
-    0x801B4CD4:("D_801B4CD4","UNK_TYPE1","",0x1),
-    0x801B4CFC:("D_801B4CFC","UNK_TYPE1","",0x1),
-    0x801B4D24:("D_801B4D24","UNK_TYPE1","",0x1),
-    0x801B4D34:("D_801B4D34","UNK_TYPE1","",0x1),
-    0x801B4D44:("D_801B4D44","UNK_TYPE1","",0x1),
-    0x801B4D68:("D_801B4D68","UNK_TYPE1","",0x1),
-    0x801B4D8C:("D_801B4D8C","UNK_TYPE1","",0x1),
-    0x801B4DB0:("D_801B4DB0","UNK_TYPE1","",0x1),
-    0x801B4DD4:("D_801B4DD4","UNK_TYPE1","",0x1),
-    0x801B4DF8:("D_801B4DF8","UNK_TYPE1","",0x1),
-    0x801B4E2C:("D_801B4E2C","UNK_TYPE1","",0x1),
-    0x801B4E5C:("D_801B4E5C","UNK_TYPE1","",0x1),
-    0x801B4E90:("D_801B4E90","UNK_TYPE1","",0x1),
-    0x801B4EB4:("D_801B4EB4","UNK_TYPE1","",0x1),
-    0x801B4ED8:("D_801B4ED8","UNK_TYPE1","",0x1),
-    0x801B4EDC:("D_801B4EDC","UNK_TYPE1","",0x1),
-    0x801B4EE4:("D_801B4EE4","UNK_TYPE1","",0x1),
+    0x801B4710:("sSetNormal0ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4738:("sSetNormal0ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B4768:("sSetNormal0ModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B4798:("sSetNormal0ModeBattleData","UNK_TYPE1","",0x1),
+    0x801B47CC:("sSetNormal0ModeFirstPersonData","UNK_TYPE1","",0x1),
+    0x801B47F0:("sSetNormal0ModeTalkData","UNK_TYPE1","",0x1),
+    0x801B4824:("sSetNormal0ModeClimbData","UNK_TYPE1","",0x1),
+    0x801B4848:("sSetNormal0ModeBowArrowData","UNK_TYPE1","",0x1),
+    0x801B486C:("sSetNormal0ModeBowArrowZData","UNK_TYPE1","",0x1),
+    0x801B4890:("sSetNormal0ModeHookshotData","UNK_TYPE1","",0x1),
+    0x801B48B0:("sSetNormal0ModeBoomerangData","UNK_TYPE1","",0x1),
+    0x801B48D4:("sSetNormal0ModeSlingshotData","UNK_TYPE1","",0x1),
+    0x801B48F8:("sSetNormal0ModeClimbZData","UNK_TYPE1","",0x1),
+    0x801B4710:("sSetNormal0ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4738:("sSetNormal0ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B4768:("sSetNormal0ModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B4798:("sSetNormal0ModeBattleData","UNK_TYPE1","",0x1),
+    0x801B47CC:("sSetNormal0ModeFirstPersonData","UNK_TYPE1","",0x1),
+    0x801B47F0:("sSetNormal0ModeTalkData","UNK_TYPE1","",0x1),
+    0x801B4824:("sSetNormal0ModeClimbData","UNK_TYPE1","",0x1),
+    0x801B4848:("sSetNormal0ModeBowArrowData","UNK_TYPE1","",0x1),
+    0x801B486C:("sSetNormal0ModeBowArrowZData","UNK_TYPE1","",0x1),
+    0x801B4890:("sSetNormal0ModeHookshotData","UNK_TYPE1","",0x1),
+    0x801B48B0:("sSetNormal0ModeBoomerangData","UNK_TYPE1","",0x1),
+    0x801B48D4:("sSetNormal0ModeSlingshotData","UNK_TYPE1","",0x1),
+    0x801B48F8:("sSetNormal0ModeClimbZData","UNK_TYPE1","",0x1),
+    0x801B491C:("sSetNormal0ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B4944:("sSetNormal0ModeHangData","UNK_TYPE1","",0x1),
+    0x801B4974:("sSetNormal0ModeHangZData","UNK_TYPE1","",0x1),
+    0x801B49A4:("sSetNormal0ModeFreeFallData","UNK_TYPE1","",0x1),
+    0x801B49D4:("sSetNormal0ModeChargeData","UNK_TYPE1","",0x1),
+    0x801B4A04:("sSetNormal0ModeChargeZData","UNK_TYPE1","",0x1),
+    0x801B4A34:("sSetNormal0ModeStillData","UNK_TYPE1","",0x1),
+    0x801B4A5C:("sSetNormal0ModePushPullData","UNK_TYPE1","",0x1),
+    0x801B4A8C:("sSetNormal0ModeFollowBoomerangData","UNK_TYPE1","",0x1),
+    0x801B4ABC:("sSetNormal0ModeDekuShootData","UNK_TYPE1","",0x1),
+    0x801B4AE0:("sSetNormal0ModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B4B08:("sSetNormal0ModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B4B38:("sSetNormal0ModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B4B60:("sSetNormal0ModeDekuFlyZData","UNK_TYPE1","",0x1),
+    0x801B4B90:("sSetNormal0ModeGoronJumpData","UNK_TYPE1","",0x1),
+    0x801B4BB8:("sSetNormal0ModeZoraFinData","UNK_TYPE1","",0x1),
+    0x801B4BDC:("sSetNormal3ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4C04:("sSetNormal3ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B4C34:("sSetNormal3ModeFreeFallData","UNK_TYPE1","",0x1),
+    0x801B4C5C:("sSetNormal3ModeGoronJumpData","UNK_TYPE1","",0x1),
+    0x801B4C84:("sSetNormal3ModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B4CAC:("sSetNormal3ModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B4CD4:("sSetNormal3ModeStillData","UNK_TYPE1","",0x1),
+    0x801B4CFC:("sSetNormal3ModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B4D24:("sSetPivotDivingModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4D34:("sSetPivotDivingModeTargetData","UNK_TYPE1","",0x1),
+    0x801B4D44:("sSetHorseModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4D68:("sSetHorseModeTargetData","UNK_TYPE1","",0x1),
+    0x801B4D8C:("sSetHorseModeJumpData","UNK_TYPE1","",0x1),
+    0x801B4DB0:("sSetHorseModeBowArrowData","UNK_TYPE1","",0x1),
+    0x801B4DD4:("sSetHorseModeSlingShotData","UNK_TYPE1","",0x1),
+    0x801B4DF8:("sSetHorseModeBattleData","UNK_TYPE1","",0x1),
+    0x801B4E2C:("sSetHorseModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B4E5C:("sSetHorseModeTalkData","UNK_TYPE1","",0x1),
+    0x801B4E90:("sSetHorseModeStillData","UNK_TYPE1","",0x1),
+    0x801B4EB4:("sSetZoraDivingModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4ED8:("sSetPrerendFixedModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4EDC:("sSetPrerendPivotModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4EE4:("sSetDoorCModeNormalData","UNK_TYPE1","",0x1),
     0x801B4EF0:("D_801B4EF0","UNK_TYPE1","",0x1),
-    0x801B4EF4:("D_801B4EF4","UNK_TYPE1","",0x1),
+    0x801B4EF4:("sSetCutscenesModeNormalData","UNK_TYPE1","",0x1),
     0x801B4EF8:("D_801B4EF8","UNK_TYPE1","",0x1),
     0x801B4F20:("D_801B4F20","UNK_TYPE1","",0x1),
     0x801B4F50:("D_801B4F50","UNK_TYPE1","",0x1),
     0x801B4F78:("D_801B4F78","UNK_TYPE1","",0x1),
-    0x801B4FA0:("D_801B4FA0","UNK_TYPE1","",0x1),
-    0x801B4FC8:("D_801B4FC8","UNK_TYPE1","",0x1),
+    0x801B4FA0:("sSetNormal1ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B4FC8:("sSetNormal1ModeStillData","UNK_TYPE1","",0x1),
     0x801B4FF0:("D_801B4FF0","UNK_TYPE1","",0x1),
     0x801B5018:("D_801B5018","UNK_TYPE1","",0x1),
     0x801B5034:("D_801B5034","UNK_TYPE1","",0x1),
     0x801B5050:("D_801B5050","UNK_TYPE1","",0x1),
     0x801B506C:("D_801B506C","UNK_TYPE1","",0x1),
-    0x801B507C:("D_801B507C","UNK_TYPE1","",0x1),
-    0x801B5094:("D_801B5094","UNK_TYPE1","",0x1),
-    0x801B50BC:("D_801B50BC","UNK_TYPE1","",0x1),
-    0x801B50EC:("D_801B50EC","UNK_TYPE1","",0x1),
-    0x801B511C:("D_801B511C","UNK_TYPE1","",0x1),
-    0x801B5150:("D_801B5150","UNK_TYPE1","",0x1),
-    0x801B5180:("D_801B5180","UNK_TYPE1","",0x1),
-    0x801B51A8:("D_801B51A8","UNK_TYPE1","",0x1),
-    0x801B51D8:("D_801B51D8","UNK_TYPE1","",0x1),
-    0x801B51FC:("D_801B51FC","UNK_TYPE1","",0x1),
-    0x801B5220:("D_801B5220","UNK_TYPE1","",0x1),
-    0x801B5250:("D_801B5250","UNK_TYPE1","",0x1),
-    0x801B5280:("D_801B5280","UNK_TYPE1","",0x1),
-    0x801B52B0:("D_801B52B0","UNK_TYPE1","",0x1),
-    0x801B52E0:("D_801B52E0","UNK_TYPE1","",0x1),
-    0x801B5308:("D_801B5308","UNK_TYPE1","",0x1),
+    0x801B507C:("sSetSpiralDoorModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5094:("sSetDungeon0ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B50BC:("sSetDungeon0ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B50EC:("sSetDungeon0ModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B511C:("sSetDungeon0ModeBattleData","UNK_TYPE1","",0x1),
+    0x801B5150:("sSetDungeon0ModeFollowBoomerangData","UNK_TYPE1","",0x1),
+    0x801B5180:("sSetDungeon0ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B51A8:("sSetDungeon0ModeFreeFallData","UNK_TYPE1","",0x1),
+    0x801B51D8:("sSetDungeon0ModeClimbData","UNK_TYPE1","",0x1),
+    0x801B51FC:("sSetDungeon0ModeClimbZData","UNK_TYPE1","",0x1),
+    0x801B5220:("sSetDungeon0ModeChargeData","UNK_TYPE1","",0x1),
+    0x801B5250:("sSetDungeon0ModeChargeZData","UNK_TYPE1","",0x1),
+    0x801B5280:("sSetDungeon0ModeHangData","UNK_TYPE1","",0x1),
+    0x801B52B0:("sSetDungeon0ModeHangZData","UNK_TYPE1","",0x1),
+    0x801B52E0:("sSetDungeon0ModeStillData","UNK_TYPE1","",0x1),
+    0x801B5308:("sSetDungeon0ModePushPullData","UNK_TYPE1","",0x1),
     0x801B5338:("D_801B5338","UNK_TYPE1","",0x1),
     0x801B535C:("D_801B535C","UNK_TYPE1","",0x1),
     0x801B5380:("D_801B5380","UNK_TYPE1","",0x1),
@@ -560,71 +573,71 @@
     0x801B5650:("D_801B5650","UNK_TYPE1","",0x1),
     0x801B5674:("D_801B5674","UNK_TYPE1","",0x1),
     0x801B5698:("D_801B5698","UNK_TYPE1","",0x1),
-    0x801B56BC:("D_801B56BC","UNK_TYPE1","",0x1),
-    0x801B56E0:("D_801B56E0","UNK_TYPE1","",0x1),
-    0x801B5704:("D_801B5704","UNK_TYPE1","",0x1),
+    0x801B56BC:("sSetDeathModeNormalData","UNK_TYPE1","",0x1),
+    0x801B56E0:("sSetDeathModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5704:("sSetDeathModeDekuShootData","UNK_TYPE1","",0x1),
     0x801B5728:("D_801B5728","UNK_TYPE1","",0x1),
     0x801B574C:("D_801B574C","UNK_TYPE1","",0x1),
-    0x801B5770:("D_801B5770","UNK_TYPE1","",0x1),
-    0x801B577C:("D_801B577C","UNK_TYPE1","",0x1),
-    0x801B57A4:("D_801B57A4","UNK_TYPE1","",0x1),
-    0x801B57CC:("D_801B57CC","UNK_TYPE1","",0x1),
-    0x801B57F4:("D_801B57F4","UNK_TYPE1","",0x1),
+    0x801B5770:("sSetLongChestOpeningModeNormalData","UNK_TYPE1","",0x1),
+    0x801B577C:("sSetDungeon1ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B57A4:("sSetDungeon1ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B57CC:("sSetDungeon1ModeStillData","UNK_TYPE1","",0x1),
+    0x801B57F4:("sSetDungeon1ModePushPullData","UNK_TYPE1","",0x1),
     0x801B5824:("D_801B5824","UNK_TYPE1","",0x1),
     0x801B5834:("D_801B5834","UNK_TYPE1","",0x1),
-    0x801B5844:("D_801B5844","UNK_TYPE1","",0x1),
-    0x801B5864:("D_801B5864","UNK_TYPE1","",0x1),
+    0x801B5844:("sSetMazeModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5864:("sSetRemoteBombModeNormalData","UNK_TYPE1","",0x1),
     0x801B5884:("D_801B5884","UNK_TYPE1","",0x1),
     0x801B58A0:("D_801B58A0","UNK_TYPE1","",0x1),
     0x801B58BC:("D_801B58BC","UNK_TYPE1","",0x1),
     0x801B58D8:("D_801B58D8","UNK_TYPE1","",0x1),
     0x801B58F4:("D_801B58F4","UNK_TYPE1","",0x1),
-    0x801B5904:("D_801B5904","UNK_TYPE1","",0x1),
-    0x801B5928:("D_801B5928","UNK_TYPE1","",0x1),
-    0x801B5950:("D_801B5950","UNK_TYPE1","",0x1),
+    0x801B5904:("sSetTowerClimbModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5928:("sSetTowerClimbModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5950:("sSetTowerClimbModeStillData","UNK_TYPE1","",0x1),
     0x801B5978:("D_801B5978","UNK_TYPE1","",0x1),
     0x801B59A8:("D_801B59A8","UNK_TYPE1","",0x1),
     0x801B59D0:("D_801B59D0","UNK_TYPE1","",0x1),
     0x801B59F4:("D_801B59F4","UNK_TYPE1","",0x1),
     0x801B5A00:("D_801B5A00","UNK_TYPE1","",0x1),
-    0x801B5A0C:("D_801B5A0C","UNK_TYPE1","",0x1),
-    0x801B5A30:("D_801B5A30","UNK_TYPE1","",0x1),
+    0x801B5A0C:("sSetBoatCruiseModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5A30:("sSetVerticalClimbModeClimbData","UNK_TYPE1","",0x1),
     0x801B5A64:("D_801B5A64","UNK_TYPE1","",0x1),
-    0x801B5A94:("D_801B5A94","UNK_TYPE1","",0x1),
-    0x801B5ABC:("D_801B5ABC","UNK_TYPE1","",0x1),
-    0x801B5AF0:("D_801B5AF0","UNK_TYPE1","",0x1),
-    0x801B5B18:("D_801B5B18","UNK_TYPE1","",0x1),
-    0x801B5B40:("D_801B5B40","UNK_TYPE1","",0x1),
-    0x801B5B70:("D_801B5B70","UNK_TYPE1","",0x1),
-    0x801B5B98:("D_801B5B98","UNK_TYPE1","",0x1),
-    0x801B5BC8:("D_801B5BC8","UNK_TYPE1","",0x1),
-    0x801B5BFC:("D_801B5BFC","UNK_TYPE1","",0x1),
-    0x801B5C30:("D_801B5C30","UNK_TYPE1","",0x1),
-    0x801B5C58:("D_801B5C58","UNK_TYPE1","",0x1),
+    0x801B5A94:("sSetDungeon2ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5ABC:("sSetDungeon2ModeBattleData","UNK_TYPE1","",0x1),
+    0x801B5AF0:("sSetDungeon2ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5B18:("sSetDungeon2ModeStillData","UNK_TYPE1","",0x1),
+    0x801B5B40:("sSetDungeon2ModePushPullData","UNK_TYPE1","",0x1),
+    0x801B5B70:("sSetBossOdolwaModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5B98:("sSetBossOdolwaModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B5BC8:("sSetBossOdolwaModeTalkData","UNK_TYPE1","",0x1),
+    0x801B5BFC:("sSetBossOdolwaModeBattleData","UNK_TYPE1","",0x1),
+    0x801B5C30:("sSetBossOdolwaModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5C58:("sSetBossOdolwaModeStillData","UNK_TYPE1","",0x1),
     0x801B5C80:("D_801B5C80","UNK_TYPE1","",0x1),
     0x801B5CB0:("D_801B5CB0","UNK_TYPE1","",0x1),
     0x801B5CCC:("D_801B5CCC","UNK_TYPE1","",0x1),
-    0x801B5CE8:("D_801B5CE8","UNK_TYPE1","",0x1),
-    0x801B5D10:("D_801B5D10","UNK_TYPE1","",0x1),
-    0x801B5D40:("D_801B5D40","UNK_TYPE1","",0x1),
-    0x801B5D74:("D_801B5D74","UNK_TYPE1","",0x1),
-    0x801B5D9C:("D_801B5D9C","UNK_TYPE1","",0x1),
+    0x801B5CE8:("sSetMiniBossModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5D10:("sSetMiniBossModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B5D40:("sSetMiniBossModeBattleData","UNK_TYPE1","",0x1),
+    0x801B5D74:("sSetMiniBossModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5D9C:("sSetMiniBossModeStillData","UNK_TYPE1","",0x1),
     0x801B5DC4:("D_801B5DC4","UNK_TYPE1","",0x1),
-    0x801B5DD4:("D_801B5DD4","UNK_TYPE1","",0x1),
-    0x801B5DFC:("D_801B5DFC","UNK_TYPE1","",0x1),
+    0x801B5DD4:("sSetTreasureChestMinigameModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5DFC:("sSetTreasureChestMinigameModeTargetData","UNK_TYPE1","",0x1),
     0x801B5E2C:("D_801B5E2C","UNK_TYPE1","",0x1),
     0x801B5E48:("D_801B5E48","UNK_TYPE1","",0x1),
     0x801B5E64:("D_801B5E64","UNK_TYPE1","",0x1),
     0x801B5E8C:("D_801B5E8C","UNK_TYPE1","",0x1),
-    0x801B5EB4:("D_801B5EB4","UNK_TYPE1","",0x1),
-    0x801B5EDC:("D_801B5EDC","UNK_TYPE1","",0x1),
-    0x801B5F0C:("D_801B5F0C","UNK_TYPE1","",0x1),
-    0x801B5F34:("D_801B5F34","UNK_TYPE1","",0x1),
-    0x801B5F5C:("D_801B5F5C","UNK_TYPE1","",0x1),
-    0x801B5F8C:("D_801B5F8C","UNK_TYPE1","",0x1),
-    0x801B5FB0:("D_801B5FB0","UNK_TYPE1","",0x1),
-    0x801B5FD4:("D_801B5FD4","UNK_TYPE1","",0x1),
-    0x801B5FF8:("D_801B5FF8","UNK_TYPE1","",0x1),
+    0x801B5EB4:("sSetDungeon3ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5EDC:("sSetDungeon3ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B5F0C:("sSetDungeon3ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B5F34:("sSetDungeon3ModeStillData","UNK_TYPE1","",0x1),
+    0x801B5F5C:("sSetDungeon3ModePushPullData","UNK_TYPE1","",0x1),
+    0x801B5F8C:("sSetTelescopeModeNormalData","UNK_TYPE1","",0x1),
+    0x801B5FB0:("sSetTelescopeModeTargetData","UNK_TYPE1","",0x1),
+    0x801B5FD4:("sSetTelescopeModeFirstPersonData","UNK_TYPE1","",0x1),
+    0x801B5FF8:("sSetTelescopeModeDekuHideData","UNK_TYPE1","",0x1),
     0x801B601C:("D_801B601C","UNK_TYPE1","",0x1),
     0x801B6044:("D_801B6044","UNK_TYPE1","",0x1),
     0x801B6074:("D_801B6074","UNK_TYPE1","",0x1),
@@ -665,59 +678,59 @@
     0x801B6674:("D_801B6674","UNK_TYPE1","",0x1),
     0x801B6698:("D_801B6698","UNK_TYPE1","",0x1),
     0x801B66C0:("D_801B66C0","UNK_TYPE1","",0x1),
-    0x801B66E8:("D_801B66E8","UNK_TYPE1","",0x1),
-    0x801B6710:("D_801B6710","UNK_TYPE1","",0x1),
-    0x801B6740:("D_801B6740","UNK_TYPE1","",0x1),
-    0x801B6774:("D_801B6774","UNK_TYPE1","",0x1),
-    0x801B679C:("D_801B679C","UNK_TYPE1","",0x1),
-    0x801B67C4:("D_801B67C4","UNK_TYPE1","",0x1),
-    0x801B67EC:("D_801B67EC","UNK_TYPE1","",0x1),
-    0x801B681C:("D_801B681C","UNK_TYPE1","",0x1),
-    0x801B684C:("D_801B684C","UNK_TYPE1","",0x1),
-    0x801B6880:("D_801B6880","UNK_TYPE1","",0x1),
-    0x801B68A8:("D_801B68A8","UNK_TYPE1","",0x1),
-    0x801B68D0:("D_801B68D0","UNK_TYPE1","",0x1),
-    0x801B68F8:("D_801B68F8","UNK_TYPE1","",0x1),
-    0x801B692C:("D_801B692C","UNK_TYPE1","",0x1),
-    0x801B6954:("D_801B6954","UNK_TYPE1","",0x1),
-    0x801B697C:("D_801B697C","UNK_TYPE1","",0x1),
-    0x801B69A4:("D_801B69A4","UNK_TYPE1","",0x1),
-    0x801B69CC:("D_801B69CC","UNK_TYPE1","",0x1),
-    0x801B69FC:("D_801B69FC","UNK_TYPE1","",0x1),
-    0x801B6A30:("D_801B6A30","UNK_TYPE1","",0x1),
-    0x801B6A58:("D_801B6A58","UNK_TYPE1","",0x1),
-    0x801B6A80:("D_801B6A80","UNK_TYPE1","",0x1),
-    0x801B6AA8:("D_801B6AA8","UNK_TYPE1","",0x1),
-    0x801B6AD0:("D_801B6AD0","UNK_TYPE1","",0x1),
-    0x801B6AF8:("D_801B6AF8","UNK_TYPE1","",0x1),
-    0x801B6B28:("D_801B6B28","UNK_TYPE1","",0x1),
-    0x801B6B50:("D_801B6B50","UNK_TYPE1","",0x1),
-    0x801B6B78:("D_801B6B78","UNK_TYPE1","",0x1),
-    0x801B6BA0:("D_801B6BA0","UNK_TYPE1","",0x1),
-    0x801B6BC8:("D_801B6BC8","UNK_TYPE1","",0x1),
-    0x801B6BF0:("D_801B6BF0","UNK_TYPE1","",0x1),
-    0x801B6C18:("D_801B6C18","UNK_TYPE1","",0x1),
-    0x801B6C48:("D_801B6C48","UNK_TYPE1","",0x1),
-    0x801B6C70:("D_801B6C70","UNK_TYPE1","",0x1),
+    0x801B66E8:("sSetBossMajoraModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6710:("sSetBossMajoraModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B6740:("sSetBossMajoraModeBattleData","UNK_TYPE1","",0x1),
+    0x801B6774:("sSetBossMajoraModeJumpData","UNK_TYPE1","",0x1),
+    0x801B679C:("sSetBossMajoraModeStillData","UNK_TYPE1","",0x1),
+    0x801B67C4:("sSetBossTwinmoldModeNormalData","UNK_TYPE1","",0x1),
+    0x801B67EC:("sSetBossTwinmoldModeTargetData","UNK_TYPE1","",0x1),
+    0x801B681C:("sSetBossTwinmoldModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B684C:("sSetBossTwinmoldModeBattleData","UNK_TYPE1","",0x1),
+    0x801B6880:("sSetBossTwinmoldModeJumpData","UNK_TYPE1","",0x1),
+    0x801B68A8:("sSetBossTwinmoldModeStillData","UNK_TYPE1","",0x1),
+    0x801B68D0:("sSetBossGohtModeNormalData","UNK_TYPE1","",0x1),
+    0x801B68F8:("sSetBossGohtModeBattleData","UNK_TYPE1","",0x1),
+    0x801B692C:("sSetBossGohtModeJumpData","UNK_TYPE1","",0x1),
+    0x801B6954:("sSetBossGohtModeStillData","UNK_TYPE1","",0x1),
+    0x801B697C:("sSetBossGohtModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B69A4:("sSetBossGyorgModeNormalData","UNK_TYPE1","",0x1),
+    0x801B69CC:("sSetBossGyorgModeFollowTargetData","UNK_TYPE1","",0x1),
+    0x801B69FC:("sSetBossGyorgModeBattleData","UNK_TYPE1","",0x1),
+    0x801B6A30:("sSetBossGyorgModeGoronJumpData","UNK_TYPE1","",0x1),
+    0x801B6A58:("sSetBossGyorgModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B6A80:("sSetBossGyorgModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B6AA8:("sSetBossGyorgModeStillData","UNK_TYPE1","",0x1),
+    0x801B6AD0:("sSetPinnacleRockModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6AF8:("sSetPinnacleRockModeTargetData","UNK_TYPE1","",0x1),
+    0x801B6B28:("sSetPinnacleRockModeGoronJumpData","UNK_TYPE1","",0x1),
+    0x801B6B50:("sSetPinnacleRockModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B6B78:("sSetPinnacleRockModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B6BA0:("sSetPinnacleRockModeStillData","UNK_TYPE1","",0x1),
+    0x801B6BC8:("sSetPinnacleRockModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B6BF0:("sSetNormal2ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6C18:("sSetNormal2ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B6C48:("sSetNormal2ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B6C70:("sSetNormal2ModeStillData","UNK_TYPE1","",0x1),
     0x801B6C98:("D_801B6C98","UNK_TYPE1","",0x1),
     0x801B6CC0:("D_801B6CC0","UNK_TYPE1","",0x1),
     0x801B6CF0:("D_801B6CF0","UNK_TYPE1","",0x1),
     0x801B6D24:("D_801B6D24","UNK_TYPE1","",0x1),
     0x801B6D4C:("D_801B6D4C","UNK_TYPE1","",0x1),
     0x801B6D74:("D_801B6D74","UNK_TYPE1","",0x1),
-    0x801B6D90:("D_801B6D90","UNK_TYPE1","",0x1),
-    0x801B6DB8:("D_801B6DB8","UNK_TYPE1","",0x1),
-    0x801B6DE0:("D_801B6DE0","UNK_TYPE1","",0x1),
-    0x801B6E08:("D_801B6E08","UNK_TYPE1","",0x1),
-    0x801B6E30:("D_801B6E30","UNK_TYPE1","",0x1),
-    0x801B6E58:("D_801B6E58","UNK_TYPE1","",0x1),
-    0x801B6E80:("D_801B6E80","UNK_TYPE1","",0x1),
-    0x801B6EA8:("D_801B6EA8","UNK_TYPE1","",0x1),
-    0x801B6ED0:("D_801B6ED0","UNK_TYPE1","",0x1),
-    0x801B6EF8:("D_801B6EF8","UNK_TYPE1","",0x1),
-    0x801B6F20:("D_801B6F20","UNK_TYPE1","",0x1),
-    0x801B6F50:("D_801B6F50","UNK_TYPE1","",0x1),
-    0x801B6F78:("D_801B6F78","UNK_TYPE1","",0x1),
+    0x801B6D90:("sSetWhirlpoolModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6DB8:("sSetWhirlpoolModeFreeFallData","UNK_TYPE1","",0x1),
+    0x801B6DE0:("sSetWhirlpoolModeGoronJumpData","UNK_TYPE1","",0x1),
+    0x801B6E08:("sSetWhirlpoolModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B6E30:("sSetWhirlpoolModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B6E58:("sSetWhirlpoolModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B6E80:("sSetCuccoShackModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6EA8:("sSetCuccoShackModeStillData","UNK_TYPE1","",0x1),
+    0x801B6ED0:("sSetCuccoShackModeDekuHideData","UNK_TYPE1","",0x1),
+    0x801B6EF8:("sSetGiantModeNormalData","UNK_TYPE1","",0x1),
+    0x801B6F20:("sSetGiantModeTargetData","UNK_TYPE1","",0x1),
+    0x801B6F50:("sSetGiantModeJumpData","UNK_TYPE1","",0x1),
+    0x801B6F78:("sSetGiantModeStillData","UNK_TYPE1","",0x1),
     0x801B6FA0:("D_801B6FA0","UNK_TYPE1","",0x1),
     0x801B6FB0:("D_801B6FB0","UNK_TYPE1","",0x1),
     0x801B6FD8:("D_801B6FD8","UNK_TYPE1","",0x1),
@@ -734,130 +747,129 @@
     0x801B71D4:("D_801B71D4","UNK_TYPE1","",0x1),
     0x801B7204:("D_801B7204","UNK_TYPE1","",0x1),
     0x801B7210:("D_801B7210","UNK_TYPE1","",0x1),
-    0x801B7244:("D_801B7244","UNK_TYPE1","",0x1),
-    0x801B7278:("D_801B7278","UNK_TYPE1","",0x1),
-    0x801B729C:("D_801B729C","UNK_TYPE1","",0x1),
-    0x801B72C0:("D_801B72C0","UNK_TYPE1","",0x1),
-    0x801B72E4:("D_801B72E4","UNK_TYPE1","",0x1),
-    0x801B7308:("D_801B7308","UNK_TYPE1","",0x1),
-    0x801B732C:("D_801B732C","UNK_TYPE1","",0x1),
-    0x801B7354:("D_801B7354","UNK_TYPE1","",0x1),
-    0x801B7384:("D_801B7384","UNK_TYPE1","",0x1),
-    0x801B73AC:("D_801B73AC","UNK_TYPE1","",0x1),
-    0x801B73D4:("D_801B73D4","UNK_TYPE1","",0x1),
-    0x801B74C4:("D_801B74C4","UNK_TYPE1","",0x1),
-    0x801B759C:("D_801B759C","UNK_TYPE1","",0x1),
-    0x801B75F4:("D_801B75F4","UNK_TYPE1","",0x1),
-    0x801B767C:("D_801B767C","UNK_TYPE1","",0x1),
-    0x801B7684:("D_801B7684","UNK_TYPE1","",0x1),
-    0x801B768C:("D_801B768C","UNK_TYPE1","",0x1),
-    0x801B7694:("D_801B7694","UNK_TYPE1","",0x1),
-    0x801B769C:("D_801B769C","UNK_TYPE1","",0x1),
-    0x801B76A4:("D_801B76A4","UNK_TYPE1","",0x1),
-    0x801B76AC:("D_801B76AC","UNK_TYPE1","",0x1),
-    0x801B777C:("D_801B777C","UNK_TYPE1","",0x1),
-    0x801B784C:("D_801B784C","UNK_TYPE1","",0x1),
-    0x801B791C:("D_801B791C","UNK_TYPE1","",0x1),
-    0x801B7984:("D_801B7984","UNK_TYPE1","",0x1),
-    0x801B79EC:("D_801B79EC","UNK_TYPE1","",0x1),
-    0x801B79F4:("D_801B79F4","UNK_TYPE1","",0x1),
-    0x801B7AE4:("D_801B7AE4","UNK_TYPE1","",0x1),
-    0x801B7B14:("D_801B7B14","UNK_TYPE1","",0x1),
-    0x801B7B44:("D_801B7B44","UNK_TYPE1","",0x1),
-    0x801B7B74:("D_801B7B74","UNK_TYPE1","",0x1),
-    0x801B7BA4:("D_801B7BA4","UNK_TYPE1","",0x1),
-    0x801B7BAC:("D_801B7BAC","UNK_TYPE1","",0x1),
-    0x801B7BDC:("D_801B7BDC","UNK_TYPE1","",0x1),
-    0x801B7C0C:("D_801B7C0C","UNK_TYPE1","",0x1),
-    0x801B7C3C:("D_801B7C3C","UNK_TYPE1","",0x1),
-    0x801B7C44:("D_801B7C44","UNK_TYPE1","",0x1),
-    0x801B7C54:("D_801B7C54","UNK_TYPE1","",0x1),
-    0x801B7C5C:("D_801B7C5C","UNK_TYPE1","",0x1),
-    0x801B7C64:("D_801B7C64","UNK_TYPE1","",0x1),
-    0x801B7D34:("D_801B7D34","UNK_TYPE1","",0x1),
-    0x801B7D3C:("D_801B7D3C","UNK_TYPE1","",0x1),
-    0x801B7D44:("D_801B7D44","UNK_TYPE1","",0x1),
-    0x801B7D4C:("D_801B7D4C","UNK_TYPE1","",0x1),
-    0x801B7D54:("D_801B7D54","UNK_TYPE1","",0x1),
-    0x801B7D5C:("D_801B7D5C","UNK_TYPE1","",0x1),
-    0x801B7D64:("D_801B7D64","UNK_TYPE1","",0x1),
-    0x801B7DCC:("D_801B7DCC","UNK_TYPE1","",0x1),
-    0x801B7DD4:("D_801B7DD4","UNK_TYPE1","",0x1),
-    0x801B7E3C:("D_801B7E3C","UNK_TYPE1","",0x1),
-    0x801B7F0C:("D_801B7F0C","UNK_TYPE1","",0x1),
-    0x801B7F14:("D_801B7F14","UNK_TYPE1","",0x1),
-    0x801B7F1C:("D_801B7F1C","UNK_TYPE1","",0x1),
-    0x801B7F24:("D_801B7F24","UNK_TYPE1","",0x1),
-    0x801B7F2C:("D_801B7F2C","UNK_TYPE1","",0x1),
-    0x801B7F34:("D_801B7F34","UNK_TYPE1","",0x1),
-    0x801B7F3C:("D_801B7F3C","UNK_TYPE1","",0x1),
-    0x801B7FAC:("D_801B7FAC","UNK_TYPE1","",0x1),
-    0x801B807C:("D_801B807C","UNK_TYPE1","",0x1),
-    0x801B8084:("D_801B8084","UNK_TYPE1","",0x1),
-    0x801B8154:("D_801B8154","UNK_TYPE1","",0x1),
-    0x801B8224:("D_801B8224","UNK_TYPE1","",0x1),
-    0x801B82F4:("D_801B82F4","UNK_TYPE1","",0x1),
-    0x801B82FC:("D_801B82FC","UNK_TYPE1","",0x1),
-    0x801B8304:("D_801B8304","UNK_TYPE1","",0x1),
-    0x801B83D4:("D_801B83D4","UNK_TYPE1","",0x1),
-    0x801B83DC:("D_801B83DC","UNK_TYPE1","",0x1),
-    0x801B8434:("D_801B8434","UNK_TYPE1","",0x1),
-    0x801B843C:("D_801B843C","UNK_TYPE1","",0x1),
-    0x801B8444:("D_801B8444","UNK_TYPE1","",0x1),
-    0x801B8514:("D_801B8514","UNK_TYPE1","",0x1),
-    0x801B85E4:("D_801B85E4","UNK_TYPE1","",0x1),
-    0x801B8664:("D_801B8664","UNK_TYPE1","",0x1),
-    0x801B8754:("D_801B8754","UNK_TYPE1","",0x1),
-    0x801B875C:("D_801B875C","UNK_TYPE1","",0x1),
-    0x801B87C4:("D_801B87C4","UNK_TYPE1","",0x1),
-    0x801B8894:("D_801B8894","UNK_TYPE1","",0x1),
-    0x801B8964:("D_801B8964","UNK_TYPE1","",0x1),
-    0x801B8A34:("D_801B8A34","UNK_TYPE1","",0x1),
-    0x801B8B04:("D_801B8B04","UNK_TYPE1","",0x1),
-    0x801B8BD4:("D_801B8BD4","UNK_TYPE1","",0x1),
-    0x801B8CAC:("D_801B8CAC","UNK_TYPE1","",0x1),
-    0x801B8CB4:("D_801B8CB4","UNK_TYPE1","",0x1),
-    0x801B8D8C:("D_801B8D8C","UNK_TYPE1","",0x1),
-    0x801B8E5C:("D_801B8E5C","UNK_TYPE1","",0x1),
-    0x801B8F2C:("D_801B8F2C","UNK_TYPE1","",0x1),
-    0x801B8F34:("D_801B8F34","UNK_TYPE1","",0x1),
-    0x801B900C:("D_801B900C","UNK_TYPE1","",0x1),
-    0x801B90D4:("D_801B90D4","UNK_TYPE1","",0x1),
-    0x801B91A4:("D_801B91A4","UNK_TYPE1","",0x1),
-    0x801B91AC:("D_801B91AC","UNK_TYPE1","",0x1),
-    0x801B927C:("D_801B927C","UNK_TYPE1","",0x1),
-    0x801B9354:("D_801B9354","UNK_TYPE1","",0x1),
-    0x801B9424:("D_801B9424","UNK_TYPE1","",0x1),
-    0x801B94F4:("D_801B94F4","UNK_TYPE1","",0x1),
-    0x801B95C4:("D_801B95C4","UNK_TYPE1","",0x1),
-    0x801B95CC:("D_801B95CC","UNK_TYPE1","",0x1),
-    0x801B969C:("D_801B969C","UNK_TYPE1","",0x1),
-    0x801B976C:("D_801B976C","UNK_TYPE1","",0x1),
-    0x801B979C:("D_801B979C","UNK_TYPE1","",0x1),
-    0x801B986C:("cameraStates","CameraStateParams","[91]",0x444),
-    0x801B9CB0:("D_801B9CB0","UNK_TYPE1","",0x1),
-    0x801B9CE2:("D_801B9CE2","UNK_TYPE1","",0x1),
-    0x801B9CE4:("D_801B9CE4","UNK_PTR","",0x4),
-    0x801B9CE8:("cameraUpdateFuncs","camera_update_func","[71]",0x11c),
-    0x801B9E04:("D_801B9E04","UNK_TYPE2","",0x2),
-    0x801B9E08:("D_801B9E08","UNK_TYPE4","",0x4),
-    0x801B9E0C:("D_801B9E0C","UNK_TYPE4","",0x4),
-    0x801B9E10:("D_801B9E10","UNK_TYPE4","",0x4),
-    0x801B9E14:("D_801B9E14","UNK_TYPE4","",0x4),
+    0x801B7244:("sSetNormal4ModeTalkData","UNK_TYPE1","",0x1),
+    0x801B7278:("sSetElegyShellModeNormalData","UNK_TYPE1","",0x1),
+    0x801B729C:("sSetElegyShellModeJumpData","UNK_TYPE1","",0x1),
+    0x801B72C0:("sSetElegyShellModeDekuShootData","UNK_TYPE1","",0x1),
+    0x801B72E4:("sSetElegyShellModeGoronDashData","UNK_TYPE1","",0x1),
+    0x801B7308:("sSetElegyShellModeDekuFlyData","UNK_TYPE1","",0x1),
+    0x801B732C:("sSetDungeon4ModeNormalData","UNK_TYPE1","",0x1),
+    0x801B7354:("sSetDungeon4ModeTargetData","UNK_TYPE1","",0x1),
+    0x801B7384:("sSetDungeon4ModeJumpData","UNK_TYPE1","",0x1),
+    0x801B73AC:("sSetDungeon4ModeStillData","UNK_TYPE1","",0x1),
+    0x801B73D4:("sCamSetNormal0Modes","UNK_TYPE1","",0x1),
+    0x801B74C4:("sCamSetNormal3Modes","UNK_TYPE1","",0x1),
+    0x801B759C:("sCamSetPivotDivingModes","UNK_TYPE1","",0x1),
+    0x801B75F4:("sCamSetHorseModes","UNK_TYPE1","",0x1),
+    0x801B767C:("sCamSetZoraDivingModes","UNK_TYPE1","",0x1),
+    0x801B7684:("sCamSetPreRendFixedModes","UNK_TYPE1","",0x1),
+    0x801B768C:("sCamSetPreRendPivotModes","UNK_TYPE1","",0x1),
+    0x801B7694:("sCamSetDoorCModes","UNK_TYPE1","",0x1),
+    0x801B769C:("sCamSetDemo0Modes","UNK_TYPE1","",0x1),
+    0x801B76A4:("sCamSetFree0Modes","UNK_TYPE1","",0x1),
+    0x801B76AC:("sCamSetFukan0Modes","UNK_TYPE1","",0x1),
+    0x801B777C:("sCamSetNormal1Modes","UNK_TYPE1","",0x1),
+    0x801B784C:("sCamSetNanameModes","UNK_TYPE1","",0x1),
+    0x801B791C:("sCamSetCirc0Modes","UNK_TYPE1","",0x1),
+    0x801B7984:("sCamSetFixed0Modes","UNK_TYPE1","",0x1),
+    0x801B79EC:("sCamSetSpiralDoorModes","UNK_TYPE1","",0x1),
+    0x801B79F4:("sCamSetDungeon0Modes","UNK_TYPE1","",0x1),
+    0x801B7AE4:("sCamSetItem0Modes","UNK_TYPE1","",0x1),
+    0x801B7B14:("sCamSetItem1Modes","UNK_TYPE1","",0x1),
+    0x801B7B44:("sCamSetItem2Modes","UNK_TYPE1","",0x1),
+    0x801B7B74:("sCamSetItem3Modes","UNK_TYPE1","",0x1),
+    0x801B7BA4:("sCamSetNaviModes","UNK_TYPE1","",0x1),
+    0x801B7BAC:("sCamSetWarp0Modes","UNK_TYPE1","",0x1),
+    0x801B7BDC:("sCamSetDeathModes","UNK_TYPE1","",0x1),
+    0x801B7C0C:("sCamSetRebirthModes","UNK_TYPE1","",0x1),
+    0x801B7C3C:("sCamSetLongChestOpeningModes","UNK_TYPE1","",0x1),
+    0x801B7C44:("sCamSetMaskTransformationModes","UNK_TYPE1","",0x1),
+    0x801B7C54:("sCamSetAttentionModes","UNK_TYPE1","",0x1),
+    0x801B7C5C:("sCamSetWarp1Modes","UNK_TYPE1","",0x1),
+    0x801B7C64:("sCamSetDungeon1Modes","UNK_TYPE1","",0x1),
+    0x801B7D34:("sCamSetFixed1Modes","UNK_TYPE1","",0x1),
+    0x801B7D3C:("sCamSetFixed2Modes","UNK_TYPE1","",0x1),
+    0x801B7D44:("sCamSetMazeModes","UNK_TYPE1","",0x1),
+    0x801B7D4C:("sCamSetRemoteBombModes","UNK_TYPE1","",0x1),
+    0x801B7D54:("sCamSetCirc1Modes","UNK_TYPE1","",0x1),
+    0x801B7D5C:("sCamSetCirc2Modes","UNK_TYPE1","",0x1),
+    0x801B7D64:("sCamSetCirc3Modes","UNK_TYPE1","",0x1),
+    0x801B7DCC:("sCamSetCirc4Modes","UNK_TYPE1","",0x1),
+    0x801B7DD4:("sCamSetFixed3Modes","UNK_TYPE1","",0x1),
+    0x801B7E3C:("sCamSetTowerClimbModes","UNK_TYPE1","",0x1),
+    0x801B7F0C:("sCamSetParallel0Modes","UNK_TYPE1","",0x1),
+    0x801B7F14:("sCamSetNormDModes","UNK_TYPE1","",0x1),
+    0x801B7F1C:("sCamSetSubjectDModes","UNK_TYPE1","",0x1),
+    0x801B7F24:("sCamSetStart0Modes","UNK_TYPE1","",0x1),
+    0x801B7F2C:("sCamSetStart2Modes","UNK_TYPE1","",0x1),
+    0x801B7F34:("sCamSetStop0Modes","UNK_TYPE1","",0x1),
+    0x801B7F3C:("sCamSetBoatCruiseModes","UNK_TYPE1","",0x1),
+    0x801B7FAC:("sCamSetVerticalClimbModes","UNK_TYPE1","",0x1),
+    0x801B807C:("sCamSetSidedModes","UNK_TYPE1","",0x1),
+    0x801B8084:("sCamSetDungeon2Modes","UNK_TYPE1","",0x1),
+    0x801B8154:("sCamSetBossOdolwaModes","UNK_TYPE1","",0x1),
+    0x801B8224:("sCamSetKeepBackModes","UNK_TYPE1","",0x1),
+    0x801B82F4:("sCamSetCirc6Modes","UNK_TYPE1","",0x1),
+    0x801B82FC:("sCamSetCirc7Modes","UNK_TYPE1","",0x1),
+    0x801B8304:("sCamSetMiniBossModes","UNK_TYPE1","",0x1),
+    0x801B83D4:("sCamSetRFixed1Modes","UNK_TYPE1","",0x1),
+    0x801B83DC:("sCamSetTreasureChestMinigameModes","UNK_TYPE1","",0x1),
+    0x801B8434:("sCamSetBombBasketModes","UNK_TYPE1","",0x1),
+    0x801B843C:("sCamSetCirc8Modes","UNK_TYPE1","",0x1),
+    0x801B8444:("sCamSetFukan1Modes","UNK_TYPE1","",0x1),
+    0x801B8514:("sCamSetDungeon3Modes","UNK_TYPE1","",0x1),
+    0x801B85E4:("sCamSetTelescopeModes","UNK_TYPE1","",0x1),
+    0x801B8664:("sCamSetRoom0Modes","UNK_TYPE1","",0x1),
+    0x801B8754:("sCamSetRCirc0Modes","UNK_TYPE1","",0x1),
+    0x801B875C:("sCamSetCirc9Modes","UNK_TYPE1","",0x1),
+    0x801B87C4:("sCamSetOnThePoleModes","UNK_TYPE1","",0x1),
+    0x801B8894:("sCamSetInBushModes","UNK_TYPE1","",0x1),
+    0x801B8964:("sCamSetBossMajoraModes","UNK_TYPE1","",0x1),
+    0x801B8A34:("sCamSetBossTwinmoldModes","UNK_TYPE1","",0x1),
+    0x801B8B04:("sCamSetBossGohtModes","UNK_TYPE1","",0x1),
+    0x801B8BD4:("sCamSetBossGyorgModes","UNK_TYPE1","",0x1),
+    0x801B8CAC:("sCamSetConnect0Modes","UNK_TYPE1","",0x1),
+    0x801B8CB4:("sCamSetPinnacleRockModes","UNK_TYPE1","",0x1),
+    0x801B8D8C:("sCamSetNormal2Modes","UNK_TYPE1","",0x1),
+    0x801B8E5C:("sCamSetBombBowlModes","UNK_TYPE1","",0x1),
+    0x801B8F2C:("sCamSetCircAModes","UNK_TYPE1","",0x1),
+    0x801B8F34:("sCamSetWhirlpoolModes","UNK_TYPE1","",0x1),
+    0x801B900C:("sCamSetCuccoShackModes","UNK_TYPE1","",0x1),
+    0x801B90D4:("sCamSetGiantModes","UNK_TYPE1","",0x1),
+    0x801B91A4:("sCamSetScene0Modes","UNK_TYPE1","",0x1),
+    0x801B91AC:("sCamSetRoom1Modes","UNK_TYPE1","",0x1),
+    0x801B927C:("sCamSetWater2Modes","UNK_TYPE1","",0x1),
+    0x801B9354:("sCamSetWoodfallSwampModes","UNK_TYPE1","",0x1),
+    0x801B9424:("sCamSetForceKeepModes","UNK_TYPE1","",0x1),
+    0x801B94F4:("sCamSetParallel1Modes","UNK_TYPE1","",0x1),
+    0x801B95C4:("sCamSetStart1Modes","UNK_TYPE1","",0x1),
+    0x801B95CC:("sCamSetRoom2Modes","UNK_TYPE1","",0x1),
+    0x801B969C:("sCamSetNorm4Modes","UNK_TYPE1","",0x1),
+    0x801B976C:("sCamSetElegyShellModes","UNK_TYPE1","",0x1),
+    0x801B979C:("sCamSetDungeon4Modes","UNK_TYPE1","",0x1),
+    0x801B986C:("sCameraSettings","CameraSetting","[91]",0x444),
+    0x801B9CB0:("sGlobalCamDataSettings","s16","[26]",0x34),
+    0x801B9CE4:("sGlobalCamDataSettingsPtr","s16*","",0x4),
+    0x801B9CE8:("sCameraUpdateHandlers","camera_update_func","[71]",0x11c),
+    0x801B9E04:("sCameraNextUID","UNK_TYPE2","",0x2),
+    0x801B9E08:("sCameraInterfaceFlags","UNK_TYPE4","",0x4),
+    0x801B9E0C:("sCameraHudVisibility","UNK_TYPE4","",0x4),
+    0x801B9E10:("sCameraLetterboxSize","UNK_TYPE4","",0x4),
+    0x801B9E14:("sCameraNegOne","UNK_TYPE4","",0x4),
     0x801B9E18:("D_801B9E18","UNK_TYPE2","",0x2),
     0x801B9E34:("D_801B9E34","UNK_TYPE2","",0x2),
-    0x801B9E50:("D_801B9E50","UNK_TYPE4","",0x4),
-    0x801B9E54:("D_801B9E54","UNK_TYPE4","",0x4),
-    0x801B9E58:("D_801B9E58","UNK_TYPE4","",0x4),
+    0x801B9E50:("sUpdateCameraDirection","UNK_TYPE4","",0x4),
+    0x801B9E54:("sIsFalse","UNK_TYPE4","",0x4),
+    0x801B9E58:("sCameraInitSceneTimer","UNK_TYPE4","",0x4),
     0x801B9E5C:("D_801B9E5C","UNK_TYPE4","",0x4),
     0x801B9E60:("D_801B9E60","f32","",0x4),
     0x801B9E64:("D_801B9E64","UNK_TYPE1","",0x1),
     0x801B9E84:("D_801B9E84","UNK_TYPE1","",0x1),
     0x801B9EB4:("D_801B9EB4","UNK_TYPE4","",0x4),
     0x801B9ED4:("D_801B9ED4","UNK_TYPE4","",0x4),
-    0x801B9F04:("D_801B9F04","UNK_TYPE4","",0x4),
-    0x801B9F0C:("D_801B9F0C","UNK_TYPE2","",0x2),
-    0x801B9F10:("D_801B9F10","UNK_TYPE4","",0x4),
+    0x801B9F04:("sEarthquakeFreq","UNK_TYPE4","",0x4),
+    0x801B9F0C:("sEarthquakeTimer","UNK_TYPE2","",0x2),
+    0x801B9F10:("sModeChangeFlags","UNK_TYPE4","",0x4),
     0x801B9F20:("sDamageTablePresets","DamageTable","[23]",0x2e0),
     0x801BA200:("damageMultipliers","f32","[16]",0x40),
     0x801BA240:("defaultCollider","Collider","",0x18),
@@ -3861,26 +3873,14 @@
     0x801EDBA8:("D_801EDBA8","Sphere16","",0x8),
     0x801EDBB0:("D_801EDBB0","TriNorm","",0x34),
     0x801EDBF0:("D_801EDBF0","s16","",0x2),
-    0x801EDBF4:("D_801EDBF4","UNK_TYPE1","",0x1),
-    0x801EDBF8:("D_801EDBF8","UNK_TYPE1","",0x1),
-    0x801EDC00:("D_801EDC00","UNK_TYPE1","",0x1),
-    0x801EDC04:("D_801EDC04","UNK_TYPE1","",0x1),
-    0x801EDC08:("D_801EDC08","UNK_TYPE1","",0x1),
-    0x801EDC0C:("D_801EDC0C","UNK_TYPE1","",0x1),
-    0x801EDC10:("D_801EDC10","UNK_TYPE1","",0x1),
-    0x801EDC14:("D_801EDC14","UNK_TYPE1","",0x1),
-    0x801EDC28:("D_801EDC28","UNK_TYPE1","",0x1),
-    0x801EDC30:("D_801EDC30","UNK_TYPE1","",0x1),
-    0x801EDC8C:("D_801EDC8C","UNK_TYPE1","",0x1),
-    0x801EDC90:("D_801EDC90","UNK_TYPE1","",0x1),
-    0x801EDC92:("D_801EDC92","UNK_TYPE1","",0x1),
-    0x801EDC94:("D_801EDC94","UNK_TYPE1","",0x1),
-    0x801EDC96:("D_801EDC96","UNK_TYPE1","",0x1),
-    0x801EDDD0:("D_801EDDD0","UNK_TYPE1","",0x1),
-    0x801EDDD4:("D_801EDDD4","UNK_TYPE1","",0x1),
-    0x801EDDD8:("D_801EDDD8","UNK_TYPE1","",0x1),
-    0x801EDDE0:("D_801EDDE0","UNK_TYPE1","",0x1),
-    0x801EDDF0:("D_801EDDF0","UNK_TYPE1","",0x1),
+    0x801EDBF4:("D_801EDBF4","f32","",0x4),
+    0x801EDBF8:("D_801EDBF8","f32","",0x4),
+    0x801EDC00:("D_801EDC00","CameraCollision","",0x28),
+    0x801EDC28:("sCamPlayState","PlayState*","",0x4),
+    0x801EDC30:("D_801EDC30","SwingAnimation","[4]",0x1A0),
+    0x801EDDD0:("D_801EDDD0","Vec3f","",0xc),
+    0x801EDDE0:("D_801EDDE0","Vec3f","",0xc),
+    0x801EDDF0:("D_801EDDF0","Vec3f","",0xc),
     0x801EDE00:("D_801EDE00","Vec3f","",0xc),
     0x801EDE10:("D_801EDE10","Vec3f","",0xc),
     0x801EDE20:("D_801EDE20","Vec3f","",0xc),

tools/sizes/code_functions.csv

@@ -696,77 +696,77 @@ asm/non_matchings/code/z_camera/func_800CE930.s,func_800CE930,0x800CE930,0x6A
 asm/non_matchings/code/z_camera/func_800CEAD8.s,func_800CEAD8,0x800CEAD8,0x58
 asm/non_matchings/code/z_camera/func_800CEC38.s,func_800CEC38,0x800CEC38,0x56
 asm/non_matchings/code/z_camera/func_800CED90.s,func_800CED90,0x800CED90,0x185
-asm/non_matchings/code/z_camera/Camera_ModeNop.s,Camera_ModeNop,0x800CF3A4,0x4
-asm/non_matchings/code/z_camera/Camera_ModeNORM1.s,Camera_ModeNORM1,0x800CF3B4,0x530
-asm/non_matchings/code/z_camera/Camera_ModeNORM2.s,Camera_ModeNORM2,0x800D0874,0x8
-asm/non_matchings/code/z_camera/Camera_ModeNORM3.s,Camera_ModeNORM3,0x800D0894,0x265
-asm/non_matchings/code/z_camera/Camera_ModeNORM4.s,Camera_ModeNORM4,0x800D1228,0x24
-asm/non_matchings/code/z_camera/Camera_ModeNORM0.s,Camera_ModeNORM0,0x800D12B8,0x1F0
-asm/non_matchings/code/z_camera/Camera_ModePARA1.s,Camera_ModePARA1,0x800D1A78,0x40C
-asm/non_matchings/code/z_camera/Camera_ModePARA2.s,Camera_ModePARA2,0x800D2AA8,0x8
-asm/non_matchings/code/z_camera/Camera_ModePARA3.s,Camera_ModePARA3,0x800D2AC8,0x8
-asm/non_matchings/code/z_camera/Camera_ModePARA4.s,Camera_ModePARA4,0x800D2AE8,0x8
-asm/non_matchings/code/z_camera/Camera_ModePARA0.s,Camera_ModePARA0,0x800D2B08,0x8
-asm/non_matchings/code/z_camera/Camera_ModeJUMP1.s,Camera_ModeJUMP1,0x800D2B28,0x8
-asm/non_matchings/code/z_camera/Camera_ModeJUMP2.s,Camera_ModeJUMP2,0x800D2B48,0x276
-asm/non_matchings/code/z_camera/Camera_ModeJUMP3.s,Camera_ModeJUMP3,0x800D3520,0x330
-asm/non_matchings/code/z_camera/Camera_ModeJUMP4.s,Camera_ModeJUMP4,0x800D41E0,0x8
-asm/non_matchings/code/z_camera/Camera_ModeJUMP0.s,Camera_ModeJUMP0,0x800D4200,0x8
-asm/non_matchings/code/z_camera/Camera_ModeBATT1.s,Camera_ModeBATT1,0x800D4220,0x4E2
-asm/non_matchings/code/z_camera/Camera_ModeBATT2.s,Camera_ModeBATT2,0x800D55A8,0x8
-asm/non_matchings/code/z_camera/Camera_ModeBATT3.s,Camera_ModeBATT3,0x800D55C8,0x8
-asm/non_matchings/code/z_camera/Camera_ModeBATT4.s,Camera_ModeBATT4,0x800D55E8,0x8
-asm/non_matchings/code/z_camera/Camera_ModeBATT0.s,Camera_ModeBATT0,0x800D5608,0x8
-asm/non_matchings/code/z_camera/Camera_ModeKEEP1.s,Camera_ModeKEEP1,0x800D5628,0x46D
-asm/non_matchings/code/z_camera/Camera_ModeKEEP2.s,Camera_ModeKEEP2,0x800D67DC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeKEEP3.s,Camera_ModeKEEP3,0x800D67FC,0x2F3
-asm/non_matchings/code/z_camera/Camera_ModeKEEP4.s,Camera_ModeKEEP4,0x800D73C8,0x2F7
-asm/non_matchings/code/z_camera/Camera_ModeKEEP0.s,Camera_ModeKEEP0,0x800D7FA4,0x8
-asm/non_matchings/code/z_camera/Camera_ModeFIXD1.s,Camera_ModeFIXD1,0x800D7FC4,0x101
-asm/non_matchings/code/z_camera/Camera_ModeFIXD2.s,Camera_ModeFIXD2,0x800D83C8,0x290
-asm/non_matchings/code/z_camera/Camera_ModeFIXD3.s,Camera_ModeFIXD3,0x800D8E08,0x8
-asm/non_matchings/code/z_camera/Camera_ModeFIXD4.s,Camera_ModeFIXD4,0x800D8E28,0x8
-asm/non_matchings/code/z_camera/Camera_ModeFIXD0.s,Camera_ModeFIXD0,0x800D8E48,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSUBJ1.s,Camera_ModeSUBJ1,0x800D8E68,0x185
-asm/non_matchings/code/z_camera/Camera_ModeSUBJ2.s,Camera_ModeSUBJ2,0x800D947C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSUBJ3.s,Camera_ModeSUBJ3,0x800D949C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSUBJ4.s,Camera_ModeSUBJ4,0x800D94BC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSUBJ0.s,Camera_ModeSUBJ0,0x800D94DC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDATA0.s,Camera_ModeDATA0,0x800D94FC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDATA1.s,Camera_ModeDATA1,0x800D951C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDATA2.s,Camera_ModeDATA2,0x800D953C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDATA3.s,Camera_ModeDATA3,0x800D955C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDATA4.s,Camera_ModeDATA4,0x800D957C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ1.s,Camera_ModeUNIQ1,0x800D959C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ2.s,Camera_ModeUNIQ2,0x800D95BC,0x105
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ3.s,Camera_ModeUNIQ3,0x800D99D0,0x17
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ4.s,Camera_ModeUNIQ4,0x800D9A2C,0x17
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ5.s,Camera_ModeUNIQ5,0x800D9A88,0x17
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ0.s,Camera_ModeUNIQ0,0x800D9AE4,0x235
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ6.s,Camera_ModeUNIQ6,0x800DA3B8,0x4D
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ7.s,Camera_ModeUNIQ7,0x800DA4EC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ8.s,Camera_ModeUNIQ8,0x800DA50C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeUNIQ9.s,Camera_ModeUNIQ9,0x800DA52C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDEMO1.s,Camera_ModeDEMO1,0x800DA54C,0x1F1
-asm/non_matchings/code/z_camera/Camera_ModeDEMO2.s,Camera_ModeDEMO2,0x800DAD10,0x2BD
-asm/non_matchings/code/z_camera/Camera_ModeDEMO3.s,Camera_ModeDEMO3,0x800DB804,0xC4
-asm/non_matchings/code/z_camera/Camera_ModeDEMO4.s,Camera_ModeDEMO4,0x800DBB14,0x1D7
-asm/non_matchings/code/z_camera/Camera_ModeDEMO5.s,Camera_ModeDEMO5,0x800DC270,0x12A
-asm/non_matchings/code/z_camera/Camera_ModeDEMO6.s,Camera_ModeDEMO6,0x800DC718,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDEMO7.s,Camera_ModeDEMO7,0x800DC738,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDEMO8.s,Camera_ModeDEMO8,0x800DC758,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDEMO9.s,Camera_ModeDEMO9,0x800DC778,0x8
-asm/non_matchings/code/z_camera/Camera_ModeDEMO0.s,Camera_ModeDEMO0,0x800DC798,0x13E
-asm/non_matchings/code/z_camera/Camera_ModeSPEC0.s,Camera_ModeSPEC0,0x800DCC90,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC1.s,Camera_ModeSPEC1,0x800DCCB0,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC2.s,Camera_ModeSPEC2,0x800DCCD0,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC3.s,Camera_ModeSPEC3,0x800DCCF0,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC4.s,Camera_ModeSPEC4,0x800DCD10,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC5.s,Camera_ModeSPEC5,0x800DCD30,0xF3
-asm/non_matchings/code/z_camera/Camera_ModeSPEC6.s,Camera_ModeSPEC6,0x800DD0FC,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC7.s,Camera_ModeSPEC7,0x800DD11C,0x8
-asm/non_matchings/code/z_camera/Camera_ModeSPEC8.s,Camera_ModeSPEC8,0x800DD13C,0x11F
-asm/non_matchings/code/z_camera/Camera_ModeSPEC9.s,Camera_ModeSPEC9,0x800DD5B8,0x1E8
+asm/non_matchings/code/z_camera/Camera_Noop.s,Camera_Noop,0x800CF3A4,0x4
+asm/non_matchings/code/z_camera/Camera_Normal1.s,Camera_Normal1,0x800CF3B4,0x530
+asm/non_matchings/code/z_camera/Camera_Normal2.s,Camera_Normal2,0x800D0874,0x8
+asm/non_matchings/code/z_camera/Camera_Normal3.s,Camera_Normal3,0x800D0894,0x265
+asm/non_matchings/code/z_camera/Camera_Normal4.s,Camera_Normal4,0x800D1228,0x24
+asm/non_matchings/code/z_camera/Camera_Normal0.s,Camera_Normal0,0x800D12B8,0x1F0
+asm/non_matchings/code/z_camera/Camera_Parallel1.s,Camera_Parallel1,0x800D1A78,0x40C
+asm/non_matchings/code/z_camera/Camera_Parallel2.s,Camera_Parallel2,0x800D2AA8,0x8
+asm/non_matchings/code/z_camera/Camera_Parallel3.s,Camera_Parallel3,0x800D2AC8,0x8
+asm/non_matchings/code/z_camera/Camera_Parallel4.s,Camera_Parallel4,0x800D2AE8,0x8
+asm/non_matchings/code/z_camera/Camera_Parallel0.s,Camera_Parallel0,0x800D2B08,0x8
+asm/non_matchings/code/z_camera/Camera_Jump1.s,Camera_Jump1,0x800D2B28,0x8
+asm/non_matchings/code/z_camera/Camera_Jump2.s,Camera_Jump2,0x800D2B48,0x276
+asm/non_matchings/code/z_camera/Camera_Jump3.s,Camera_Jump3,0x800D3520,0x330
+asm/non_matchings/code/z_camera/Camera_Jump4.s,Camera_Jump4,0x800D41E0,0x8
+asm/non_matchings/code/z_camera/Camera_Jump0.s,Camera_Jump0,0x800D4200,0x8
+asm/non_matchings/code/z_camera/Camera_Battle1.s,Camera_Battle1,0x800D4220,0x4E2
+asm/non_matchings/code/z_camera/Camera_Battle2.s,Camera_Battle2,0x800D55A8,0x8
+asm/non_matchings/code/z_camera/Camera_Battle3.s,Camera_Battle3,0x800D55C8,0x8
+asm/non_matchings/code/z_camera/Camera_Battle4.s,Camera_Battle4,0x800D55E8,0x8
+asm/non_matchings/code/z_camera/Camera_Battle0.s,Camera_Battle0,0x800D5608,0x8
+asm/non_matchings/code/z_camera/Camera_KeepOn1.s,Camera_KeepOn1,0x800D5628,0x46D
+asm/non_matchings/code/z_camera/Camera_KeepOn2.s,Camera_KeepOn2,0x800D67DC,0x8
+asm/non_matchings/code/z_camera/Camera_KeepOn3.s,Camera_KeepOn3,0x800D67FC,0x2F3
+asm/non_matchings/code/z_camera/Camera_KeepOn4.s,Camera_KeepOn4,0x800D73C8,0x2F7
+asm/non_matchings/code/z_camera/Camera_KeepOn0.s,Camera_KeepOn0,0x800D7FA4,0x8
+asm/non_matchings/code/z_camera/Camera_Fixed1.s,Camera_Fixed1,0x800D7FC4,0x101
+asm/non_matchings/code/z_camera/Camera_Fixed2.s,Camera_Fixed2,0x800D83C8,0x290
+asm/non_matchings/code/z_camera/Camera_Fixed3.s,Camera_Fixed3,0x800D8E08,0x8
+asm/non_matchings/code/z_camera/Camera_Fixed4.s,Camera_Fixed4,0x800D8E28,0x8
+asm/non_matchings/code/z_camera/Camera_Fixed0.s,Camera_Fixed0,0x800D8E48,0x8
+asm/non_matchings/code/z_camera/Camera_Subject1.s,Camera_Subject1,0x800D8E68,0x185
+asm/non_matchings/code/z_camera/Camera_Subject2.s,Camera_Subject2,0x800D947C,0x8
+asm/non_matchings/code/z_camera/Camera_Subject3.s,Camera_Subject3,0x800D949C,0x8
+asm/non_matchings/code/z_camera/Camera_Subject4.s,Camera_Subject4,0x800D94BC,0x8
+asm/non_matchings/code/z_camera/Camera_Subject0.s,Camera_Subject0,0x800D94DC,0x8
+asm/non_matchings/code/z_camera/Camera_Data0.s,Camera_Data0,0x800D94FC,0x8
+asm/non_matchings/code/z_camera/Camera_Data1.s,Camera_Data1,0x800D951C,0x8
+asm/non_matchings/code/z_camera/Camera_Data2.s,Camera_Data2,0x800D953C,0x8
+asm/non_matchings/code/z_camera/Camera_Data3.s,Camera_Data3,0x800D955C,0x8
+asm/non_matchings/code/z_camera/Camera_Data4.s,Camera_Data4,0x800D957C,0x8
+asm/non_matchings/code/z_camera/Camera_Unique1.s,Camera_Unique1,0x800D959C,0x8
+asm/non_matchings/code/z_camera/Camera_Unique2.s,Camera_Unique2,0x800D95BC,0x105
+asm/non_matchings/code/z_camera/Camera_Unique3.s,Camera_Unique3,0x800D99D0,0x17
+asm/non_matchings/code/z_camera/Camera_Unique4.s,Camera_Unique4,0x800D9A2C,0x17
+asm/non_matchings/code/z_camera/Camera_Unique5.s,Camera_Unique5,0x800D9A88,0x17
+asm/non_matchings/code/z_camera/Camera_Unique0.s,Camera_Unique0,0x800D9AE4,0x235
+asm/non_matchings/code/z_camera/Camera_Unique6.s,Camera_Unique6,0x800DA3B8,0x4D
+asm/non_matchings/code/z_camera/Camera_Unique7.s,Camera_Unique7,0x800DA4EC,0x8
+asm/non_matchings/code/z_camera/Camera_Unique8.s,Camera_Unique8,0x800DA50C,0x8
+asm/non_matchings/code/z_camera/Camera_Unique9.s,Camera_Unique9,0x800DA52C,0x8
+asm/non_matchings/code/z_camera/Camera_Demo1.s,Camera_Demo1,0x800DA54C,0x1F1
+asm/non_matchings/code/z_camera/Camera_Demo2.s,Camera_Demo2,0x800DAD10,0x2BD
+asm/non_matchings/code/z_camera/Camera_Demo3.s,Camera_Demo3,0x800DB804,0xC4
+asm/non_matchings/code/z_camera/Camera_Demo4.s,Camera_Demo4,0x800DBB14,0x1D7
+asm/non_matchings/code/z_camera/Camera_Demo5.s,Camera_Demo5,0x800DC270,0x12A
+asm/non_matchings/code/z_camera/Camera_Demo6.s,Camera_Demo6,0x800DC718,0x8
+asm/non_matchings/code/z_camera/Camera_Demo7.s,Camera_Demo7,0x800DC738,0x8
+asm/non_matchings/code/z_camera/Camera_Demo8.s,Camera_Demo8,0x800DC758,0x8
+asm/non_matchings/code/z_camera/Camera_Demo9.s,Camera_Demo9,0x800DC778,0x8
+asm/non_matchings/code/z_camera/Camera_Demo0.s,Camera_Demo0,0x800DC798,0x13E
+asm/non_matchings/code/z_camera/Camera_Special0.s,Camera_Special0,0x800DCC90,0x8
+asm/non_matchings/code/z_camera/Camera_Special1.s,Camera_Special1,0x800DCCB0,0x8
+asm/non_matchings/code/z_camera/Camera_Special2.s,Camera_Special2,0x800DCCD0,0x8
+asm/non_matchings/code/z_camera/Camera_Special3.s,Camera_Special3,0x800DCCF0,0x8
+asm/non_matchings/code/z_camera/Camera_Special4.s,Camera_Special4,0x800DCD10,0x8
+asm/non_matchings/code/z_camera/Camera_Special5.s,Camera_Special5,0x800DCD30,0xF3
+asm/non_matchings/code/z_camera/Camera_Special6.s,Camera_Special6,0x800DD0FC,0x8
+asm/non_matchings/code/z_camera/Camera_Special7.s,Camera_Special7,0x800DD11C,0x8
+asm/non_matchings/code/z_camera/Camera_Special8.s,Camera_Special8,0x800DD13C,0x11F
+asm/non_matchings/code/z_camera/Camera_Special9.s,Camera_Special9,0x800DD5B8,0x1E8
 asm/non_matchings/code/z_camera/Camera_Alloc.s,Camera_Alloc,0x800DDD58,0x14
 asm/non_matchings/code/z_camera/Camera_Free.s,Camera_Free,0x800DDDA8,0xA
 asm/non_matchings/code/z_camera/Camera_Init.s,Camera_Init,0x800DDDD0,0x84