m_demo OK (#221)

* m_demo OK

* camera fix

9 files changed, 11 insertions, 9 deletions

diff --git a/src/overlays/actors/ovl_Dump/ac_dump.c b/src/overlays/actors/ovl_Dump/ac_dump.c
index b93651b..9897276 100644
--- a/src/overlays/actors/ovl_Dump/ac_dump.c
+++ b/src/overlays/actors/ovl_Dump/ac_dump.c
@@ -2,7 +2,7 @@
 #include "m_actor_dlftbls.h"
 #include "m_object.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "m_player_lib.h"
 #include "overlays/actors/player_actor/m_player.h"
 #include "m_field_info.h"
diff --git a/src/overlays/actors/ovl_Kago/ac_kago.c b/src/overlays/actors/ovl_Kago/ac_kago.c
index 5cb3bc7..60867fb 100644
--- a/src/overlays/actors/ovl_Kago/ac_kago.c
+++ b/src/overlays/actors/ovl_Kago/ac_kago.c
@@ -3,7 +3,7 @@
 #include "m_object.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 #include "overlays/actors/player_actor/m_player.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "m_field_info.h"
 #include "m_player_lib.h"
 #include "m_rcp.h"
diff --git a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
index f63c756..c92b162 100644
--- a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
+++ b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
@@ -5,7 +5,7 @@
 #include "overlays/gamestates/ovl_play/m_play.h"
 #include "c_keyframe.h"
 #include "m_player_lib.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "m_field_info.h"
 #include "audio.h"
 #include "overlays/actors/player_actor/m_player.h"
diff --git a/src/overlays/actors/ovl_Mikuji/ac_mikuji.c b/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
index 2504af7..bf34f3c 100644
--- a/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
+++ b/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
@@ -4,7 +4,7 @@
 #include "m_player_lib.h"
 #include "overlays/actors/player_actor/m_player.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "gfx.h"
 #include "m_field_info.h"
 #include "m_rcp.h"
diff --git a/src/overlays/actors/ovl_Nameplate/ac_nameplate.c b/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
index c74f8bb..36add1b 100644
--- a/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
+++ b/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
@@ -6,7 +6,7 @@
 #include "m_player_lib.h"
 #include "m_npc.h"
 #include "m_msg_main.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "overlays/actors/player_actor/m_player.h"
 #include "color.h"
 
diff --git a/src/overlays/actors/ovl_Sample/ac_sample.c b/src/overlays/actors/ovl_Sample/ac_sample.c
index f95d071..55f6db8 100644
--- a/src/overlays/actors/ovl_Sample/ac_sample.c
+++ b/src/overlays/actors/ovl_Sample/ac_sample.c
@@ -2,7 +2,7 @@
 #include "m_actor_dlftbls.h"
 #include "m_object.h"
 #include "m_rcp.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "m_msg_main.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
diff --git a/src/overlays/actors/ovl_Tama/ac_tama.c b/src/overlays/actors/ovl_Tama/ac_tama.c
index afbfcfc..bb1b2ec 100644
--- a/src/overlays/actors/ovl_Tama/ac_tama.c
+++ b/src/overlays/actors/ovl_Tama/ac_tama.c
@@ -6,7 +6,7 @@
 #include "overlays/actors/player_actor/m_player.h"
 #include "m_player_lib.h"
 #include "libc/math.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "m_field_info.h"
 #include "code_variables.h"
 #include "m_rcp.h"
diff --git a/src/overlays/actors/player_actor/m_player.c b/src/overlays/actors/player_actor/m_player.c
index 29cda2c..f187543 100644
--- a/src/overlays/actors/player_actor/m_player.c
+++ b/src/overlays/actors/player_actor/m_player.c
@@ -9,7 +9,7 @@
 #include "m_name_table.h"
 #include "m_scene_table.h"
 #include "m_debug.h"
-#include "69E2C0.h"
+#include "m_demo.h"
 #include "67E840.h"
 
 extern ClObjPipe_Init Player_actor_OcInfoData_forStand;
diff --git a/src/overlays/actors/player_actor/m_player.h b/src/overlays/actors/player_actor/m_player.h
index 1ce84a7..c1e350e 100644
--- a/src/overlays/actors/player_actor/m_player.h
+++ b/src/overlays/actors/player_actor/m_player.h
@@ -123,6 +123,7 @@ typedef union Player_MainIndexData {
     u8 forceAlignment[72];
 } Player_MainIndexData;
 
+typedef void* (*PlayerUnk122CFunc)(struct Game_Play*);
 typedef void (*PlayerUnk1230Func)(struct Player*, struct Game_Play*, Actor*, s32, xyz_t*, f32);
 typedef f32 (*PlayerUnk1234Func)(struct Player*, struct Game_Play*);
 typedef void (*PlayerUnk1238Func)(struct Player*, struct Game_Play*, Actor*, s32);
@@ -158,7 +159,8 @@ typedef struct Player {
     /* 0x0FA4 */ ClObjTris colliderTris2;
     /* 0x0FB8 */ UNK_TYPE1 unk_0FB8[0x50];
     /* 0x1008 */ ClObjPipe colliderPipe;
-    /* 0x1024 */ UNK_TYPE1 unk_1024[0x20C];
+    /* 0x1024 */ UNK_TYPE1 unk_1024[0x208];
+    /* 0x122C */ PlayerUnk122CFunc unk_122C;
     /* 0x1230 */ PlayerUnk1230Func unk_1230;
     /* 0x1234 */ PlayerUnk1234Func unk_1234;
     /* 0x1238 */ PlayerUnk1238Func unk_1238;