diff options
| author | djevangelia <263709373+djevangelia@users.noreply.github.com> | 2026-07-08 21:58:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-08 19:58:24 +0000 |
| commit | 73df35c6ab50d5fbec57ae2fb154eb89c7bc7ff1 (patch) | |
| tree | 17506d14a4337efaa0a88e7fa0984bb24badbc39 /soh/include | |
| parent | 2fc787d64bc5d6a5f37832c41b96f430a5687123 (diff) | |
Bugfix, child Hookshot first person in Hylia lab (#6847)
Diffstat (limited to 'soh/include')
| -rw-r--r-- | soh/include/z64.h | 2 | ||||
| -rw-r--r-- | soh/include/z64camera.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/soh/include/z64.h b/soh/include/z64.h index 70b877f30..3c4daf91c 100644 --- a/soh/include/z64.h +++ b/soh/include/z64.h @@ -1423,7 +1423,7 @@ typedef struct PlayState { /* 0x000B0 */ void* sceneSegment; /* 0x000B8 */ View view; /* 0x001E0 */ Camera mainCamera; - /* 0x0034C */ Camera subCameras[NUM_CAMS - SUBCAM_FIRST]; + /* 0x0034C */ Camera subCameras[NUM_CAMS - CAM_ID_SUB_FIRST]; /* 0x00790 */ Camera* cameraPtrs[NUM_CAMS]; /* 0x007A0 */ s16 activeCamera; /* 0x007A2 */ s16 nextCamera; diff --git a/soh/include/z64camera.h b/soh/include/z64camera.h index cc873c2cf..98797f0a6 100644 --- a/soh/include/z64camera.h +++ b/soh/include/z64camera.h @@ -11,8 +11,9 @@ #define CAM_STAT_UNK100 0x100 #define NUM_CAMS 4 -#define MAIN_CAM 0 -#define SUBCAM_FIRST 1 + +#define CAM_ID_MAIN 0 +#define CAM_ID_SUB_FIRST 1 #define SUBCAM_FREE 0 #define SUBCAM_NONE -1 #define SUBCAM_ACTIVE -1 @@ -98,12 +99,12 @@ typedef enum { /* 0x03 */ CAM_MODE_TALK, /* 0x04 */ CAM_MODE_BATTLE, /* 0x05 */ CAM_MODE_CLIMB, - /* 0x06 */ CAM_MODE_FIRSTPERSON, // "SUBJECT" - /* 0x07 */ CAM_MODE_BOWARROW, + /* 0x06 */ CAM_MODE_FIRST_PERSON, // "SUBJECT" + /* 0x07 */ CAM_MODE_AIM_ADULT, /* 0x08 */ CAM_MODE_BOWARROWZ, /* 0x09 */ CAM_MODE_HOOKSHOT, // "FOOKSHOT" - /* 0x0A */ CAM_MODE_BOOMERANG, - /* 0x0B */ CAM_MODE_SLINGSHOT, // "PACHINCO" + /* 0x0A */ CAM_MODE_AIM_BOOMERANG, + /* 0x0B */ CAM_MODE_AIM_CHILD, // "PACHINCO" /* 0x0C */ CAM_MODE_CLIMBZ, /* 0x0D */ CAM_MODE_JUMP, /* 0x0E */ CAM_MODE_HANG, |