diff --git a/include/z64camera.h b/include/z64camera.h index 1c4cc3f3c2..2b7e96e082 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -28,82 +28,82 @@ typedef enum { /* 0x03 */ CAM_SET_DUNGEON0, /* 0x04 */ CAM_SET_DUNGEON1, /* 0x05 */ CAM_SET_NORMAL3, - /* 0x06 */ CAM_SET_HORSE0, - /* 0x07 */ CAM_SET_BOSS_GOMA, - /* 0x08 */ CAM_SET_BOSS_DODO, - /* 0x09 */ CAM_SET_BOSS_BARI, - /* 0x0A */ CAM_SET_BOSS_FGANON, - /* 0x0B */ CAM_SET_BOSS_BAL, - /* 0x0C */ CAM_SET_BOSS_SHADES, - /* 0x0D */ CAM_SET_BOSS_MOFA, - /* 0x0E */ CAM_SET_TWIN0, - /* 0x0F */ CAM_SET_TWIN1, - /* 0x10 */ CAM_SET_BOSS_GANON1, - /* 0x11 */ CAM_SET_BOSS_GANON2, - /* 0x12 */ CAM_SET_TOWER0, - /* 0x13 */ CAM_SET_TOWER1, - /* 0x14 */ CAM_SET_FIXED0, - /* 0x15 */ CAM_SET_FIXED1, - /* 0x16 */ CAM_SET_CIRCLE0, - /* 0x17 */ CAM_SET_CIRCLE2, - /* 0x18 */ CAM_SET_CIRCLE3, - /* 0x19 */ CAM_SET_PREREND0, - /* 0x1A */ CAM_SET_PREREND1, - /* 0x1B */ CAM_SET_PREREND3, - /* 0x1C */ CAM_SET_DOOR0, - /* 0x1D */ CAM_SET_DOORC, - /* 0x1E */ CAM_SET_RAIL3, - /* 0x1F */ CAM_SET_START0, - /* 0x20 */ CAM_SET_START1, - /* 0x21 */ CAM_SET_FREE0, - /* 0x22 */ CAM_SET_FREE2, - /* 0x23 */ CAM_SET_CIRCLE4, - /* 0x24 */ CAM_SET_CIRCLE5, - /* 0x25 */ CAM_SET_DEMO0, - /* 0x26 */ CAM_SET_DEMO1, - /* 0x27 */ CAM_SET_MORI1, - /* 0x28 */ CAM_SET_ITEM0, - /* 0x29 */ CAM_SET_ITEM1, - /* 0x2A */ CAM_SET_DEMO3, - /* 0x2B */ CAM_SET_DEMO4, - /* 0x2C */ CAM_SET_UFOBEAN, - /* 0x2D */ CAM_SET_LIFTBEAN, - /* 0x2E */ CAM_SET_SCENE0, - /* 0x2F */ CAM_SET_SCENE1, - /* 0x30 */ CAM_SET_HIDAN1, - /* 0x31 */ CAM_SET_HIDAN2, - /* 0x32 */ CAM_SET_MORI2, - /* 0x33 */ CAM_SET_MORI3, - /* 0x34 */ CAM_SET_TAKO, - /* 0x35 */ CAM_SET_SPOT05A, - /* 0x36 */ CAM_SET_SPOT05B, - /* 0x37 */ CAM_SET_HIDAN3, - /* 0x38 */ CAM_SET_ITEM2, - /* 0x39 */ CAM_SET_CIRCLE6, + /* 0x06 */ CAM_SET_HORSE, // "HORSE0" + /* 0x07 */ CAM_SET_BOSS_GOHMA, // "BOSS_GOMA" (unused) + /* 0x08 */ CAM_SET_BOSS_DODONGO, // "BOSS_DODO" (unused) + /* 0x09 */ CAM_SET_BOSS_BARINADE, // "BOSS_BARI" (unused) + /* 0x0A */ CAM_SET_BOSS_PHANTOM_GANON, // "BOSS_FGANON" + /* 0x0B */ CAM_SET_BOSS_VOLVAGIA, // "BOSS_BAL" + /* 0x0C */ CAM_SET_BOSS_BONGO, // "BOSS_SHADES" + /* 0x0D */ CAM_SET_BOSS_MORPHA, // "BOSS_MOFA" (unused) + /* 0x0E */ CAM_SET_BOSS_TWINROVA_PLATFORM, // Upper main platform and 4 smaller platforms in the room of the Twinrova boss battle "TWIN0" + /* 0x0F */ CAM_SET_BOSS_TWINROVA_FLOOR, // The floor in the room of the Twinrova boss battle "TWIN1" + /* 0x10 */ CAM_SET_BOSS_GANONDORF, // "BOSS_GANON1" + /* 0x11 */ CAM_SET_BOSS_GANON, // "BOSS_GANON2" (unused) + /* 0x12 */ CAM_SET_TOWER_CLIMB, // Various climbing structures (collapse sequence stairs, spiral around sarias house, zora domain climb, etc...) "TOWER0" + /* 0x13 */ CAM_SET_TOWER_UNUSED, // Unused but data is in Phantom Ganon's Lair (no surface uses it) "TOWER1" + /* 0x14 */ CAM_SET_MARKET_BALCONY, // Activated in day child market by talking to NPC on balcony above bombchu bowling "FIXED0" + /* 0x15 */ CAM_SET_CHU_BOWLING, // Fixes the camera to the bombchu bowling targets while playing the minigame "FIXED1" + /* 0x16 */ CAM_SET_PIVOT_CRAWLSPACE, // Unknown. In scene data: closely associated with crawlspaces CIRCLE0" + /* 0x17 */ CAM_SET_PIVOT_SHOP_BROWSING, // Shopping and browsing for items "CIRCLE2" + /* 0x18 */ CAM_SET_PIVOT_IN_FRONT, // The camera used on Link's balcony in Kokiri forest. Data present in scene data for Deku Tree, GTG, Inside Ganon's Castle (TODO: may or may not be used) "CIRCLE3" + /* 0x19 */ CAM_SET_PREREND_FIXED, // Camera is fixed in position and rotation "PREREND0" + /* 0x1A */ CAM_SET_PREREND_PIVET, // Camera is fixed in position with fixed pitch, but is free to rotate in the yaw direction 360 degrees "PREREND1" + /* 0x1B */ CAM_SET_PREREND_SIDE_SCROLL, // Camera side-scrolls position to follow link. Only used in castle courtyard with the guards "PREREND3" + /* 0x1C */ CAM_SET_DOOR0, // Custom room door transitions, used in fire and royal family tomb + /* 0x1D */ CAM_SET_DOORC, // Generic room door transitions, camera moves and follows player as the door is open and closed + /* 0x1E */ CAM_SET_CRAWLSPACE, // Used in all crawlspaces "RAIL3" + /* 0x1F */ CAM_SET_START0, // Data is given in Temple of Time, but no surface uses it + /* 0x20 */ CAM_SET_START1, // Scene/room door transitions that snap the camera to a fixed location (example: ganon's towers doors climbing up) + /* 0x21 */ CAM_SET_FREE0, // Full manual control is given over the camera + /* 0x22 */ CAM_SET_FREE2, // Various OnePoint Cutscenes, 10 total (example: falling chest) + /* 0x23 */ CAM_SET_PIVOT_CORNER, // Inside the carpenter jail cells from theives hideout "CIRCLE4" + /* 0x24 */ CAM_SET_PIVOT_WATER_SURFACE, // Player diving from the surface of the water to underwater "CIRCLE5" + /* 0x25 */ CAM_SET_CS_0, // Various cutscenes "DEMO0" + /* 0x26 */ CAM_SET_CS_TWISTED_HALLWAY, // Never set to, but checked in twisting hallway (Forest Temple) "DEMO1" + /* 0x27 */ CAM_SET_FOREST_BIRDS_EYE, // Used in the falling ceiling room in forest temple "MORI1" + /* 0x28 */ CAM_SET_SLOW_CHEST_CS, // Long cutscene when opening a big chest with a major item "ITEM0" + /* 0x29 */ CAM_SET_ITEM_UNUSED, // Unused "ITEM1" + /* 0x2A */ CAM_SET_CS_3, // Various cutscenes "DEMO3" + /* 0x2B */ CAM_SET_CS_ATTENTION, // Attention cutscenes and the actor siofuki (water spout/jet) "DEMO4" + /* 0x2C */ CAM_SET_BEAN_GENERIC, // All beans except lost woods "UFOBEAN" + /* 0x2D */ CAM_SET_BEAN_LOST_WOODS, // Lost woods bean "LIFTBEAN" + /* 0x2E */ CAM_SET_SCENE_UNUSED, // Unused "SCENE0" + /* 0x2F */ CAM_SET_SCENE_TRANSITION, // Scene Transitions "SCENE1" + /* 0x30 */ CAM_SET_FIRE_PLATFORM, // All the fire platforms that rise. Also used in non-mq spirit shortcut "HIDAN1" + /* 0x31 */ CAM_SET_FIRE_STAIRCASE, // Used on fire staircase actor cutscene in shortcut room connecting vanilla hammer chest to the final goron small key "HIDAN2" + /* 0x32 */ CAM_SET_FOREST_UNUSED, // Unused "MORI2" + /* 0x33 */ CAM_SET_FOREST_DEFEAT_POE, // Used when defeating a poe sister "MORI3" + /* 0x34 */ CAM_SET_BIG_OCTO, // Used by big octo miniboss in Jabu Jabu "TAKO" + /* 0x35 */ CAM_SET_MEADOW_BIRDS_EYE, // Used only as child in Sacred Forest Meadow Maze "SPOT05A" + /* 0x36 */ CAM_SET_MEADOW_UNUSED, // Unused from Sacred Forest Meadow "SPOT05B" + /* 0x37 */ CAM_SET_FIRE_BIRDS_EYE, // Used in lower-floor maze in non-mq fire temple "HIDAN3" + /* 0x38 */ CAM_SET_TURN_AROUND, // Put the camera in front of player and turn around to look at player from the front "ITEM2" + /* 0x39 */ CAM_SET_PIVOT_VERTICAL, // Lowering platforms (forest temple bow room, Jabu final shortcut) "CAM_SET_PIVOT_VERTICAL" /* 0x3A */ CAM_SET_NORMAL2, - /* 0x3B */ CAM_SET_FISHING, - /* 0x3C */ CAM_SET_DEMOC, - /* 0x3D */ CAM_SET_UO_FIBER, + /* 0x3B */ CAM_SET_FISHING, // Fishing pond by the lake + /* 0x3C */ CAM_SET_CS_C, // Various cutscenes "DEMOC" + /* 0x3D */ CAM_SET_JABU_TENTACLE, // Jabu-Jabu Parasitic Tenticle Rooms "UO_FIBER" /* 0x3E */ CAM_SET_DUNGEON2, - /* 0x3F */ CAM_SET_TEPPEN, - /* 0x40 */ CAM_SET_CIRCLE7, + /* 0x3F */ CAM_SET_DIRECTED_YAW, // Does not auto-update yaw, tends to keep the camera pointed at a certain yaw (used by biggoron and final spirit lowering platform) "TEPPEN" + /* 0x40 */ CAM_SET_PIVOT_FROM_SIDE, // Fixed side view, allows rotation of camera (eg. Potion Shop, Meadow at fairy grotto) "CIRCLE7" /* 0x41 */ CAM_SET_NORMAL4, /* 0x42 */ CAM_SET_MAX } CameraSettingType; typedef enum { /* 0x00 */ CAM_MODE_NORMAL, - /* 0x01 */ CAM_MODE_TARGET, // Original: CAM_MODE_PARALLEL - /* 0x02 */ CAM_MODE_FOLLOWTARGET, // Original: CAM_MODE_KEEPON + /* 0x01 */ CAM_MODE_TARGET, // "PARALLEL" + /* 0x02 */ CAM_MODE_FOLLOWTARGET, // "KEEPON" /* 0x03 */ CAM_MODE_TALK, /* 0x04 */ CAM_MODE_BATTLE, /* 0x05 */ CAM_MODE_CLIMB, - /* 0x06 */ CAM_MODE_FIRSTPERSON, // Original: CAM_MODE_SUBJECT + /* 0x06 */ CAM_MODE_FIRSTPERSON, // "SUBJECT" /* 0x07 */ CAM_MODE_BOWARROW, /* 0x08 */ CAM_MODE_BOWARROWZ, - /* 0x09 */ CAM_MODE_FOOKSHOT, + /* 0x09 */ CAM_MODE_HOOKSHOT, // "FOOKSHOT" /* 0x0A */ CAM_MODE_BOOMERANG, - /* 0x0B */ CAM_MODE_SLINGSHOT, // Original: CasdfsAM_MODE_PACHINCO + /* 0x0B */ CAM_MODE_SLINGSHOT, // "PACHINCO" /* 0x0C */ CAM_MODE_CLIMBZ, /* 0x0D */ CAM_MODE_JUMP, /* 0x0E */ CAM_MODE_HANG, @@ -112,7 +112,7 @@ typedef enum { /* 0x11 */ CAM_MODE_CHARGE, /* 0x12 */ CAM_MODE_STILL, /* 0x13 */ CAM_MODE_PUSHPULL, - /* 0x14 */ CAM_MODE_BOOMFOLLLOW, // Original: CAM_MODE_BOOKEEPON + /* 0x14 */ CAM_MODE_FOLLOWBOOMERANG, // "BOOKEEPON" /* 0x15 */ CAM_MODE_MAX } CameraModeType; @@ -192,200 +192,200 @@ typedef enum { } CameraFuncType; typedef struct { - /* 0x0000 */ Vec3f collisionClosePoint; - /* 0x000C */ CollisionPoly* atEyePoly; - /* 0x0010 */ f32 swingUpdateRate; - /* 0x0014 */ s16 unk_14; - /* 0x0016 */ s16 unk_16; - /* 0x0018 */ s16 unk_18; - /* 0x001A */ s16 swingUpdateRateTimer; + /* 0x00 */ Vec3f collisionClosePoint; + /* 0x0C */ CollisionPoly* atEyePoly; + /* 0x10 */ f32 swingUpdateRate; + /* 0x14 */ s16 unk_14; + /* 0x16 */ s16 unk_16; + /* 0x18 */ s16 unk_18; + /* 0x1A */ s16 swingUpdateRateTimer; } SwingAnimation; // size = 0x1C typedef struct { - /* 0x0000 */ SwingAnimation swing; - /* 0x001C */ f32 yOffset; - /* 0x0020 */ f32 unk_20; - /* 0x0024 */ s16 slopePitchAdj; - /* 0x0026 */ s16 swingYawTarget; - /* 0x0028 */ s16 unk_28; - /* 0x002A */ s16 startSwingTimer; + /* 0x00 */ SwingAnimation swing; + /* 0x1C */ f32 yOffset; + /* 0x20 */ f32 unk_20; + /* 0x24 */ s16 slopePitchAdj; + /* 0x26 */ s16 swingYawTarget; + /* 0x28 */ s16 unk_28; + /* 0x2A */ s16 startSwingTimer; } Normal1Anim; // size = 0x2C typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distMin; - /* 0x0008 */ f32 distMax; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 fovTarget; - /* 0x001C */ f32 atLERPScaleMax; - /* 0x0020 */ s16 pitchTarget; - /* 0x0022 */ s16 interfaceFlags; - /* 0x0024 */ Normal1Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distMin; + /* 0x08 */ f32 distMax; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 fovTarget; + /* 0x1C */ f32 atLERPScaleMax; + /* 0x20 */ s16 pitchTarget; + /* 0x22 */ s16 interfaceFlags; + /* 0x24 */ Normal1Anim anim; } Normal1; // size = 0x50 typedef struct { - /* 0x0000 */ Vec3f unk_00; - /* 0x000C */ Vec3f unk_0C; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ s16 unk_20; - /* 0x0022 */ s16 unk_22; - /* 0x0024 */ f32 unk_24; - /* 0x0028 */ s16 unk_28; + /* 0x00 */ Vec3f unk_00; + /* 0x0C */ Vec3f unk_0C; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 unk_20; + /* 0x22 */ s16 unk_22; + /* 0x24 */ f32 unk_24; + /* 0x28 */ s16 unk_28; } Normal2Anim; // size = 0x2A typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ s16 unk_1C; - /* 0x001E */ s16 interfaceFlags; - /* 0x0020 */ Normal2Anim anim; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ s16 unk_1C; + /* 0x1E */ s16 interfaceFlags; + /* 0x20 */ Normal2Anim anim; } Normal2; // size = 0x4A typedef struct { - /* 0x0000 */ SwingAnimation swing; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ f32 unk_20; - /* 0x0024 */ s16 curPitch; - /* 0x0026 */ s16 yawUpdAmt; - /* 0x0028 */ s16 yawTimer; - /* 0x002A */ s16 distTimer; + /* 0x00 */ SwingAnimation swing; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ s16 curPitch; + /* 0x26 */ s16 yawUpdAmt; + /* 0x28 */ s16 yawTimer; + /* 0x2A */ s16 distTimer; } Normal3Anim; // size = 0x2C typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distMin; - /* 0x0008 */ f32 distMax; - /* 0x000C */ f32 yawUpdateSpeed; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 fovTarget; - /* 0x0018 */ f32 maxAtLERPScale; - /* 0x001C */ s16 pitchTarget; - /* 0x001E */ s16 interfaceFlags; - /* 0x0020 */ Normal3Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distMin; + /* 0x08 */ f32 distMax; + /* 0x0C */ f32 yawUpdateSpeed; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 fovTarget; + /* 0x18 */ f32 maxAtLERPScale; + /* 0x1C */ s16 pitchTarget; + /* 0x1E */ s16 interfaceFlags; + /* 0x20 */ Normal3Anim anim; } Normal3; // size = 0x4C typedef struct { - /* 0x0000 */ Vec3f unk_00; - /* 0x000C */ f32 yTarget; - /* 0x0010 */ s16 unk_10; - /* 0x0012 */ s16 yawTarget; - /* 0x0014 */ s16 pitchTarget; - /* 0x0016 */ s16 unk_16; - /* 0x0018 */ s16 animTimer; + /* 0x00 */ Vec3f unk_00; + /* 0x0C */ f32 yTarget; + /* 0x10 */ s16 unk_10; + /* 0x12 */ s16 yawTarget; + /* 0x14 */ s16 pitchTarget; + /* 0x16 */ s16 unk_16; + /* 0x18 */ s16 animTimer; } Parallel1Anim; // size = 0x1A typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 distTarget; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ f32 fovTarget; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ s16 pitchTarget; - /* 0x0022 */ s16 yawTarget; - /* 0x0024 */ s16 interfaceFlags; - /* 0x0028 */ Parallel1Anim anim; -} Parallel1; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 distTarget; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 fovTarget; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 pitchTarget; + /* 0x22 */ s16 yawTarget; + /* 0x24 */ s16 interfaceFlags; + /* 0x28 */ Parallel1Anim anim; +} Parallel1; // size = 0x42 typedef struct { - /* 0x0000 */ SwingAnimation swing; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ VecSph unk_20; + /* 0x00 */ SwingAnimation swing; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ VecSph unk_20; } Jump1Anim; // size = 0x28 typedef struct { - /* 0x0000 */ f32 atYOffset; - /* 0x0004 */ f32 distMin; - /* 0x0008 */ f32 distMax; - /* 0x000C */ f32 yawUpateRateTarget; - /* 0x0010 */ f32 maxYawUpdate; - /* 0x0014 */ f32 unk_14; // never used. - /* 0x0018 */ f32 atLERPScaleMax; - /* 0x001C */ s16 interfaceFlags; - /* 0x0020 */ Jump1Anim anim; -} Jump1; // size 0x48 + /* 0x00 */ f32 atYOffset; + /* 0x04 */ f32 distMin; + /* 0x08 */ f32 distMax; + /* 0x0C */ f32 yawUpateRateTarget; + /* 0x10 */ f32 maxYawUpdate; + /* 0x14 */ f32 unk_14; // never used. + /* 0x18 */ f32 atLERPScaleMax; + /* 0x1C */ s16 interfaceFlags; + /* 0x20 */ Jump1Anim anim; +} Jump1; // size = 0x48 typedef struct { - /* 0x0000 */ f32 floorY; - /* 0x0004 */ s16 yawTarget; - /* 0x0006 */ s16 initYawDiff; // unused, set but not read. - /* 0x0008 */ s16 yawAdj; - /* 0x000A */ s16 onFloor; // unused, set but not read - /* 0x000C */ s16 animTimer; + /* 0x0 */ f32 floorY; + /* 0x4 */ s16 yawTarget; + /* 0x6 */ s16 initYawDiff; // unused, set but not read. + /* 0x8 */ s16 yawAdj; + /* 0xA */ s16 onFloor; // unused, set but not read + /* 0xC */ s16 animTimer; } Jump2Anim; // size = 0x10 typedef struct { - /* 0x0000 */ f32 atYOffset; - /* 0x0004 */ f32 minDist; - /* 0x0008 */ f32 maxDist; - /* 0x000C */ f32 minMaxDistFactor; - /* 0x0010 */ f32 yawUpdRateTarget; - /* 0x0014 */ f32 xzUpdRateTarget; - /* 0x0018 */ f32 fovTarget; - /* 0x001C */ f32 atLERPStepScale; - /* 0x0020 */ s16 interfaceFlags; - /* 0x0024 */ Jump2Anim anim; + /* 0x00 */ f32 atYOffset; + /* 0x04 */ f32 minDist; + /* 0x08 */ f32 maxDist; + /* 0x0C */ f32 minMaxDistFactor; + /* 0x10 */ f32 yawUpdRateTarget; + /* 0x14 */ f32 xzUpdRateTarget; + /* 0x18 */ f32 fovTarget; + /* 0x1C */ f32 atLERPStepScale; + /* 0x20 */ s16 interfaceFlags; + /* 0x24 */ Jump2Anim anim; } Jump2; // size = 0x34 typedef struct { - /* 0x0000 */ SwingAnimation swing; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ s16 animTimer; - /* 0x0022 */ s16 mode; + /* 0x00 */ SwingAnimation swing; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 animTimer; + /* 0x22 */ s16 mode; } Jump3Anim; // size = 0x24 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distMin; - /* 0x0008 */ f32 distMax; - /* 0x000C */ f32 swingUpdateRate; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 fovTarget; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ s16 pitchTarget; - /* 0x0022 */ s16 interfaceFlags; - /* 0x0024 */ Jump3Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distMin; + /* 0x08 */ f32 distMax; + /* 0x0C */ f32 swingUpdateRate; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 fovTarget; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ s16 pitchTarget; + /* 0x22 */ s16 interfaceFlags; + /* 0x24 */ Jump3Anim anim; } Jump3; // size = 0x48 typedef struct { - /* 0x0000 */ f32 initialEyeToAtDist; - /* 0x0004 */ f32 roll; - /* 0x0008 */ f32 yPosOffset; - /* 0x000C */ Actor* target; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ s16 unk_14; // unused - /* 0x0016 */ s16 initialEyeToAtYaw; - /* 0x0018 */ s16 initialEyeToAtPitch; - /* 0x001A */ s16 animTimer; - /* 0x001C */ s16 chargeTimer; + /* 0x00 */ f32 initialEyeToAtDist; + /* 0x04 */ f32 roll; + /* 0x08 */ f32 yPosOffset; + /* 0x0C */ Actor* target; + /* 0x10 */ f32 unk_10; + /* 0x14 */ s16 unk_14; // unused + /* 0x16 */ s16 initialEyeToAtYaw; + /* 0x18 */ s16 initialEyeToAtPitch; + /* 0x1A */ s16 animTimer; + /* 0x1C */ s16 chargeTimer; } Battle1Anim; // size = 0x1E typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distance; - /* 0x0008 */ f32 swingYawInitial; - /* 0x000C */ f32 swingYawFinal; - /* 0x0010 */ f32 swingPitchInitial; - /* 0x0014 */ f32 swingPitchFinal; - /* 0x0018 */ f32 swingPitchAdj; - /* 0x001C */ f32 fov; - /* 0x0020 */ f32 atLERPScaleOnGround; - /* 0x0024 */ f32 yOffsetOffGround; - /* 0x0028 */ f32 atLERPScaleOffGround; - /* 0x002C */ s16 flags; - /* 0x0030 */ Battle1Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distance; + /* 0x08 */ f32 swingYawInitial; + /* 0x0C */ f32 swingYawFinal; + /* 0x10 */ f32 swingPitchInitial; + /* 0x14 */ f32 swingPitchFinal; + /* 0x18 */ f32 swingPitchAdj; + /* 0x1C */ f32 fov; + /* 0x20 */ f32 atLERPScaleOnGround; + /* 0x24 */ f32 yOffsetOffGround; + /* 0x28 */ f32 atLERPScaleOffGround; + /* 0x2C */ s16 flags; + /* 0x30 */ Battle1Anim anim; } Battle1; // size = 0x50 typedef struct { @@ -393,295 +393,294 @@ typedef struct { } Battle4Anim; // size = 0x2 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 rTarget; - /* 0x0008 */ s16 pitchTarget; - /* 0x000C */ f32 lerpUpdateRate; - /* 0x0010 */ f32 fovTarget; - /* 0x0014 */ f32 atLERPTarget; - /* 0x0018 */ s16 interfaceFlags; - /* 0x001A */ s16 unk_1A; - /* 0x001C */ Battle4Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 rTarget; + /* 0x08 */ s16 pitchTarget; + /* 0x0C */ f32 lerpUpdateRate; + /* 0x10 */ f32 fovTarget; + /* 0x14 */ f32 atLERPTarget; + /* 0x18 */ s16 interfaceFlags; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ Battle4Anim anim; } Battle4; // size = 0x20 typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ Actor* unk_0C; - /* 0x0010 */ s16 unk_10; - /* 0x0012 */ s16 unk_12; - /* 0x0014 */ s16 unk_14; - /* 0x0016 */ s16 unk_16; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ Actor* unk_0C; + /* 0x10 */ s16 unk_10; + /* 0x12 */ s16 unk_12; + /* 0x14 */ s16 unk_14; + /* 0x16 */ s16 unk_16; } Keep1Anim; // size = 0x18 typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ f32 unk_20; - /* 0x0024 */ f32 unk_24; - /* 0x0028 */ f32 unk_28; - /* 0x002C */ f32 unk_2C; - /* 0x0030 */ s16 interfaceFlags; - /* 0x0034 */ Keep1Anim anim; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ s16 interfaceFlags; + /* 0x34 */ Keep1Anim anim; } KeepOn1; // size = 0x4C typedef struct { - /* 0x0000 */ Vec3f eyeToAtTarget; // esentially a VecSph, but all floats. - /* 0x000C */ Actor* target; - /* 0x0010 */ Vec3f atTarget; - /* 0x001C */ s16 animTimer; + /* 0x00 */ Vec3f eyeToAtTarget; // esentially a VecSph, but all floats. + /* 0x0C */ Actor* target; + /* 0x10 */ Vec3f atTarget; + /* 0x1C */ s16 animTimer; } Keep3Anim; // size = 0x20 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 minDist; - /* 0x0008 */ f32 maxDist; - /* 0x000C */ f32 swingYawInital; - /* 0x0010 */ f32 swingYawFinal; - /* 0x0014 */ f32 swingPitchInitial; - /* 0x0018 */ f32 swingPitchFinal; - /* 0x001C */ f32 swingPitchAdj; - /* 0x0020 */ f32 fovTarget; - /* 0x0024 */ f32 atLERPScaleMax; - /* 0x0028 */ s16 initTimer; - /* 0x002A */ s16 flags; - /* 0x002C */ Keep3Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 minDist; + /* 0x08 */ f32 maxDist; + /* 0x0C */ f32 swingYawInital; + /* 0x10 */ f32 swingYawFinal; + /* 0x14 */ f32 swingPitchInitial; + /* 0x18 */ f32 swingPitchFinal; + /* 0x1C */ f32 swingPitchAdj; + /* 0x20 */ f32 fovTarget; + /* 0x24 */ f32 atLERPScaleMax; + /* 0x28 */ s16 initTimer; + /* 0x2A */ s16 flags; + /* 0x2C */ Keep3Anim anim; } KeepOn3; // size = 0x4C typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ s16 unk_0C; - /* 0x000E */ s16 unk_0E; - /* 0x0010 */ s16 unk_10; - /* 0x0012 */ s16 unk_12; - /* 0x0014 */ s16 unk_14; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ s16 unk_0C; + /* 0x0E */ s16 unk_0E; + /* 0x10 */ s16 unk_10; + /* 0x12 */ s16 unk_12; + /* 0x14 */ s16 unk_14; } KeepOn4_Unk20; // size = 0x14 typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ f32 unk_08; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ f32 unk_10; - /* 0x0014 */ f32 unk_14; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ s16 unk_1C; - /* 0x001E */ s16 unk_1E; - /* 0x0020 */ KeepOn4_Unk20 unk_20; + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ s16 unk_1C; + /* 0x1E */ s16 unk_1E; + /* 0x20 */ KeepOn4_Unk20 unk_20; } KeepOn4; // size = 0x34 typedef struct { - /* 0x0000 */ f32 fovTarget; - /* 0x0004 */ s16 animTimer; + /* 0x0 */ f32 fovTarget; + /* 0x4 */ s16 animTimer; } KeepOn0Anim; // size = 0x8 typedef struct { - /* 0x0000 */ f32 fovScale; - /* 0x0004 */ f32 yawScale; - /* 0x0008 */ s16 timerInit; - /* 0x000A */ s16 interfaceFlags; - /* 0x000C */ KeepOn0Anim anim; + /* 0x00 */ f32 fovScale; + /* 0x04 */ f32 yawScale; + /* 0x08 */ s16 timerInit; + /* 0x0A */ s16 interfaceFlags; + /* 0x0C */ KeepOn0Anim anim; } KeepOn0; // size = 0x14 typedef struct { - /* 0x0000 */ PosRot eyePosRotTarget; - /* 0x0014 */ s16 fov; + /* 0x00 */ PosRot eyePosRotTarget; + /* 0x14 */ s16 fov; } Fixed1Anim; // size = 0x18 typedef struct { - /* 0x0000 */ f32 unk_00; // seems to be unused? - /* 0x0004 */ f32 lerpStep; - /* 0x0008 */ f32 fov; - /* 0x000C */ s16 interfaceFlags; - /* 0x0010 */ Fixed1Anim anim; + /* 0x00 */ f32 unk_00; // seems to be unused? + /* 0x04 */ f32 lerpStep; + /* 0x08 */ f32 fov; + /* 0x0C */ s16 interfaceFlags; + /* 0x10 */ Fixed1Anim anim; } Fixed1; // size = 0x28 typedef struct { - /* 0x0000 */ Vec3f eye; - /* 0x000C */ s16 fov; + /* 0x0 */ Vec3f eye; + /* 0xC */ s16 fov; } Fixed2InitParams; // size = 0x10 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 eyeStepScale; - /* 0x0008 */ f32 posStepScale; - /* 0x000C */ f32 fov; - /* 0x0010 */ s16 interfaceFlags; - /* 0x0014 */ Fixed2InitParams initParams; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 eyeStepScale; + /* 0x08 */ f32 posStepScale; + /* 0x0C */ f32 fov; + /* 0x10 */ s16 interfaceFlags; + /* 0x14 */ Fixed2InitParams initParams; } Fixed2; // size = 0x24 typedef struct { - /* 0x0000 */ Vec3s rot; - /* 0x0006 */ s16 fov; - /* 0x0008 */ s16 updDirTimer; - /* 0x000A */ s16 jfifId; + /* 0x0 */ Vec3s rot; + /* 0x6 */ s16 fov; + /* 0x8 */ s16 updDirTimer; + /* 0xA */ s16 jfifId; } Fixed3Anim; // size = 0xC typedef struct { - /* 0x000 */ s16 interfaceFlags; - /* 0x0004 */ Fixed3Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Fixed3Anim anim; } Fixed3; // size = 0x10 typedef struct { - /* 0x0000 */ Vec3f eyeTarget; - /* 0x000C */ f32 followSpeed; + /* 0x0 */ Vec3f eyeTarget; + /* 0xC */ f32 followSpeed; } Fixed4Anim; // size = 0x10 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 speedToEyePos; - /* 0x0008 */ f32 followSpeed; - /* 0x000C */ f32 fov; - /* 0x0010 */ s16 interfaceFlags; - /* 0x0014 */ Fixed4Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 speedToEyePos; + /* 0x08 */ f32 followSpeed; + /* 0x0C */ f32 fov; + /* 0x10 */ s16 interfaceFlags; + /* 0x14 */ Fixed4Anim anim; } Fixed4; // size = 0x24 typedef struct { - /* 0x0000 */ f32 r; - /* 0x0004 */ s16 yaw; - /* 0x0006 */ s16 pitch; - /* 0x0008 */ s16 animTimer; + /* 0x0 */ f32 r; + /* 0x4 */ s16 yaw; + /* 0x6 */ s16 pitch; + /* 0x8 */ s16 animTimer; } Subj3Anim; // size = 0xC typedef struct { - /* 0x0000 */ f32 eyeNextYOffset; - /* 0x0004 */ f32 eyeDist; - /* 0x0008 */ f32 eyeNextDist; - /* 0x000C */ f32 unk_0C; // unused - /* 0x0010 */ Vec3f atOffset; - /* 0x001C */ f32 fovTarget; - /* 0x0020 */ s16 interfaceFlags; - /* 0x0024 */ Subj3Anim anim; + /* 0x00 */ f32 eyeNextYOffset; + /* 0x04 */ f32 eyeDist; + /* 0x08 */ f32 eyeNextDist; + /* 0x0C */ f32 unk_0C; // unused + /* 0x10 */ Vec3f atOffset; + /* 0x1C */ f32 fovTarget; + /* 0x20 */ s16 interfaceFlags; + /* 0x24 */ Subj3Anim anim; } Subj3; // size = 0x30 typedef struct { - /* 0x0000 */ Linef unk_00; - /* 0x0018 */ f32 unk_18; - /* 0x001C */ f32 unk_1C; - /* 0x0020 */ f32 unk_20; - /* 0x0024 */ f32 unk_24; - /* 0x0028 */ f32 unk_28; - /* 0x002C */ s16 unk_2C; - /* 0x002E */ s16 unk_2E; - /* 0x0030 */ s16 unk_30; - /* 0x0032 */ s16 unk_32; + /* 0x00 */ Linef unk_00; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s16 unk_2C; + /* 0x2E */ s16 unk_2E; + /* 0x30 */ s16 unk_30; + /* 0x32 */ s16 unk_32; } Subj4Anim; // size = 0x34 typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Subj4Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Subj4Anim anim; } Subj4; // size = 0x38 typedef struct { - /* 0x0000 */ PosRot eyePosRot; - /* 0x0014 */ char unk_14[0x8]; - /* 0x001C */ s16 fov; - /* 0x001E */ s16 jfifId; + /* 0x00 */ PosRot eyePosRot; + /* 0x14 */ char unk_14[0x8]; + /* 0x1C */ s16 fov; + /* 0x1E */ s16 jfifId; } Data4InitParams; // size = 0x20 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 fov; - /* 0x0008 */ s16 interfaceFlags; - /* 0x000C */ Data4InitParams initParams; + /* 0x0 */ f32 yOffset; + /* 0x4 */ f32 fov; + /* 0x8 */ s16 interfaceFlags; + /* 0xC */ Data4InitParams initParams; } Data4; // size = 0x2C typedef struct { - /* 0x0000 */ f32 unk_00; // unused - /* 0x0004 */ s16 yawTarget; - /* 0x0006 */ s16 yawTargetAdj; - /* 0x0008 */ s16 timer; + /* 0x0 */ f32 unk_00; // unused + /* 0x4 */ s16 yawTarget; + /* 0x6 */ s16 yawTargetAdj; + /* 0x8 */ s16 timer; } Unique1Anim; // size = 0xC typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distMin; - /* 0x0008 */ f32 distMax; - /* 0x000C */ char unk_0C[4]; // unused - /* 0x0010 */ f32 fovTarget; - /* 0x0014 */ f32 atLERPScaleMax; - /* 0x0018 */ s16 pitchTarget; - /* 0x001A */ s16 interfaceFlags; - /* 0x001C */ Unique1Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distMin; + /* 0x08 */ f32 distMax; + /* 0x0C */ char unk_0C[4]; // unused + /* 0x10 */ f32 fovTarget; + /* 0x14 */ f32 atLERPScaleMax; + /* 0x18 */ s16 pitchTarget; + /* 0x1A */ s16 interfaceFlags; + /* 0x1C */ Unique1Anim anim; } Unique1; // size = 0x28 typedef struct { - /* 0x0000 */ f32 unk_00; - /* 0x0004 */ s16 unk_04; + /* 0x0 */ f32 unk_00; + /* 0x4 */ s16 unk_04; } Unique2Unk10; // size = 0x8 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 distTarget; - /* 0x0008 */ f32 fovTarget; - /* 0x000C */ s16 interfaceFlags; - /* 0x0010 */ Unique2Unk10 unk_10; // unused, values set but not read. + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 distTarget; + /* 0x08 */ f32 fovTarget; + /* 0x0C */ s16 interfaceFlags; + /* 0x10 */ Unique2Unk10 unk_10; // unused, values set but not read. } Unique2; // size = 0x18 typedef struct { - /* 0x0000 */ f32 initialFov; - /* 0x0004 */ f32 initialDist; + /* 0x0 */ f32 initialFov; + /* 0x4 */ f32 initialDist; } Unique3Anim; // size = 0x8 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 fov; - /* 0x0008 */ s16 interfaceFlags; + /* 0x0 */ f32 yOffset; + /* 0x4 */ f32 fov; + /* 0x8 */ s16 interfaceFlags; } Unique3Params; // size = 0xC typedef struct { - /* 0x0000 */ struct Actor* doorActor; - /* 0x0004 */ s16 camDataIdx; - /* 0x0006 */ s16 timer1; - /* 0x0008 */ s16 timer2; - /* 0x000A */ s16 timer3; + /* 0x0 */ struct Actor* doorActor; + /* 0x4 */ s16 camDataIdx; + /* 0x6 */ s16 timer1; + /* 0x8 */ s16 timer2; + /* 0xA */ s16 timer3; } DoorParams; // size = 0xC typedef struct { - /* 0x0000 */ DoorParams doorParams; - /* 0x000C */ Unique3Params params; - /* 0x0018 */ Unique3Anim anim; + /* 0x00 */ DoorParams doorParams; + /* 0x0C */ Unique3Params params; + /* 0x18 */ Unique3Anim anim; } Unique3; // size = 0x20 typedef struct { - /* 0x0000 */ Vec3f initalPos; - /* 0x000C */ s16 animTimer; - /* 0x0010 */ Linef sceneCamPosPlayerLine; + /* 0x00 */ Vec3f initalPos; + /* 0x0C */ s16 animTimer; + /* 0x10 */ Linef sceneCamPosPlayerLine; } Unique0Anim; // size = 0x28 typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Unique0Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Unique0Anim anim; } Unique0Params; // size = 0x2C typedef struct { - /* 0x0000 */ DoorParams doorParams; - /* 0x000C */ Unique0Params uniq0; + /* 0x0 */ DoorParams doorParams; + /* 0xC */ Unique0Params uniq0; } Unique0; // size = 0x38 typedef struct { - /* 0x0000 */ s16 interfaceFlags; + /* 0x0 */ s16 interfaceFlags; } Unique6; // size = 0x4 typedef union { - /* 0x0000 */ Vec3s unk_00; + /* 0x0 */ Vec3s unk_00; } Unique7Unk8; // size = 0x8 typedef struct { - /* 0x0000 */ f32 fov; - /* 0x0004 */ s16 interfaceFlags; - /* 0x0006 */ s16 align; - // unk_08 goes unused. - /* 0x0008 */ Unique7Unk8 unk_08; + /* 0x0 */ f32 fov; + /* 0x4 */ s16 interfaceFlags; + /* 0x6 */ s16 align; + /* 0x8 */ Unique7Unk8 unk_08; // unk_08 goes unused. } Unique7; // size = 0x10 /** initFlags @@ -698,228 +697,228 @@ typedef struct { * 0x20: focus on player */ typedef struct { - /* 0x0000 */ u8 actionFlags; - /* 0x0001 */ u8 unk_01; - /* 0x0002 */ s16 initFlags; - /* 0x0004 */ s16 timerInit; - /* 0x0006 */ s16 rollTargetInit; - /* 0x0008 */ f32 fovTargetInit; - /* 0x000C */ f32 lerpStepScale; - /* 0x0010 */ Vec3f atTargetInit; - /* 0x001C */ Vec3f eyeTargetInit; + /* 0x00 */ u8 actionFlags; + /* 0x01 */ u8 unk_01; + /* 0x02 */ s16 initFlags; + /* 0x04 */ s16 timerInit; + /* 0x06 */ s16 rollTargetInit; + /* 0x08 */ f32 fovTargetInit; + /* 0x0C */ f32 lerpStepScale; + /* 0x10 */ Vec3f atTargetInit; + /* 0x1C */ Vec3f eyeTargetInit; } OnePointCsFull; /* size = 0x28 */ typedef struct { - /* 0x0000 */ OnePointCsFull* curKeyFrame; - /* 0x0004 */ Vec3f atTarget; - /* 0x0010 */ Vec3f eyeTarget; - /* 0x001C */ Vec3f playerPos; - /* 0x0028 */ f32 fovTarget; - /* 0x002C */ VecSph atEyeOffsetTarget; - /* 0x0034 */ s16 rollTarget; - /* 0x0036 */ s16 curKeyFrameIdx; - /* 0x0038 */ s16 unk_38; - /* 0x003A */ s16 isNewKeyFrame; - /* 0x003C */ s16 keyFrameTimer; + /* 0x00 */ OnePointCsFull* curKeyFrame; + /* 0x04 */ Vec3f atTarget; + /* 0x10 */ Vec3f eyeTarget; + /* 0x1C */ Vec3f playerPos; + /* 0x28 */ f32 fovTarget; + /* 0x2C */ VecSph atEyeOffsetTarget; + /* 0x34 */ s16 rollTarget; + /* 0x36 */ s16 curKeyFrameIdx; + /* 0x38 */ s16 unk_38; + /* 0x3A */ s16 isNewKeyFrame; + /* 0x3C */ s16 keyFrameTimer; } Unique9Anim; // size = 0x3E typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Unique9Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Unique9Anim anim; } Unique9; // size = 0x40 typedef struct { - /* 0x0000 */ s32 keyFrameCnt; - /* 0x0004 */ OnePointCsFull* keyFrames; - /* 0x0008 */ Unique9 uniq9; + /* 0x0 */ s32 keyFrameCnt; + /* 0x4 */ OnePointCsFull* keyFrames; + /* 0x8 */ Unique9 uniq9; } Unique9OnePointCs; // size = 0x48 typedef struct { - /* 0x0000 */ f32 curFrame; - /* 0x0004 */ s16 keyframe; + /* 0x0 */ f32 curFrame; + /* 0x4 */ s16 keyframe; } Demo1Anim; // size = 0x14 typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Demo1Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Demo1Anim anim; } Demo1; // size = 0x18 typedef struct { - /* 0x0000 */ Vec3f initialAt; - /* 0x000C */ f32 unk_0C; - /* 0x0010 */ s16 animFrame; - /* 0x0012 */ s16 yawDir; + /* 0x00 */ Vec3f initialAt; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ s16 animFrame; + /* 0x12 */ s16 yawDir; } Demo3Anim; // size = 0x14 typedef struct { - /* 0x0000 */ f32 fov; - /* 0x0004 */ f32 unk_04; // unused - /* 0x0008 */ s16 interfaceFlags; - /* 0x000C */ Demo3Anim anim; + /* 0x0 */ f32 fov; + /* 0x4 */ f32 unk_04; // unused + /* 0x8 */ s16 interfaceFlags; + /* 0xC */ Demo3Anim anim; } Demo3; // size = 0x20 typedef struct { - /* 0x0000 */ s16 animTimer; - /* 0x0004 */ Vec3f atTarget; + /* 0x0 */ s16 animTimer; + /* 0x4 */ Vec3f atTarget; } Demo6Anim; // size = 0x10 typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0002 */ s16 unk_02; - /* 0x0004 */ Demo6Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x2 */ s16 unk_02; + /* 0x4 */ Demo6Anim anim; } Demo6; // size = 0x14 typedef struct { - /* 0x0000 */ f32 curFrame; - /* 0x0004 */ s16 keyframe; - /* 0x0006 */ s16 doLERPAt; - /* 0x0008 */ s16 finishAction; - /* 0x000A */ s16 animTimer; + /* 0x0 */ f32 curFrame; + /* 0x4 */ s16 keyframe; + /* 0x6 */ s16 doLERPAt; + /* 0x8 */ s16 finishAction; + /* 0xA */ s16 animTimer; } Demo9Anim; // size = 0xC typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Demo9Anim anim; -} Demo9; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Demo9Anim anim; +} Demo9; // size = 0x10 typedef struct { - /* 0x0000 */ CutsceneCameraPoint* atPoints; - /* 0x0004 */ CutsceneCameraPoint* eyePoints; - /* 0x0008 */ s16 actionParameters; - /* 0x000A */ s16 initTimer; + /* 0x0 */ CutsceneCameraPoint* atPoints; + /* 0x4 */ CutsceneCameraPoint* eyePoints; + /* 0x8 */ s16 actionParameters; + /* 0xA */ s16 initTimer; } OnePointCsCamera; // size = 0xC typedef struct { - /* 0x0000 */ OnePointCsCamera onePointCs; - /* 0x000C */ Demo9 demo9; + /* 0x0 */ OnePointCsCamera onePointCs; + /* 0xC */ Demo9 demo9; } Demo9OnePointCs; // size = 0x1C typedef struct { - /* 0x0000 */ f32 lerpAtScale; - /* 0x0004 */ s16 interfaceFlags; + /* 0x0 */ f32 lerpAtScale; + /* 0x4 */ s16 interfaceFlags; } Special0; // size = 0x8 typedef struct { - /* 0x0000 */ s16 initalTimer; + /* 0x0 */ s16 initalTimer; } Special4; // size = 0x4 typedef struct { - /* 0x0000 */ s16 animTimer; -} Special5Anim; // size = 0x2 + /* 0x0 */ s16 animTimer; +} Special5Anim; // size = 0x4 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 eyeDist; - /* 0x0008 */ f32 minDistForRot; - /* 0x000C */ f32 fovTarget; - /* 0x0010 */ f32 atMaxLERPScale; - /* 0x0014 */ s16 timerInit; - /* 0x0016 */ s16 pitch; - /* 0x0018 */ s16 interfaceFlags; - /* 0x001A */ s16 unk_1A; - /* 0x001C */ Special5Anim anim; + /* 0x00 */ f32 yOffset; + /* 0x04 */ f32 eyeDist; + /* 0x08 */ f32 minDistForRot; + /* 0x0C */ f32 fovTarget; + /* 0x10 */ f32 atMaxLERPScale; + /* 0x14 */ s16 timerInit; + /* 0x16 */ s16 pitch; + /* 0x18 */ s16 interfaceFlags; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ Special5Anim anim; } Special5; // size = 0x20 typedef struct { - /* 0x0000 */ s16 idx; + /* 0x0 */ s16 idx; } Special7; // size = 0x4 typedef struct { - /* 0x0000 */ f32 initalPlayerY; - /* 0x0004 */ s16 animTimer; + /* 0x0 */ f32 initalPlayerY; + /* 0x4 */ s16 animTimer; } Special6Anim; // size = 0x8 typedef struct { - /* 0x0000 */ s16 interfaceFlags; - /* 0x0004 */ Special6Anim anim; + /* 0x0 */ s16 interfaceFlags; + /* 0x4 */ Special6Anim anim; } Special6; // size = 0xC typedef struct { - /* 0x0000 */ s16 targetYaw; + /* 0x0 */ s16 targetYaw; } Special9Anim; // size = 0x2 typedef struct { - /* 0x0000 */ f32 yOffset; - /* 0x0004 */ f32 unk_04; - /* 0x0008 */ s16 interfaceFlags; - /* 0x000A */ s16 unk_0A; - /* 0x000C */ Special9Anim anim; + /* 0x0 */ f32 yOffset; + /* 0x4 */ f32 unk_04; + /* 0x8 */ s16 interfaceFlags; + /* 0xA */ s16 unk_0A; + /* 0xC */ Special9Anim anim; } Special9Params; // size = 0x10 typedef struct { - /* 0x0000 */ DoorParams doorParams; - /* 0x000C */ Special9Params params; + /* 0x0 */ DoorParams doorParams; + /* 0xC */ Special9Params params; } Special9; // size = 0x1C typedef struct { - /* 0x0000 */ Vec3f pos; - /* 0x000C */ Vec3f norm; - /* 0x0018 */ CollisionPoly* poly; - /* 0x001C */ VecSph sphNorm; - /* 0x0024 */ s32 bgId; + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f norm; + /* 0x18 */ CollisionPoly* poly; + /* 0x1C */ VecSph sphNorm; + /* 0x24 */ s32 bgId; } CamColChk; // size = 0x28 typedef struct { - /* 0x0000 */ char paramData[0x50]; - /* 0x0050 */ Vec3f at; - /* 0x005C */ Vec3f eye; - /* 0x0068 */ Vec3f up; - /* 0x0074 */ Vec3f eyeNext; - /* 0x0080 */ Vec3f skyboxOffset; - /* 0x008C */ struct GlobalContext* globalCtx; - /* 0x0090 */ struct Player* player; - /* 0x0094 */ PosRot playerPosRot; - /* 0x00A8 */ struct Actor* target; - /* 0x00AC */ PosRot targetPosRot; - /* 0x00C0 */ f32 rUpdateRateInv; - /* 0x00C4 */ f32 pitchUpdateRateInv; - /* 0x00C8 */ f32 yawUpdateRateInv; - /* 0x00CC */ f32 xzOffsetUpdateRate; - /* 0x00D0 */ f32 yOffsetUpdateRate; - /* 0x00D4 */ f32 fovUpdateRate; - /* 0x00D8 */ f32 xzSpeed; - /* 0x00DC */ f32 dist; - /* 0x00E0 */ f32 speedRatio; - /* 0x00E4 */ Vec3f posOffset; - /* 0x00F0 */ Vec3f playerPosDelta; - /* 0x00FC */ f32 fov; - /* 0x0100 */ f32 atLERPStepScale; - /* 0x0104 */ f32 playerGroundY; - /* 0x0108 */ Vec3f floorNorm; - /* 0x0114 */ f32 waterYPos; - /* 0x0118 */ s32 waterPrevCamIdx; - /* 0x011C */ s32 waterPrevCamSetting; - /* 0x0120 */ s32 waterQuakeId; - /* 0x0124 */ void* data0; - /* 0x0128 */ void* data1; - /* 0x012C */ s16 data2; - /* 0x012E */ s16 data3; - /* 0x0130 */ s16 uid; - /* 0x0132 */ char unk_132[2]; - /* 0x0134 */ Vec3s inputDir; - /* 0x013A */ Vec3s camDir; - /* 0x0140 */ s16 status; - /* 0x0142 */ s16 setting; - /* 0x0144 */ s16 mode; - /* 0x0146 */ s16 bgCheckId; - /* 0x0148 */ s16 camDataIdx; - /* 0x014A */ s16 unk_14A; - /* 0x014C */ s16 unk_14C; - /* 0x014E */ s16 childCamIdx; - /* 0x0150 */ s16 unk_150; - /* 0x0152 */ s16 unk_152; - /* 0x0154 */ s16 prevSetting; - /* 0x0156 */ s16 nextCamDataIdx; - /* 0x0158 */ s16 nextBGCheckId; - /* 0x015A */ s16 roll; - /* 0x015C */ s16 paramFlags; - /* 0x015E */ s16 animState; - /* 0x0160 */ s16 timer; - /* 0x0162 */ s16 parentCamIdx; - /* 0x0164 */ s16 thisIdx; - /* 0x0166 */ s16 prevCamDataIdx; - /* 0x0168 */ s16 csId; - /* 0x016A */ s16 unk_16A; + /* 0x000 */ char paramData[0x50]; + /* 0x050 */ Vec3f at; + /* 0x05C */ Vec3f eye; + /* 0x068 */ Vec3f up; + /* 0x074 */ Vec3f eyeNext; + /* 0x080 */ Vec3f skyboxOffset; + /* 0x08C */ struct GlobalContext* globalCtx; + /* 0x090 */ struct Player* player; + /* 0x094 */ PosRot playerPosRot; + /* 0x0A8 */ struct Actor* target; + /* 0x0AC */ PosRot targetPosRot; + /* 0x0C0 */ f32 rUpdateRateInv; + /* 0x0C4 */ f32 pitchUpdateRateInv; + /* 0x0C8 */ f32 yawUpdateRateInv; + /* 0x0CC */ f32 xzOffsetUpdateRate; + /* 0x0D0 */ f32 yOffsetUpdateRate; + /* 0x0D4 */ f32 fovUpdateRate; + /* 0x0D8 */ f32 xzSpeed; + /* 0x0DC */ f32 dist; + /* 0x0E0 */ f32 speedRatio; + /* 0x0E4 */ Vec3f posOffset; + /* 0x0F0 */ Vec3f playerPosDelta; + /* 0x0FC */ f32 fov; + /* 0x100 */ f32 atLERPStepScale; + /* 0x104 */ f32 playerGroundY; + /* 0x108 */ Vec3f floorNorm; + /* 0x114 */ f32 waterYPos; + /* 0x118 */ s32 waterPrevCamIdx; + /* 0x11C */ s32 waterPrevCamSetting; + /* 0x120 */ s32 waterQuakeId; + /* 0x124 */ void* data0; + /* 0x128 */ void* data1; + /* 0x12C */ s16 data2; + /* 0x12E */ s16 data3; + /* 0x130 */ s16 uid; + /* 0x132 */ char unk_132[2]; + /* 0x134 */ Vec3s inputDir; + /* 0x13A */ Vec3s camDir; + /* 0x140 */ s16 status; + /* 0x142 */ s16 setting; + /* 0x144 */ s16 mode; + /* 0x146 */ s16 bgCheckId; + /* 0x148 */ s16 camDataIdx; + /* 0x14A */ s16 unk_14A; + /* 0x14C */ s16 unk_14C; + /* 0x14E */ s16 childCamIdx; + /* 0x150 */ s16 unk_150; + /* 0x152 */ s16 unk_152; + /* 0x154 */ s16 prevSetting; + /* 0x156 */ s16 nextCamDataIdx; + /* 0x158 */ s16 nextBGCheckId; + /* 0x15A */ s16 roll; + /* 0x15C */ s16 paramFlags; + /* 0x15E */ s16 animState; + /* 0x160 */ s16 timer; + /* 0x162 */ s16 parentCamIdx; + /* 0x164 */ s16 thisIdx; + /* 0x166 */ s16 prevCamDataIdx; + /* 0x168 */ s16 csId; + /* 0x16A */ s16 unk_16A; } Camera; // size = 0x16C /** @@ -944,26 +943,26 @@ typedef struct { } DbCameraSub; // size = 0x1050 typedef struct { - /* 0x0000 */ s32 unk_00; - /* 0x0004 */ Vec3f at; - /* 0x0010 */ Vec3f eye; - /* 0x001C */ Vec3f unk_1C; - /* 0x0028 */ char unk_28[0xC]; - /* 0x0034 */ s32 unk_34; - /* 0x0038 */ s32 unk_38; - /* 0x003C */ s32 unk_3C; // bool - /* 0x0040 */ s32 unk_40; - /* 0x0044 */ s32 unk_44; - /* 0x0048 */ f32 fov; - /* 0x004C */ s16 roll; - /* 0x004E */ char unk_4E[0x2]; - /* 0x0050 */ f32 rollDegrees; - /* 0x0054 */ Vec3f unk_54; - /* 0x0060 */ Vec3f unk_60; - /* 0x006C */ Vec3f unk_6C; - /* 0x0078 */ s16 unk_78; - /* 0x007A */ s16 unk_7A; - /* 0x007C */ DbCameraSub sub; + /* 0x00 */ s32 unk_00; + /* 0x04 */ Vec3f at; + /* 0x10 */ Vec3f eye; + /* 0x1C */ Vec3f unk_1C; + /* 0x28 */ char unk_28[0xC]; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; // bool + /* 0x40 */ s32 unk_40; + /* 0x44 */ s32 unk_44; + /* 0x48 */ f32 fov; + /* 0x4C */ s16 roll; + /* 0x4E */ char unk_4E[0x2]; + /* 0x50 */ f32 rollDegrees; + /* 0x54 */ Vec3f unk_54; + /* 0x60 */ Vec3f unk_60; + /* 0x6C */ Vec3f unk_6C; + /* 0x78 */ s16 unk_78; + /* 0x7A */ s16 unk_7A; + /* 0x7C */ DbCameraSub sub; } DbCamera; // size = 0x10CC typedef struct { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9890f0fd33..e3cf906808 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1003,7 +1003,7 @@ void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) { void func_8002DE74(GlobalContext* globalCtx, Player* player) { if ((globalCtx->roomCtx.curRoom.unk_03 != 4) && func_800C0CB8(globalCtx)) { - Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, MAIN_CAM), CAM_SET_HORSE0); + Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, MAIN_CAM), CAM_SET_HORSE); } } diff --git a/src/code/z_camera.c b/src/code/z_camera.c index fd287f673f..7a11ae2125 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -4704,7 +4704,7 @@ s32 Camera_Unique3(Camera* camera) { if (params->interfaceFlags & 2) { camera->unk_14C |= 4; camera->unk_14C &= ~8; - Camera_ChangeSettingFlags(camera, CAM_SET_CIRCLE3, 2); + Camera_ChangeSettingFlags(camera, CAM_SET_PIVOT_IN_FRONT, 2); break; } uniq3->doorParams.timer3 = 5; @@ -4867,6 +4867,9 @@ s32 Camera_Unique4(Camera* camera) { return Camera_Noop(camera); } +/** + * Was setup to be used by the camera setting "FOREST_UNUSED" + */ s32 Camera_Unique5(Camera* camera) { return Camera_Noop(camera); } @@ -6016,7 +6019,7 @@ s32 Camera_Demo5(Camera* camera) { } sDemo5PrevAction12Frame = camera->globalCtx->state.frames; - Camera_ChangeSettingFlags(camera, CAM_SET_DEMOC, (4 | 1)); + Camera_ChangeSettingFlags(camera, CAM_SET_CS_C, (4 | 1)); Camera_Unique9(camera); return true; } @@ -7062,7 +7065,7 @@ s32 Camera_CheckWater(Camera* camera) { if (camera->unk_14C & 0x200) { if (player->stateFlags2 & 0x800) { - Camera_ChangeSettingFlags(camera, CAM_SET_CIRCLE5, 6); + Camera_ChangeSettingFlags(camera, CAM_SET_PIVOT_WATER_SURFACE, 6); camera->unk_14C |= (s16)0x8000; } else if (camera->unk_14C & (s16)0x8000) { Camera_ChangeSettingFlags(camera, *waterPrevCamSetting, 6); @@ -7462,7 +7465,7 @@ Vec3s Camera_Update(Camera* camera) { // setting bgCheckId to the ret of Quake_Calc, and checking that // is required, it doesn't make too much sense though. - if ((bgId = Quake_Calc(camera, &quake), bgId != 0) && (camera->setting != CAM_SET_ITEM2)) { + if ((bgId = Quake_Calc(camera, &quake), bgId != 0) && (camera->setting != CAM_SET_TURN_AROUND)) { viewAt.x = camera->at.x + quake.atOffset.x; viewAt.y = camera->at.y + quake.atOffset.y; viewAt.z = camera->at.z + quake.atOffset.z; @@ -7733,7 +7736,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { return -2; } } - if (((setting == CAM_SET_SPOT05A) || (setting == CAM_SET_SPOT05B)) && LINK_IS_ADULT && + if (((setting == CAM_SET_MEADOW_BIRDS_EYE) || (setting == CAM_SET_MEADOW_UNUSED)) && LINK_IS_ADULT && (camera->globalCtx->sceneNum == SCENE_SPOT05)) { camera->unk_14A |= 0x10; return -5; @@ -7893,7 +7896,7 @@ s32 Camera_SetParam(Camera* camera, s32 param, void* value) { camera->targetPosRot.pos = *(Vec3f*)value; break; case 8: - if (camera->setting == CAM_SET_DEMOC || camera->setting == CAM_SET_DEMO4) { + if (camera->setting == CAM_SET_CS_C || camera->setting == CAM_SET_CS_ATTENTION) { break; } camera->target = (Actor*)value; @@ -7971,7 +7974,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 camDataIdx, f32 a s16 timer3) { DoorParams* doorParams = (DoorParams*)camera->paramData; - if ((camera->setting == CAM_SET_DEMO4) || (camera->setting == CAM_SET_DOORC)) { + if ((camera->setting == CAM_SET_CS_ATTENTION) || (camera->setting == CAM_SET_DOORC)) { return 0; } diff --git a/src/code/z_camera_data.c b/src/code/z_camera_data.c index a887d5d937..18307b0337 100644 --- a/src/code/z_camera_data.c +++ b/src/code/z_camera_data.c @@ -2321,7 +2321,7 @@ CameraMode sCamSetNorm0Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2332,7 +2332,7 @@ CameraMode sCamSetNorm0Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetNorm1Modes[] = { @@ -2345,7 +2345,7 @@ CameraMode sCamSetNorm1Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A7FC }, // CAM_MODE_CLIMBZ @@ -2356,7 +2356,7 @@ CameraMode sCamSetNorm1Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A820 }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A874 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetDungeon0Modes[] = { @@ -2369,7 +2369,7 @@ CameraMode sCamSetDungeon0Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A9B8 }, // CAM_MODE_CLIMBZ @@ -2380,7 +2380,7 @@ CameraMode sCamSetDungeon0Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A9DC }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011AA30 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetDungeon1Modes[] = { @@ -2393,7 +2393,7 @@ CameraMode sCamSetDungeon1Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011AB14 }, // CAM_MODE_CLIMBZ @@ -2404,7 +2404,7 @@ CameraMode sCamSetDungeon1Modes[] = { { CAM_FUNC_BATT4, 7, D_8011AB38 }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011AB8C }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011ABB4 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetNorm3Modes[] = { @@ -2417,7 +2417,7 @@ CameraMode sCamSetNorm3Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_JUMP3, 10, sSetNorm3ModeBoomVals }, // CAM_MODE_BOOMERANG { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2452,7 +2452,7 @@ CameraMode sCamSetBossGomaModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2463,7 +2463,7 @@ CameraMode sCamSetBossGomaModes[] = { { CAM_FUNC_BATT4, 7, D_8011A9DC }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossDodoModes[] = { @@ -2476,7 +2476,7 @@ CameraMode sCamSetBossDodoModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2487,7 +2487,7 @@ CameraMode sCamSetBossDodoModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossBariModes[] = { @@ -2500,7 +2500,7 @@ CameraMode sCamSetBossBariModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2511,7 +2511,7 @@ CameraMode sCamSetBossBariModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossFGanonModes[] = { @@ -2524,7 +2524,7 @@ CameraMode sCamSetBossFGanonModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2535,7 +2535,7 @@ CameraMode sCamSetBossFGanonModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossBalModes[] = { @@ -2548,7 +2548,7 @@ CameraMode sCamSetBossBalModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2559,7 +2559,7 @@ CameraMode sCamSetBossBalModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossShadesModes[] = { @@ -2572,7 +2572,7 @@ CameraMode sCamSetBossShadesModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2583,7 +2583,7 @@ CameraMode sCamSetBossShadesModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossMofaModes[] = { @@ -2596,7 +2596,7 @@ CameraMode sCamSetBossMofaModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2607,7 +2607,7 @@ CameraMode sCamSetBossMofaModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossTwin0Modes[] = { @@ -2620,7 +2620,7 @@ CameraMode sCamSetBossTwin0Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2631,7 +2631,7 @@ CameraMode sCamSetBossTwin0Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossTwin1Modes[] = { @@ -2644,7 +2644,7 @@ CameraMode sCamSetBossTwin1Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2655,7 +2655,7 @@ CameraMode sCamSetBossTwin1Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossGanon1Modes[] = { @@ -2668,7 +2668,7 @@ CameraMode sCamSetBossGanon1Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2679,7 +2679,7 @@ CameraMode sCamSetBossGanon1Modes[] = { { CAM_FUNC_BATT4, 7, D_8011B094 }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetBossGanon2Modes[] = { @@ -2692,7 +2692,7 @@ CameraMode sCamSetBossGanon2Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT, + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT, { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2703,7 +2703,7 @@ CameraMode sCamSetBossGanon2Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetTower0Modes[] = { @@ -2716,7 +2716,7 @@ CameraMode sCamSetTower0Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2727,7 +2727,7 @@ CameraMode sCamSetTower0Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetTower1Modes[] = { @@ -2740,7 +2740,7 @@ CameraMode sCamSetTower1Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2751,7 +2751,7 @@ CameraMode sCamSetTower1Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetFixed0Modes[] = { @@ -2794,7 +2794,7 @@ CameraMode sCamSetCirc3Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetPreRend0Modes[] = { @@ -2894,7 +2894,7 @@ CameraMode sCamSetUFOBeanModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -2905,7 +2905,7 @@ CameraMode sCamSetUFOBeanModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011B3A0 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetLiftBeanModes[] = { @@ -2929,7 +2929,7 @@ CameraMode sCamSetLiftBeanModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011B474 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetScene0Modes[] = { @@ -2966,7 +2966,7 @@ CameraMode sCamSetTakoModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A9B8 }, // CAM_MODE_CLIMBZ @@ -2977,7 +2977,7 @@ CameraMode sCamSetTakoModes[] = { { CAM_FUNC_BATT4, 7, D_8011A9DC }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011B510 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetSpot05AModes[] = { @@ -3025,7 +3025,7 @@ CameraMode sCamSetNorm2Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -3036,7 +3036,7 @@ CameraMode sCamSetNorm2Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetFishingModes[] = { @@ -3049,7 +3049,7 @@ CameraMode sCamSetFishingModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011B838 }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_BOWARROW { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_HOOKSHOT { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_BOOMERANG { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_SLINGSHOT { CAM_FUNC_NONE, 0, NULL }, // CAM_MODE_CLIMBZ @@ -3073,7 +3073,7 @@ CameraMode sCamSetUOFiberModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -3084,7 +3084,7 @@ CameraMode sCamSetUOFiberModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetDungeon2Modes[] = { @@ -3097,7 +3097,7 @@ CameraMode sCamSetDungeon2Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A778 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011BA18 }, // CAM_MODE_CLIMBZ @@ -3108,7 +3108,7 @@ CameraMode sCamSetDungeon2Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011BA74 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011BA9C }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetTeppenModes[] = { @@ -3121,7 +3121,7 @@ CameraMode sCamSetTeppenModes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -3132,7 +3132,7 @@ CameraMode sCamSetTeppenModes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraMode sCamSetCirc7Modes[] = { @@ -3160,7 +3160,7 @@ CameraMode sCamSetNorm4Modes[] = { { CAM_FUNC_SUBJ3, 9, D_8011A4AC }, // CAM_MODE_FIRSTPERSON { CAM_FUNC_SUBJ3, 9, D_8011A4D0 }, // CAM_MODE_BOWARROW { CAM_FUNC_SUBJ3, 9, D_8011A4F4 }, // CAM_MODE_BOWARROWZ - { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_FOOKSHOT + { CAM_FUNC_SPEC5, 8, D_8011A518 }, // CAM_MODE_HOOKSHOT { CAM_FUNC_SUBJ3, 9, D_8011A538 }, // CAM_MODE_BOOMERANG { CAM_FUNC_SUBJ3, 9, D_8011A55C }, // CAM_MODE_SLINGSHOT { CAM_FUNC_JUMP2, 9, D_8011A580 }, // CAM_MODE_CLIMBZ @@ -3171,7 +3171,7 @@ CameraMode sCamSetNorm4Modes[] = { { CAM_FUNC_BATT4, 7, D_8011A61C }, // CAM_MODE_CHARGE { CAM_FUNC_NORM1, 10, D_8011A638 }, // CAM_MODE_STILL { CAM_FUNC_PARA1, 11, D_8011A660 }, // CAM_MODE_PUSHPULL - { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_BOOMFOLLLOW + { CAM_FUNC_KEEP1, 13, D_8011A68C }, // CAM_MODE_FOLLOWBOOMERANG }; CameraSetting sCameraSettings[] = { @@ -3181,65 +3181,65 @@ CameraSetting sCameraSettings[] = { { { 0x051FFFFF }, sCamSetDungeon0Modes }, // CAM_SET_DUNGEON0 { { 0x051FFFFF }, sCamSetDungeon1Modes }, // CAM_SET_DUNGEON1 { { 0x050FF7FF }, sCamSetNorm3Modes }, // CAM_SET_NORMAL3 - { { 0x8500018F }, sCamSetHorse0Modes }, // CAM_SET_HORSE0 - { { 0x051FFFFF }, sCamSetBossGomaModes }, // CAM_SET_BOSS_GOMA - { { 0x051FFFFF }, sCamSetBossDodoModes }, // CAM_SET_BOSS_DODO - { { 0x051FFFFF }, sCamSetBossBariModes }, // CAM_SET_BOSS_BARI - { { 0x051FFFFF }, sCamSetBossFGanonModes }, // CAM_SET_BOSS_FGANON - { { 0x051FFFFF }, sCamSetBossBalModes }, // CAM_SET_BOSS_BAL - { { 0x051FFFFF }, sCamSetBossShadesModes }, // CAM_SET_BOSS_SHADES - { { 0x051FFFFF }, sCamSetBossMofaModes }, // CAM_SET_BOSS_MOFA - { { 0x051FFFFF }, sCamSetBossTwin0Modes }, // CAM_SET_TWIN0 - { { 0x051FFFFF }, sCamSetBossTwin1Modes }, // CAM_SET_TWIN1 - { { 0x051FFFFF }, sCamSetBossGanon1Modes }, // CAM_SET_BOSS_GANON1 - { { 0x051FFFFF }, sCamSetBossGanon2Modes }, // CAM_SET_BOSS_GANON2 - { { 0x851FFFFF }, sCamSetTower0Modes }, // CAM_SET_TOWER0 - { { 0x851FFFFF }, sCamSetTower1Modes }, // CAM_SET_TOWER1 - { { 0x8500000D }, sCamSetFixed0Modes }, // CAM_SET_FIXED0 - { { 0x85000001 }, sCamSetFixed1Modes }, // CAM_SET_FIXED1 - { { 0x85000001 }, sCamSetCirc0Modes }, // CAM_SET_CIRCLE0 - { { 0x85000001 }, sCamSetCirc2Modes }, // CAM_SET_CIRCLE2 - { { 0x851E1FFF }, sCamSetCirc3Modes }, // CAM_SET_CIRCLE3 - { { 0x8C00000D }, sCamSetPreRend0Modes }, // CAM_SET_PREREND0 - { { 0x8C00000D }, sCamSetPreRend1Modes }, // CAM_SET_PREREND1 - { { 0x8C000001 }, sCamSetPreRend3Modes }, // CAM_SET_PREREND3 + { { 0x8500018F }, sCamSetHorse0Modes }, // CAM_SET_HORSE + { { 0x051FFFFF }, sCamSetBossGomaModes }, // CAM_SET_BOSS_GOHMA + { { 0x051FFFFF }, sCamSetBossDodoModes }, // CAM_SET_BOSS_DODONGO + { { 0x051FFFFF }, sCamSetBossBariModes }, // CAM_SET_BOSS_BARINADE + { { 0x051FFFFF }, sCamSetBossFGanonModes }, // CAM_SET_BOSS_PHANTOM_GANON + { { 0x051FFFFF }, sCamSetBossBalModes }, // CAM_SET_BOSS_VOLVAGIA + { { 0x051FFFFF }, sCamSetBossShadesModes }, // CAM_SET_BOSS_BONGO + { { 0x051FFFFF }, sCamSetBossMofaModes }, // CAM_SET_BOSS_MORPHA + { { 0x051FFFFF }, sCamSetBossTwin0Modes }, // CAM_SET_BOSS_TWINROVA_PLATFORM + { { 0x051FFFFF }, sCamSetBossTwin1Modes }, // CAM_SET_BOSS_TWINROVA_FLOOR + { { 0x051FFFFF }, sCamSetBossGanon1Modes }, // CAM_SET_BOSS_GANONDORF + { { 0x051FFFFF }, sCamSetBossGanon2Modes }, // CAM_SET_BOSS_GANON + { { 0x851FFFFF }, sCamSetTower0Modes }, // CAM_SET_TOWER_CLIMB + { { 0x851FFFFF }, sCamSetTower1Modes }, // CAM_SET_TOWER_UNUSED + { { 0x8500000D }, sCamSetFixed0Modes }, // CAM_SET_MARKET_BALCONY + { { 0x85000001 }, sCamSetFixed1Modes }, // CAM_SET_CHU_BOWLING + { { 0x85000001 }, sCamSetCirc0Modes }, // CAM_SET_PIVOT_CRAWLSPACE + { { 0x85000001 }, sCamSetCirc2Modes }, // CAM_SET_PIVOT_SHOP_BROWSING + { { 0x851E1FFF }, sCamSetCirc3Modes }, // CAM_SET_PIVOT_IN_FRONT + { { 0x8C00000D }, sCamSetPreRend0Modes }, // CAM_SET_PREREND_FIXED + { { 0x8C00000D }, sCamSetPreRend1Modes }, // CAM_SET_PREREND_PIVET + { { 0x8C000001 }, sCamSetPreRend3Modes }, // CAM_SET_PREREND_SIDE_SCROLL { { 0xC5000001 }, sCamSetDoor0Modes }, // CAM_SET_DOOR0 { { 0xC5000003 }, sCamSetDoorCModes }, // CAM_SET_DOORC - { { 0xC5000001 }, sCamSetRail3Modes }, // CAM_SET_RAIL3 + { { 0xC5000001 }, sCamSetRail3Modes }, // CAM_SET_CRAWLSPACE { { 0xC5000001 }, sCamSetStart0Modes }, // CAM_SET_START0 { { 0xC5000001 }, sCamSetStart1Modes }, // CAM_SET_START1 { { 0x05000001 }, sCamSetFree0Modes }, // CAM_SET_FREE0 { { 0x05000001 }, sCamSetFree1Modes }, // CAM_SET_FREE2 - { { 0x85000001 }, sCamSetCirc4Modes }, // CAM_SET_CIRCLE4 - { { 0x05000003 }, sCamSetCirc5Modes }, // CAM_SET_CIRCLE5 - { { 0xCE000001 }, sCamSetDemo0Modes }, // CAM_SET_DEMO0 - { { 0x4E000001 }, sCamSetDemo1Modes }, // CAM_SET_DEMO1 - { { 0x05000009 }, sCamSetMori1Modes }, // CAM_SET_MORI1 - { { 0x45000001 }, sCamSetItem0Modes }, // CAM_SET_ITEM0 - { { 0x45000001 }, sCamSetItem1Modes }, // CAM_SET_ITEM1 - { { 0x45000001 }, sCamSetDemo3Modes }, // CAM_SET_DEMO3 - { { 0x45000001 }, sCamSetDemo4Modes }, // CAM_SET_DEMO4 - { { 0x451FFFFF }, sCamSetUFOBeanModes }, // CAM_SET_UFOBEAN - { { 0x451FFFFF }, sCamSetLiftBeanModes }, // CAM_SET_LIFTBEAN - { { 0xC5000001 }, sCamSetScene0Modes }, // CAM_SET_SCENE0 - { { 0x45000001 }, sCamSetScene1Modes }, // CAM_SET_SCENE1 - { { 0x05000001 }, sCamSetHidan1Modes }, // CAM_SET_HIDAN1 - { { 0x45000001 }, sCamSetHidan2Modes }, // CAM_SET_HIDAN2 - { { 0x45000001 }, sCamSetMori2Modes }, // CAM_SET_MORI2 - { { 0x45000001 }, sCamSetMori3Modes }, // CAM_SET_MORI3 - { { 0x451FFFFF }, sCamSetTakoModes }, // CAM_SET_TAKO - { { 0x05000033 }, sCamSetSpot05AModes }, // CAM_SET_SPOT05A - { { 0x05000033 }, sCamSetSpot05BModes }, // CAM_SET_SPOT05B - { { 0x05000033 }, sCamSetHidan3Modes }, // CAM_SET_HIDAN3 - { { 0x4A000001 }, sCamSetItem2Modes }, // CAM_SET_ITEM2 - { { 0x05000001 }, sCamSetCirc6Modes }, // CAM_SET_CIRCLE6 + { { 0x85000001 }, sCamSetCirc4Modes }, // CAM_SET_PIVOT_CORNER + { { 0x05000003 }, sCamSetCirc5Modes }, // CAM_SET_PIVOT_WATER_SURFACE + { { 0xCE000001 }, sCamSetDemo0Modes }, // CAM_SET_CS_0 + { { 0x4E000001 }, sCamSetDemo1Modes }, // CAM_SET_CS_TWISTED_HALLWAY + { { 0x05000009 }, sCamSetMori1Modes }, // CAM_SET_FOREST_BIRDS_EYE + { { 0x45000001 }, sCamSetItem0Modes }, // CAM_SET_SLOW_CHEST_CS + { { 0x45000001 }, sCamSetItem1Modes }, // CAM_SET_ITEM_UNUSED + { { 0x45000001 }, sCamSetDemo3Modes }, // CAM_SET_CS_3 + { { 0x45000001 }, sCamSetDemo4Modes }, // CAM_SET_CS_ATTENTION + { { 0x451FFFFF }, sCamSetUFOBeanModes }, // CAM_SET_BEAN_GENERIC + { { 0x451FFFFF }, sCamSetLiftBeanModes }, // CAM_SET_BEAN_LOST_WOODS + { { 0xC5000001 }, sCamSetScene0Modes }, // CAM_SET_SCENE_UNUSED + { { 0x45000001 }, sCamSetScene1Modes }, // CAM_SET_SCENE_TRANSITION + { { 0x05000001 }, sCamSetHidan1Modes }, // CAM_SET_FIRE_PLATFORM + { { 0x45000001 }, sCamSetHidan2Modes }, // CAM_SET_FIRE_STAIRCASE + { { 0x45000001 }, sCamSetMori2Modes }, // CAM_SET_FOREST_UNUSED + { { 0x45000001 }, sCamSetMori3Modes }, // CAM_SET_FOREST_DEFEAT_POE + { { 0x451FFFFF }, sCamSetTakoModes }, // CAM_SET_BIG_OCTO + { { 0x05000033 }, sCamSetSpot05AModes }, // CAM_SET_MEADOW_BIRDS_EYE + { { 0x05000033 }, sCamSetSpot05BModes }, // CAM_SET_MEADOW_UNUSED + { { 0x05000033 }, sCamSetHidan3Modes }, // CAM_SET_FIRE_BIRDS_EYE + { { 0x4A000001 }, sCamSetItem2Modes }, // CAM_SET_TURN_AROUND + { { 0x05000001 }, sCamSetCirc6Modes }, // CAM_SET_PIVOT_VERTICAL { { 0x051FFFFF }, sCamSetNorm2Modes }, // CAM_SET_NORMAL2 { { 0x0501E05F }, sCamSetFishingModes }, // CAM_SET_FISHING - { { 0x45000001 }, sCamSetDemoCModes }, // CAM_SET_DEMOC - { { 0x051FFFFF }, sCamSetUOFiberModes }, // CAM_SET_UO_FIBER + { { 0x45000001 }, sCamSetDemoCModes }, // CAM_SET_CS_C + { { 0x051FFFFF }, sCamSetUOFiberModes }, // CAM_SET_JABU_TENTACLE { { 0x051FFFFF }, sCamSetDungeon2Modes }, // CAM_SET_DUNGEON2 - { { 0x051FFFFF }, sCamSetTeppenModes }, // CAM_SET_TEPPEN - { { 0xC5000ECD }, sCamSetCirc7Modes }, // CAM_SET_CIRCLE7 + { { 0x051FFFFF }, sCamSetTeppenModes }, // CAM_SET_DIRECTED_YAW + { { 0xC5000ECD }, sCamSetCirc7Modes }, // CAM_SET_PIVOT_FROM_SIDE { { 0x051FFFFF }, sCamSetNorm4Modes }, // CAM_SET_NORMAL4 }; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f2f39d57fc..3738566a1f 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1290,7 +1290,7 @@ s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* if (csCtx->unk_1A != 0) { csCtx->unk_18 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - Gameplay_CameraChangeSetting(globalCtx, csCtx->unk_14, CAM_SET_DEMO0); + Gameplay_CameraChangeSetting(globalCtx, csCtx->unk_14, CAM_SET_CS_0); Gameplay_ChangeCameraStatus(globalCtx, D_8015FCC6, CAM_STAT_WAIT); Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, CAM_STAT_ACTIVE); Camera_ResetAnim(Gameplay_GetCamera(globalCtx, csCtx->unk_14)); @@ -1327,7 +1327,7 @@ s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCt if (csCtx->unk_1B != 0) { D_8015FCC0 = cmdBase->startFrame; if (D_8015FCC8 != 0) { - Gameplay_CameraChangeSetting(globalCtx, csCtx->unk_14, CAM_SET_DEMO0); + Gameplay_CameraChangeSetting(globalCtx, csCtx->unk_14, CAM_SET_CS_0); Gameplay_ChangeCameraStatus(globalCtx, D_8015FCC6, CAM_STAT_WAIT); Gameplay_ChangeCameraStatus(globalCtx, csCtx->unk_14, CAM_STAT_ACTIVE); Camera_ResetAnim(Gameplay_GetCamera(globalCtx, csCtx->unk_14)); diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 53626f5100..fb074315ee 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -88,7 +88,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801208EC; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 1030: D_80120964[0].atTargetInit = globalCtx->view.lookAt; @@ -101,7 +101,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80120964; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 5000: D_801209B4[0].atTargetInit = D_801209B4[1].atTargetInit = globalCtx->view.lookAt; @@ -115,17 +115,17 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801209B4; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 5010: - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMO4); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_ATTENTION); Gameplay_CameraSetAtEye(globalCtx, camIdx, &mainCam->at, &mainCam->eye); csCam->roll = 0; break; case 9500: csInfo->keyFrames = D_80120A54; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 2260: D_80120ACC[0].atTargetInit.x = D_80120ACC[2].atTargetInit.x = @@ -137,7 +137,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80120ACC; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 2270: csInfo->keyFrames = D_80120B94; @@ -154,7 +154,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act D_80120B94[camIdx - 1].eyeTargetInit.y = ((mainCam->globalCtx->state.frames & 1) ? 3.0f : -3.0f) + Rand_ZeroOne(); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 5); Quake_SetSpeed(i, 400); @@ -175,7 +175,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act } D_80120D4C[camIdx - 1].eyeTargetInit.y = ((mainCam->globalCtx->state.frames & 1) ? 3.0f : -3.0f) + Rand_ZeroOne(); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 5); Quake_SetSpeed(i, 400); @@ -186,7 +186,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80120E64; csInfo->keyFrameCnt = 8; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 5); Quake_SetSpeed(i, 400); @@ -202,13 +202,13 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80120FA4; csInfo->keyFrameCnt = 6; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 2340: csInfo->keyFrames = D_80121094; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 5); Quake_SetSpeed(i, 400); @@ -219,7 +219,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012110C; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 2200: { s16 sp82; @@ -256,7 +256,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 2; } Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_UNK3); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); } break; case 2290: { Actor* rideActor = player->rideActor; @@ -269,7 +269,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121224; csInfo->keyFrameCnt = 6; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); } break; case 5120: func_8002DF54(globalCtx, NULL, 8); @@ -277,7 +277,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121314; csInfo->keyFrameCnt = 1; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4510: D_8012133C[0].eyeTargetInit = actor->world.pos; @@ -287,7 +287,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012133C; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4500: Actor_GetFocus(&spA0, actor); @@ -319,7 +319,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801213B4; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 1010: Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_FREE2); @@ -328,12 +328,12 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act Gameplay_SetCameraRoll(globalCtx, camIdx, childCam->roll); break; case 9601: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_DEMO3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_CS_3); Gameplay_CameraChangeSetting(globalCtx, MAIN_CAM, mainCam->prevSetting); OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120398); break; case 9602: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_DEMO3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_CS_3); Gameplay_CameraChangeSetting(globalCtx, MAIN_CAM, mainCam->prevSetting); OnePointCutscene_SetCsCamPoints(csCam, D_80120430 | 0x1000, D_8012042C, D_80120308, D_80120434); break; @@ -341,7 +341,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012147C; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4180: spC0.x = -1881.0f; @@ -363,7 +363,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012151C; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3020: D_8012156C[1].timerInit = timer - 1; @@ -380,7 +380,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012156C; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); func_8002DF54(globalCtx, NULL, 8); break; case 3010: @@ -389,13 +389,13 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801215BC; csInfo->keyFrameCnt = 1; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3070: csInfo->keyFrames = D_801215E4; csInfo->keyFrameCnt = 10; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 3); Quake_SetSpeed(i, 22000); @@ -406,7 +406,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121774; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3090: func_8002DF54(globalCtx, NULL, 8); @@ -414,14 +414,14 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121814; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3100: VEC_SET(spB4, 0.0f, -280.0f, -1400.0f); Actor_GetFocus(&spA0, actor); spC0 = spA0.pos; - func_800C0808(globalCtx, camIdx, player, CAM_SET_CIRCLE6); + func_800C0808(globalCtx, camIdx, player, CAM_SET_PIVOT_VERTICAL); Gameplay_CameraSetAtEye(globalCtx, camIdx, &spC0, &spB4); csCam->roll = 0; csCam->fov = 70.0f; @@ -433,7 +433,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 2; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 1); Quake_SetSpeed(i, 24000); @@ -445,10 +445,10 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 2; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3050: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_DEMO3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_CS_3); func_8002DF54(globalCtx, &player->actor, 5); OnePointCutscene_SetCsCamPoints(csCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C); func_80078884(NA_SE_SY_CORRECT_CHIME); @@ -479,14 +479,14 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 2; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3130: csInfo->keyFrames = D_80121A44; csInfo->keyFrameCnt = 12; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); csCam->unk_14C |= 2; break; case 3140: @@ -497,7 +497,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121C24; csInfo->keyFrameCnt = 7; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3150: spC0.x = 1890.0f; @@ -556,7 +556,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF38(globalCtx, actor, 1); break; case 3190: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_MORI3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_FOREST_DEFEAT_POE); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); func_8002DF38(globalCtx, actor, 0xC); break; @@ -605,7 +605,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act case 3220: Actor_GetFocus(&spA0, actor); spC0 = spA0.pos; - func_800C0808(globalCtx, camIdx, player, CAM_SET_CIRCLE6); + func_800C0808(globalCtx, camIdx, player, CAM_SET_PIVOT_VERTICAL); Actor_GetWorld(&spA0, &player->actor); OLib_Vec3fDiffToVecSphGeo(&spD0, &spC0, &spA0.pos); spD0.yaw += 0x3E8; @@ -625,10 +625,10 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 3; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 6001: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_DEMO3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_CS_3); func_8002DF54(globalCtx, NULL, 8); Actor_GetWorld(&spA0, actor); if (spA0.pos.z > -750.0f) { @@ -643,7 +643,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act Quake_SetCountdown(i, D_801208E4 - 10); break; case 3400: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_DEMO3); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_CS_3); func_8002DF38(globalCtx, &player->actor, 8); OnePointCutscene_SetCsCamPoints(csCam, D_8012069C | 0x2000, D_80120698, D_801204D4, D_801205B4); OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_801205B4[D_80120694 - 2].pos); @@ -661,10 +661,10 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 9; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3310: - Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_HIDAN2); + Gameplay_CameraChangeSetting(globalCtx, camIdx, CAM_SET_FIRE_STAIRCASE); func_8002DF54(globalCtx, NULL, 8); Gameplay_CopyCamera(globalCtx, camIdx, MAIN_CAM); @@ -683,7 +683,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80121F1C; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 3); Quake_SetSpeed(i, 12000); @@ -699,7 +699,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 4; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 3); Quake_SetSpeed(i, 12000); @@ -711,7 +711,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 3; func_8002DF38(globalCtx, &player->actor, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3350: D_801220D4[0].atTargetInit = globalCtx->view.lookAt; @@ -730,21 +730,21 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801220D4; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3330: csInfo->keyFrames = D_8012219C; csInfo->keyFrameCnt = 7; func_8002DF38(globalCtx, &player->actor, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3410: csInfo->keyFrames = D_801222B4; csInfo->keyFrameCnt = 5; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 1); Quake_SetSpeed(i, 32000); @@ -756,7 +756,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 2; func_8002DF38(globalCtx, &player->actor, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 1); Quake_SetSpeed(i, 32000); @@ -768,7 +768,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 6; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); player->stateFlags1 |= 0x20000000; player->actor.freezeTimer = 90; @@ -782,7 +782,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 7; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 1); Quake_SetSpeed(i, 32000); @@ -794,7 +794,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 5; player->actor.shape.rot.y = player->actor.world.rot.y = player->currentYaw = 0x3FFC; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); func_8002DF54(globalCtx, NULL, 8); break; case 4110: @@ -802,7 +802,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 3; func_8002DF38(globalCtx, &player->actor, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4120: func_8002DF54(globalCtx, NULL, 8); @@ -810,13 +810,13 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80122714; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4140: csInfo->keyFrames = D_801227B4; csInfo->keyFrameCnt = 6; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); break; case 4150: @@ -825,7 +825,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF54(globalCtx, NULL, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4160: csInfo->keyFrames = D_8012296C; @@ -833,7 +833,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF54(globalCtx, NULL, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4170: csInfo->keyFrames = D_80122A0C; @@ -841,7 +841,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF54(globalCtx, NULL, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4190: csInfo->keyFrames = D_80122A5C; @@ -849,7 +849,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF38(globalCtx, &player->actor, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4200: csInfo->keyFrames = D_80122B9C; @@ -857,7 +857,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act func_8002DF38(globalCtx, &player->actor, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4210: player->actor.freezeTimer = timer; @@ -865,7 +865,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80122C14; csInfo->keyFrameCnt = 1; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 3); Quake_SetSpeed(i, 12000); @@ -876,7 +876,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = (player->actor.world.pos.z < -15.0f) ? D_80122C3C : D_80122C64; csInfo->keyFrameCnt = 1; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); func_8002DF38(globalCtx, &player->actor, 1); i = Quake_Add(csCam, 3); @@ -889,7 +889,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrameCnt = 1; func_8002DF54(globalCtx, NULL, 8); - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3260: func_8002DF54(globalCtx, NULL, 8); @@ -898,7 +898,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80122CB4; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 3261: func_8002DF54(globalCtx, NULL, 8); @@ -907,19 +907,19 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80122D04; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 8010: csInfo->keyFrames = D_80122D54; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 8002: csInfo->keyFrames = D_80122DCC; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 8700: Actor_GetFocus(&spA0, actor); @@ -930,7 +930,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80122E44[timer & 1]; csInfo->keyFrameCnt = 7; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 1100: { s32 tempDiff = globalCtx->state.frames - sPrevFrameCs1100; @@ -948,14 +948,14 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012313C; csInfo->keyFrameCnt = 3; } - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); sPrevFrameCs1100 = globalCtx->state.frames; } break; case 9806: csCam->timer = -99; if (func_800C0CB8(globalCtx)) { - func_800C0808(globalCtx, camIdx, player, CAM_SET_ITEM2); + func_800C0808(globalCtx, camIdx, player, CAM_SET_TURN_AROUND); csCam->data2 = 0xC; } else { Gameplay_CopyCamera(globalCtx, camIdx, MAIN_CAM); @@ -982,7 +982,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801231B4; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); } else { D_80123254[1].timerInit = timer - 1; D_80123254[0].fovTargetInit = mainCam->fov; @@ -992,7 +992,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80123254; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); } break; case 1000: @@ -1003,49 +1003,49 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801232A4; csInfo->keyFrameCnt = 1; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 8603: csInfo->keyFrames = D_801232CC; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 8604: csInfo->keyFrames = D_80123394; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4000: csInfo->keyFrames = D_8012345C; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4010: csInfo->keyFrames = D_801234FC; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4011: csInfo->keyFrames = D_801235C4; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4020: csInfo->keyFrames = D_8012368C; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4021: csInfo->keyFrames = D_8012372C; csInfo->keyFrameCnt = 4; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 4022: csCam->timer = D_801237CC[0].timerInit + D_801237CC[3].timerInit + D_801237CC[1].timerInit + @@ -1054,7 +1054,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801237CC; csInfo->keyFrameCnt = 5; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 9703: D_80123894[0].atTargetInit = globalCtx->view.lookAt; @@ -1068,7 +1068,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_80123894; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 9704: D_8012390C[0].atTargetInit = globalCtx->view.lookAt; @@ -1078,7 +1078,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012390C; csInfo->keyFrameCnt = 2; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 9705: D_8012395C[0].atTargetInit = globalCtx->view.lookAt; @@ -1088,7 +1088,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_8012395C; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, player, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, player, CAM_SET_CS_C); break; case 5110: D_801239D4[1].timerInit = 10; @@ -1096,7 +1096,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act csInfo->keyFrames = D_801239D4; csInfo->keyFrameCnt = 3; - func_800C0808(globalCtx, camIdx, (Player*)actor, CAM_SET_DEMOC); + func_800C0808(globalCtx, camIdx, (Player*)actor, CAM_SET_CS_C); break; default: osSyncPrintf(VT_COL(RED, WHITE) "onepointdemo camera: demo number not found !! (%d)\n" VT_RST, csId); @@ -1259,7 +1259,7 @@ s32 OnePointCutscene_Attention(GlobalContext* globalCtx, Actor* actor) { sUnused = -1; parentCam = globalCtx->cameraPtrs[MAIN_CAM]; - if (parentCam->mode == CAM_MODE_BOOMFOLLLOW) { + if (parentCam->mode == CAM_MODE_FOLLOWBOOMERANG) { osSyncPrintf(VT_COL(YELLOW, BLACK) "actor attention demo camera: change mode BOOKEEPON -> NORMAL\n" VT_RST); Camera_ChangeMode(parentCam, CAM_MODE_NORMAL); } @@ -1272,7 +1272,7 @@ s32 OnePointCutscene_Attention(GlobalContext* globalCtx, Actor* actor) { parentCam = globalCtx->cameraPtrs[parentCam->childCamIdx]; if (parentCam == NULL) { break; - } else if (parentCam->setting != CAM_SET_DEMO4) { + } else if (parentCam->setting != CAM_SET_CS_ATTENTION) { if (vLastHigherCat == -1) { continue; } else { @@ -1363,7 +1363,7 @@ s32 OnePointCutscene_CheckForCategory(GlobalContext* globalCtx, s32 category) { while (parentCam->childCamIdx != SUBCAM_FREE) { parentCam = globalCtx->cameraPtrs[parentCam->childCamIdx]; - if ((parentCam == NULL) || (parentCam->setting != CAM_SET_DEMO4)) { + if ((parentCam == NULL) || (parentCam->setting != CAM_SET_CS_ATTENTION)) { break; } else if (category == parentCam->target->category) { return true; diff --git a/src/code/z_play.c b/src/code/z_play.c index 7933d67f7e..11e1cea0ec 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1212,7 +1212,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { if ((HREG(80) != 10) || (HREG(83) != 0)) { if ((globalCtx->skyboxCtx.unk_140 != 0) && - (GET_ACTIVE_CAM(globalCtx)->setting != CAM_SET_PREREND0)) { + (GET_ACTIVE_CAM(globalCtx)->setting != CAM_SET_PREREND_FIXED)) { Vec3f sp74; Camera_GetSkyboxOffset(&sp74, GET_ACTIVE_CAM(globalCtx)); diff --git a/src/code/z_room.c b/src/code/z_room.c index 29969e2916..061e37a17b 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -320,7 +320,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 628); camera = GET_ACTIVE_CAM(globalCtx); - sp9C = (camera->setting == CAM_SET_PREREND0); + sp9C = (camera->setting == CAM_SET_PREREND_FIXED); polygon1 = &room->mesh->polygon1; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); sp98 = (flags & 1) && sp9C && polygon1->single.source && !(SREG(25) & 1); @@ -415,7 +415,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 752); camera = GET_ACTIVE_CAM(globalCtx); - sp98 = (camera->setting == CAM_SET_PREREND0); + sp98 = (camera->setting == CAM_SET_PREREND_FIXED); polygon1 = &room->mesh->polygon1; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist); bgImage = func_80096A74(polygon1, globalCtx); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 9c75f4e491..08996fd889 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -207,8 +207,8 @@ void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) { BgHidanCurtainParams* hcParams = &sHCParams[this->size]; f32 riseProgress; - if ((globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_ITEM0) || - (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_ITEM2)) { + if ((globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_SLOW_CHEST_CS) || + (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_TURN_AROUND)) { this->collider.base.atFlags &= ~AT_HIT; } else { if (this->collider.base.atFlags & AT_HIT) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index ad9ed7b540..2ed866467b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -131,7 +131,7 @@ void BgHidanFslift_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_16A == 0) { this->unk_16A = 3; } - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_HIDAN1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FIRE_PLATFORM); } else if (!func_8004356C(&this->dyna)) { if (this->unk_16A != 0) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index a39938d366..3d7f41845b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -266,7 +266,7 @@ void func_8088B79C(BgHidanRock* this, GlobalContext* globalCtx) { if (this->unk_169 == 0) { this->unk_169 = 3; } - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_HIDAN1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FIRE_PLATFORM); } else if (!func_8004356C(&this->dyna)) { if (this->unk_169 != 0) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); @@ -319,7 +319,7 @@ void func_8088B990(BgHidanRock* this, GlobalContext* globalCtx) { if (this->unk_169 == 0) { this->unk_169 = 3; } - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_HIDAN1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FIRE_PLATFORM); } else if (!func_8004356C(&this->dyna)) { if (this->unk_169 != 0) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index d03b1c3d45..85a266f20f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -114,7 +114,7 @@ void BgHidanSyoku_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->unk_168 == 0) { this->unk_168 = 3; } - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_HIDAN1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FIRE_PLATFORM); } else if (!func_8004356C(&this->dyna)) { if (this->unk_168 != 0) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 386ec49cc9..c1fa3943b2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -191,7 +191,7 @@ void BgJya1flift_Update(Actor* thisx, GlobalContext* globalCtx2) { tempIsRiding = func_8004356C(&this->dyna) ? true : false; if ((this->actionFunc == BgJya1flift_Move) || (this->actionFunc == BgJya1flift_DelayMove)) { if (tempIsRiding) { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_HIDAN1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FIRE_PLATFORM); } else if (!tempIsRiding && this->isLinkRiding) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index eecd5ce5f4..1cf110e445 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -138,9 +138,9 @@ void BgJyaLift_Update(Actor* thisx, GlobalContext* globalCtx2) { this->actionFunc(this, globalCtx); } if ((this->dyna.unk_160 & 4) && ((this->unk_16B & 4) == 0)) { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_TEPPEN); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DIRECTED_YAW); } else if (((this->dyna.unk_160) & 4) == 0 && ((this->unk_16B & 4)) && - (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_TEPPEN)) { + (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_DIRECTED_YAW)) { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); } this->unk_16B = this->dyna.unk_160; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 81050c6a3f..e33a3fcf01 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -189,7 +189,7 @@ void func_808A3D58(BgMoriHineri* this, GlobalContext* globalCtx) { this->actionFunc = func_808A3E54; mainCamChildIdx = globalCtx->cameraPtrs[MAIN_CAM]->childCamIdx; - if ((mainCamChildIdx != SUBCAM_FREE) && (globalCtx->cameraPtrs[mainCamChildIdx]->setting == CAM_SET_DEMO1)) { + if ((mainCamChildIdx != SUBCAM_FREE) && (globalCtx->cameraPtrs[mainCamChildIdx]->setting == CAM_SET_CS_TWISTED_HALLWAY)) { OnePointCutscene_EndCutscene(globalCtx, mainCamChildIdx); } OnePointCutscene_Init(globalCtx, 3260, 40, &this->dyna.actor, MAIN_CAM); diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 13e4f0e36e..9a84b0a39d 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -210,7 +210,7 @@ void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("camera changed (mori rakka tenjyo) ... \n"); sCamSetting = globalCtx->cameraPtrs[MAIN_CAM]->setting; Camera_SetCameraData(globalCtx->cameraPtrs[MAIN_CAM], 1, &this->dyna.actor, NULL, 0, 0, 0); - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_MORI1); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_FOREST_BIRDS_EYE); } } else if (sCamSetting != CAM_SET_NONE) { osSyncPrintf("camera changed (previous) ... \n"); diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index e14d52d625..caa0a5724f 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -63,7 +63,7 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { if (1) {} if (func_80043590(&this->dyna) && (this->dyna.actor.yDistToPlayer < 1000.0f)) { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BOSS_SHADES); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BOSS_BONGO); } else { Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); } diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 0bcb09c0ac..762500701d 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -779,7 +779,7 @@ void EnBigokuta_Update(Actor* thisx, GlobalContext* globalCtx2) { this->actionFunc(this, globalCtx); func_809BD2E4(this); func_809BE568(this); - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_TAKO); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BIG_OCTO); func_8005AD1C(globalCtx->cameraPtrs[MAIN_CAM], 4); if (this->cylinder[0].base.atFlags & AT_ON) { diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index 3bea2c6672..cf3242206d 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -54,7 +54,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, GlobalContext* globalCtx) { EnBomChu* chu; Vec3f chuPosDiff; - if (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_FIXED1) { + if (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_CHU_BOWLING) { chu = (EnBomChu*)globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].head; while (chu != NULL) { diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 7275a93764..894c2056de 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -429,12 +429,12 @@ s32 EnGo_IsCameraModified(EnGo* this, GlobalContext* globalCtx) { xyzDist = (this->actor.scale.x / 0.01f) * 10000.0f; if ((this->actor.params & 0xF0) == 0x90) { - Camera_ChangeSetting(camera, CAM_SET_TEPPEN); + Camera_ChangeSetting(camera, CAM_SET_DIRECTED_YAW); xyzDist *= 4.8f; } if (fabsf(this->actor.xyzDistToPlayerSq) > xyzDist) { - if (camera->setting == CAM_SET_TEPPEN) { + if (camera->setting == CAM_SET_DIRECTED_YAW) { Camera_ChangeSetting(camera, CAM_SET_NORMAL0); } return 0; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index a66ca80b4a..dedef1243f 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1127,9 +1127,9 @@ s32 EnGo2_IsCameraModified(EnGo2* this, GlobalContext* globalCtx) { if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { if (EnGo2_IsWakingUp(this)) { - Camera_ChangeSetting(camera, CAM_SET_TEPPEN); + Camera_ChangeSetting(camera, CAM_SET_DIRECTED_YAW); func_8005AD1C(camera, 4); - } else if (!EnGo2_IsWakingUp(this) && (camera->setting == CAM_SET_TEPPEN)) { + } else if (!EnGo2_IsWakingUp(this) && (camera->setting == CAM_SET_DIRECTED_YAW)) { Camera_ChangeSetting(camera, CAM_SET_DUNGEON1); func_8005ACFC(camera, 4); } diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index f63b91f23f..6716c9f41d 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -73,7 +73,7 @@ void EnWallTubo_DetectChu(EnWallTubo* this, GlobalContext* globalCtx) { s16 quakeIndex; if (this->chuGirl->minigamePlayStatus != 0) { - if (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_FIXED1) { + if (globalCtx->cameraPtrs[MAIN_CAM]->setting == CAM_SET_CHU_BOWLING) { chu = (EnBomChu*)globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].head; while (chu != NULL) { diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 2191689dd0..1ed2892ec0 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -194,7 +194,7 @@ void EnZl4_SetCsCameraMove(GlobalContext* globalCtx, s16 index) { Camera* activeCam = GET_ACTIVE_CAM(globalCtx); Player* player = GET_PLAYER(globalCtx); - Camera_ChangeSetting(activeCam, CAM_SET_DEMO0); + Camera_ChangeSetting(activeCam, CAM_SET_CS_0); Camera_ResetAnim(activeCam); Camera_SetCSParams(activeCam, sCsCameraMove[index].atPoints, sCsCameraMove[index].eyePoints, player, sCsCameraMove[index].relativeToPlayer); diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 707add3fc0..d0e44272c3 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -756,9 +756,9 @@ void ObjBean_WaitForPlayer(ObjBean* this, GlobalContext* globalCtx) { if (func_8004356C(&this->dyna)) { // Player is standing on ObjBean_SetupFly(this); if (globalCtx->sceneNum == SCENE_SPOT10) { // Lost woods - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_LIFTBEAN); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BEAN_LOST_WOODS); } else { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_UFOBEAN); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BEAN_GENERIC); } } ObjBean_UpdatePosition(this); @@ -783,7 +783,7 @@ void ObjBean_Fly(ObjBean* this, GlobalContext* globalCtx) { this->dyna.actor.flags &= ~0x10; // Never stop updating (disable) camera = globalCtx->cameraPtrs[MAIN_CAM]; - if ((camera->setting == CAM_SET_LIFTBEAN) || (camera->setting == CAM_SET_UFOBEAN)) { + if ((camera->setting == CAM_SET_BEAN_LOST_WOODS) || (camera->setting == CAM_SET_BEAN_GENERIC)) { Camera_ChangeSetting(camera, CAM_SET_NORMAL0); } @@ -792,14 +792,14 @@ void ObjBean_Fly(ObjBean* this, GlobalContext* globalCtx) { func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_MOVE - SFX_FLAG); if (globalCtx->sceneNum == SCENE_SPOT10) { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_LIFTBEAN); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BEAN_LOST_WOODS); } else { - Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_UFOBEAN); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BEAN_GENERIC); } } else if (this->stateFlags & BEAN_STATE_PLAYER_ON_TOP) { camera = globalCtx->cameraPtrs[MAIN_CAM]; - if ((camera->setting == CAM_SET_LIFTBEAN) || (camera->setting == CAM_SET_UFOBEAN)) { + if ((camera->setting == CAM_SET_BEAN_LOST_WOODS) || (camera->setting == CAM_SET_BEAN_GENERIC)) { Camera_ChangeSetting(camera, CAM_SET_NORMAL0); } } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index ed3664e063..1c21025652 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -2667,7 +2667,7 @@ void func_80835DE4(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s void func_80835E44(GlobalContext* globalCtx, s16 camSetting) { if (!func_800C0CB8(globalCtx)) { - if (camSetting == CAM_SET_SCENE1) { + if (camSetting == CAM_SET_SCENE_TRANSITION) { Interface_ChangeAlpha(2); } } else { @@ -2676,7 +2676,7 @@ void func_80835E44(GlobalContext* globalCtx, s16 camSetting) { } void func_80835EA4(GlobalContext* globalCtx, s32 arg1) { - func_80835E44(globalCtx, CAM_SET_ITEM2); + func_80835E44(globalCtx, CAM_SET_TURN_AROUND); Camera_SetCameraData(Gameplay_GetCamera(globalCtx, 0), 4, 0, 0, arg1, 0, 0); } @@ -5944,7 +5944,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { func_808322D0(globalCtx, this, this->ageProperties->unk_98); func_80832F54(globalCtx, this, 0x28F); chest->unk_1F4 = 1; - Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_ITEM0); + Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_SLOW_CHEST_CS); } else { func_80832264(globalCtx, this, &gPlayerAnim_002DF8); chest->unk_1F4 = -1; @@ -9639,7 +9639,7 @@ void func_808486A8(GlobalContext* globalCtx, Player* this) { Camera_ChangeMode(Gameplay_GetCamera(globalCtx, 0), CAM_MODE_NORMAL); } else if (!(this->stateFlags1 & 0x100000)) { if ((this->actor.parent != NULL) && (this->stateFlags3 & 0x80)) { - camMode = CAM_MODE_FOOKSHOT; + camMode = CAM_MODE_HOOKSHOT; Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->actor.parent); } else if (func_8084377C == this->func_674) { camMode = CAM_MODE_STILL; @@ -9650,7 +9650,7 @@ void func_808486A8(GlobalContext* globalCtx, Player* this) { camMode = CAM_MODE_TALK; } else if (this->stateFlags1 & 0x10000) { if (this->stateFlags1 & 0x2000000) { - camMode = CAM_MODE_BOOMFOLLLOW; + camMode = CAM_MODE_FOLLOWBOOMERANG; } else { camMode = CAM_MODE_FOLLOWTARGET; } @@ -9661,7 +9661,7 @@ void func_808486A8(GlobalContext* globalCtx, Player* this) { } else if (this->stateFlags1 & 0x1000) { camMode = CAM_MODE_CHARGE; } else if (this->stateFlags1 & 0x2000000) { - camMode = CAM_MODE_BOOMFOLLLOW; + camMode = CAM_MODE_FOLLOWBOOMERANG; Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->boomerangActor); } else if (this->stateFlags1 & 0x6000) { if (func_80833B2C(this)) {