mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
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
This commit is contained in:
engineer124
+2
-110
@@ -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);
|
||||
|
||||
+3
-388
@@ -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];
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
+1247
-23
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "global.h"
|
||||
|
||||
u8 D_80096B20 = 1;
|
||||
|
||||
+127
-71
@@ -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")
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+71
-71
@@ -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",),
|
||||
|
||||
+296
-296
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user