summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/actor_types.h4
-rw-r--r--include/defines.h9
-rw-r--r--include/objects.h2
3 files changed, 2 insertions, 13 deletions
diff --git a/include/actor_types.h b/include/actor_types.h
index 2e4c47087..947c78288 100644
--- a/include/actor_types.h
+++ b/include/actor_types.h
@@ -83,10 +83,8 @@ enum ActorType {
ACTOR_CAR,
ACTOR_KIWANO_FRUIT
};
-size_t CM_GetActorSize(void);
-#define ACTOR_LIST_SIZE CM_GetActorSize()
-struct Actor* CM_GetActor(size_t);
+#define ACTOR_LIST_SIZE CM_GetActorSize()
#define GET_ACTOR(index) CM_GetActor(index)
// Actor flags
diff --git a/include/defines.h b/include/defines.h
index 0d823a4b5..942271c11 100644
--- a/include/defines.h
+++ b/include/defines.h
@@ -124,15 +124,6 @@
#define FOUR_PLAYERS_SELECTED 4
#define SELECTED_PLAYER_DEFINES_TOTAL 5
-// Camera index into cameras array
-enum CameraId {
- CAMERA_ONE = 0,
- CAMERA_TWO,
- CAMERA_THREE,
- CAMERA_FOUR,
- CAMERA_FREECAM
-};
-
enum PlayerId {
PLAYER_NONE = -1,
PLAYER_ONE = 0,
diff --git a/include/objects.h b/include/objects.h
index 2862b7587..d6535dd06 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -421,7 +421,7 @@ extern s32 gNextFreeLeafParticle;
// See `func_800704A0` and `func_800703E0` for star initialization
typedef struct {
// rotY and posY seem relative to the camera.
- // See `func_800788F8` to see how rotY is used to decide whether and where to display clouds/stars
+ // See `func_800788F8` (SkyCloud Tick2 now) to see how rotY is used to decide whether and where to display clouds/stars
// See `func_80078A44` and `func_800789AC` to see how stars and clouds (respectively) are looped over
/* 0x00 */ u16 rotY;
/* 0x02 */ u16 posY;