m_player audio and other_func functions (#218)

* m_player_sound

* m_player_other_func

* format

4 files changed, 10 insertions, 8 deletions

diff --git a/src/code/audio.c b/src/code/audio.c
index 71f9bbb..0d8f173 100644
--- a/src/code/audio.c
+++ b/src/code/audio.c
@@ -76,7 +76,7 @@ void sAdo_SysTrgStart(u16 id) {
     Na_SysTrgStart(id);
 }
 
-void sAdo_PlyWalkSe(s32 arg0, xyz_t* pos) {
+void sAdo_PlyWalkSe(u16 arg0, xyz_t* pos) {
     f32 distanceVal;
     u16 angleVal;
 
@@ -84,7 +84,7 @@ void sAdo_PlyWalkSe(s32 arg0, xyz_t* pos) {
     Na_PlyWalkSe(arg0, angleVal, distanceVal);
 }
 
-void sAdo_PlyWalkSeRoom(s32 arg0, xyz_t* pos) {
+void sAdo_PlyWalkSeRoom(u8 arg0, xyz_t* pos) {
     f32 distanceVal;
     u16 angleVal;
 
diff --git a/src/code/m_field_info.c b/src/code/m_field_info.c
index 46116c8..4932487 100644
--- a/src/code/m_field_info.c
+++ b/src/code/m_field_info.c
@@ -253,7 +253,7 @@
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008BFC4_jp.s")
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/func_8008C058_jp.s")
+#pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_SetPlayerWade.s")
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_field_info/mFI_CheckPlayerWade.s")
 
diff --git a/src/code/m_kankyo.c b/src/code/m_kankyo.c
index faa526d..4291b7d 100644
--- a/src/code/m_kankyo.c
+++ b/src/code/m_kankyo.c
@@ -8,6 +8,8 @@
 #include "m_event.h"
 #include "audio.h"
 #include "m_all_grow.h"
+#include "prevent_bss_reordering.h"
+#include "prevent_bss_reordering2.h"
 #include "overlays/actors/player_actor/m_player.h"
 #include "m_player_lib.h"
 
diff --git a/src/code/m_submenu.c b/src/code/m_submenu.c
index 079c25b..5f7c230 100644
--- a/src/code/m_submenu.c
+++ b/src/code/m_submenu.c
@@ -202,7 +202,7 @@ void func_800C47B4_jp(UNUSED void* arg0, UNUSED void* arg1) {
         if (temp_v0_3 != NULL) {
             FaultDrawer_Printf("\n");
             FaultDrawer_Printf("player infomation\n");
-            FaultDrawer_Printf("main_index         :%d %d\n", temp_v0_3->unk_0CF0, temp_v0_3->unk_0CF4);
+            FaultDrawer_Printf("main_index         :%d %d\n", temp_v0_3->nowMainIndex, temp_v0_3->unk_0CF4);
             FaultDrawer_Printf("request_main_index :%d %d %d\n", temp_v0_3->unk_0D00, temp_v0_3->unk_0D04,
                                temp_v0_3->unk_0D08);
             FaultDrawer_Printf("pos :%d %d %d\n", (s32)temp_v0_3->actor.world.pos.x, (s32)temp_v0_3->actor.world.pos.y,
@@ -347,7 +347,7 @@ void mSM_Reset_player_btn_type1(Game_Play* game_play) {
     Player* player = get_player_actor_withoutCheck(game_play);
 
     if (player != NULL) {
-        player->unk_12B8 = 0;
+        player->pressedAButton = 0;
         player->unk_12BC = 1;
     }
 }
@@ -382,11 +382,11 @@ void mSM_submenu_ctrl(Game_Play* game_play) {
         Player* player = get_player_actor_withoutCheck(game_play);
         UNUSED s32 pad;
 
-        if ((player != NULL) && (player->unk_12B8 == 1) && (common_data.unk_10A68 == 0) && (submenu->unk_E2 == 0) &&
-            (submenu->unk_E3 <= 0)) {
+        if ((player != NULL) && (player->pressedAButton == TRUE) && (common_data.unk_10A68 == 0) &&
+            (submenu->unk_E2 == 0) && (submenu->unk_E3 <= 0)) {
             if (mPlib_able_submenu_type1(game_play) != 0) {
                 if (ABS(BINANG_ROT180(player->actor.shape.rot.y)) < 0x2000) {
-                    switch (player->unk_12C0) {
+                    switch (player->itemInFront) {
                         case 0x7:
                         case 0xB:
                             mSM_open_submenu(submenu, 6, 0, 0);