summaryrefslogtreecommitdiff
path: root/src/camera.h
diff options
context:
space:
mode:
authorTyler McGavran <tyler.taggerung@gmail.com>2022-11-01 17:07:35 -0400
committerGitHub <noreply@github.com>2022-11-01 15:07:35 -0600
commit4647cdcd7e2a0f5b68265aac82d3a50d42aabfaa (patch)
treec2bee6756a8492fa7d7b6b2a3a05162fec2c9134 /src/camera.h
parent1483ddaa0343c1614159c8a4e915d9f027abb8bc (diff)
Assorted, unrelated matches (#267)
* Assorted matches Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'src/camera.h')
-rw-r--r--src/camera.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/camera.h b/src/camera.h
index 0b4227671..143f89746 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -11,7 +11,7 @@ typedef struct {
// I think these are the "nautical angles" between pos and lookAt
// rot[0] = pitch, rot[1] = yaw, rot[2] = roll?
/* 0x24 */ Vec3s rot;
- /* 0x2A */ s16 rotZ;
+ /* 0x2A */ u16 someBitFlags;
/* 0x2C */ s16 unk_2C;
/* 0x2E */ s16 unk_2E;
/* 0x30 */ Vec3f unk_30;
@@ -41,7 +41,13 @@ typedef struct {
void func_8001CA10(Camera*);
void func_8001CA24(Player*, f32);
+void func_8001CA78(Player*, Camera*, Vec3f, f32*, f32*, f32*, s16, s8);
void func_8001D794(Player*, Camera*, Vec3f, f32*, f32*, f32*, s16);
+void func_8001E0C4(Camera*, Player*, s8);
+void func_8001F87C(s32);
+
+extern s32 D_80164A2C;
+extern f32 D_80164A30;
extern Camera cameras[];
extern Camera *camera1;
@@ -53,4 +59,7 @@ extern Player *gPlayerTwo;
extern Player *gPlayerThree;
extern Player *gPlayerFour;
+// Actually define in main.c, probably need to add to main.h
+extern u16 D_80152300[];
+
#endif