m_player audio and other_func functions (#218)

* m_player_sound

* m_player_other_func

* format

8 files changed, 17 insertions, 12 deletions

diff --git a/include/67E840.h b/include/67E840.h
index 4db65ae..9d52f95 100644
--- a/include/67E840.h
+++ b/include/67E840.h
@@ -109,7 +109,7 @@ struct Game;
 // void func_8005DCCC_jp();
 void mBGMPsComp_make_ps_lost_fanfare(s32 arg0, s32 arg1);
 // void func_8005DD5C_jp();
-void mBGMPsComp_make_ps_wipe(s32 arg0, struct Game_Play* game_play);
+void mBGMPsComp_make_ps_wipe(s32 arg0);
 // void func_8005DE0C_jp();
 // void func_8005DE60_jp();
 // void func_8005DE88_jp();
@@ -176,7 +176,7 @@ void mBGMPsComp_scene_mode(s32 arg0);
 // void func_8005EDC4_jp();
 // void func_8005EDD8_jp();
 // void func_8005EDEC_jp();
-// void func_8005EE00_jp();
+void mBGMForce_room_nonstop_start(void);
 // void func_8005EE20_jp();
 // void func_8005EEA0_jp();
 void mBGM_main(struct Game* game);
diff --git a/include/69E2C0.h b/include/69E2C0.h
index eebddb8..5ce8734 100644
--- a/include/69E2C0.h
+++ b/include/69E2C0.h
@@ -78,7 +78,7 @@ void mDemo_Request(s32 arg0, struct Actor* actor, void* arg2);
 s32 mDemo_Check(s32 arg0, struct Actor* actor);
 // void func_8007CF34_jp();
 // void func_8007CF44_jp();
-// void func_8007CF84_jp();
+void mDemo_End(struct Actor*);
 void mDemo_Main(struct Game_Play* game_play);
 void func_8007CFD8_jp(struct Game_Play* game_play);
 // void func_8007D030_jp();
diff --git a/include/audio.h b/include/audio.h
index 7ded4bc..4c646ee 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -20,8 +20,8 @@ void sAdo_BgmStop(u16 id);
 void sAdo_BgmTrOn(u8 id);
 void sAdo_BgmTrOff(u8 id);
 void sAdo_SysTrgStart(u16 id);
-void sAdo_PlyWalkSe(s32 arg0, struct xyz_t* pos);
-void sAdo_PlyWalkSeRoom(s32 arg0, struct xyz_t* pos);
+void sAdo_PlyWalkSe(u16 arg0, struct xyz_t* pos);
+void sAdo_PlyWalkSeRoom(u8 arg0, struct xyz_t* pos);
 void sAdo_NpcWalkSe(s32 arg0, struct xyz_t* pos);
 void sAdo_NpcWalkSeRoom(u16 arg0, struct xyz_t* pos);
 void sAdo_PlayerStatusLevel(u8 arg0, f32 speed);
diff --git a/include/m_actor.h b/include/m_actor.h
index 1c17587..5c9dc1e 100644
--- a/include/m_actor.h
+++ b/include/m_actor.h
@@ -114,7 +114,7 @@ typedef struct Actor {
     /* 0x07C */ f32 terminalVelocity;
     /* 0x080 */ UNK_TYPE1 unk_080[0x4];
     /* 0x084 */ mCoBG_Check colCheck;
-    /* 0x0B4 */ UNK_TYPE1 unk_0B4[0x1];
+    /* 0x0B4 */ u8 unk_0B4;
     /* 0x0B5 */ u8 isDrawn;
     /* 0x0B6 */ s16 yawTowardsPlayer;
     /* 0x0B8 */ f32 xyzDistToPlayerSq;
diff --git a/include/m_clip.h b/include/m_clip.h
index e91d18f..4fb2683 100644
--- a/include/m_clip.h
+++ b/include/m_clip.h
@@ -114,7 +114,7 @@ typedef void (*Clip_unk_080_unk_24)(void);
 typedef s32 (*Clip_unk_080_unk_28)(struct Game* game, u16 ftr, s32 res,s32 utX, s32 utZ, u16 rotation,
                                             s32 squareOffs, s32 layer);
 typedef UNK_RET (*Clip_unk_080_unk_34)(struct FurnitureActor* furnitureActor, struct Actor* myHouseActor, struct Game_Play* game_play, f32 arg0, f32 arg1);
-
+typedef s32 (*Clip_unk_080_unk_54)(struct xyz_t* pos);
 typedef struct MyRoomClip {
     /* 0x00 */ UNK_TYPE1 unk_00[0x4];
     /* 0x04 */ Clip_unk_080_unk_04 unk_04;
@@ -123,7 +123,9 @@ typedef struct MyRoomClip {
     /* 0x28 */ Clip_unk_080_unk_28 unk_28;
     /* 0x2C */ UNK_TYPE1 unk_2C[0x8]; 
     /* 0x34 */ Clip_unk_080_unk_34 unk_34; // open close proc
-} MyRoomClip; // size >= 0x8
+    /* 0x38 */ s8 unk_38[0x24];
+    /* 0x54 */ Clip_unk_080_unk_54 unk_54;
+} MyRoomClip; // size >= 0x54
 
 typedef struct StructureClipOverlayInfo {
     /* 0x00 */ s8* overlayPointer;
diff --git a/include/m_common_data.h b/include/m_common_data.h
index 3116d8a..a1527fa 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -160,9 +160,11 @@ typedef struct CommonData {
     /* 0x10764 */ DoorData structureExitDoorData;
     /* 0x1077C */ UNK_TYPE1 unk_1077C[0x24];
     /* 0x107A0 */ DoorData famicomEmuDoorData;
-    /* 0x107B4 */ s16 unk_107B4;
+    /* 0x107B4 */ s8 unk_107B4;
+    /* 0x107B5 */ s8 floorIdx;
     /* 0x107B6 */ s16 unk_107B6; // named "demo_profile" in AC GCN decomp (though it's an array of two s16s in that game)
-    /* 0x107B8 */ UNK_TYPE1 unk_107B8[0x28];
+    /* 0x107B8 */ UNK_TYPE1 unk_107B8[0x27];
+    /* 0x107FF*/  s8 paymentType;
     /* 0x107E0 */ s8 playerDecoyFlag;
     /* 0x107E1 */ UNK_TYPE1 unk_107E1[0x3];
     /* 0x107E4 */ s16 unk_107E4; 
diff --git a/include/m_field_info.h b/include/m_field_info.h
index f954aae..09e9801 100644
--- a/include/m_field_info.h
+++ b/include/m_field_info.h
@@ -10,6 +10,7 @@ struct Actor;
 struct Game_Play;
 struct FieldMakeBlockInfo;
 struct FieldMakeMoveActor;
+struct Game;
 
 #define FI_UT_WORLDSIZE_Z 40
 #define FI_UT_WORLDSIZE_Z_F (f32)FI_UT_WORLDSIZE_Z
@@ -171,7 +172,7 @@ s32 func_8008BE00_jp(struct FieldMakeMoveActor*, s32);
 // void func_8008BE38_jp();
 // void func_8008BF34_jp();
 // void func_8008BFC4_jp();
-// void func_8008C058_jp();
+void mFI_SetPlayerWade(struct Game*);
 s32 mFI_CheckPlayerWade(s32);
 s32 mFI_GetPlayerWade(void);
 // void func_8008C130_jp();
diff --git a/include/m_player_lib.h b/include/m_player_lib.h
index 99c7847..456041e 100644
--- a/include/m_player_lib.h
+++ b/include/m_player_lib.h
@@ -43,7 +43,7 @@ void mPlib_Object_Exchange_keep_Player_dt(struct Game_Play* game_play);
 // void func_800B1BE8_jp();
 struct Player* get_player_actor_withoutCheck(struct Game_Play* game_play);
 // void func_800B1C90_jp();
-s32 func_800B1CBC_jp(struct Game_Play*);
+s32 mPlib_get_player_actor_main_index(struct Game_Play*);
 // void func_800B1CE0_jp();
 // void func_800B1D14_jp();
 // void func_800B1D40_jp();