m_player audio and other_func functions (#218)

* m_player_sound

* m_player_other_func

* format

2 files changed, 100 insertions, 100 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index 8291a7b..c7b45d0 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -339,7 +339,7 @@ func_8005ED98_jp = 0x8005ED98; // type:func
 func_8005EDC4_jp = 0x8005EDC4; // type:func
 func_8005EDD8_jp = 0x8005EDD8; // type:func
 func_8005EDEC_jp = 0x8005EDEC; // type:func
-func_8005EE00_jp = 0x8005EE00; // type:func
+mBGMForce_room_nonstop_start = 0x8005EE00; // type:func
 func_8005EE20_jp = 0x8005EE20; // type:func
 func_8005EEA0_jp = 0x8005EEA0; // type:func
 mBGM_main = 0x8005EEE8; // type:func
@@ -1042,7 +1042,7 @@ mDemo_Request = 0x8007CDD8; // type:func
 mDemo_Check = 0x8007CF00; // type:func
 func_8007CF34_jp = 0x8007CF34; // type:func
 func_8007CF44_jp = 0x8007CF44; // type:func
-func_8007CF84_jp = 0x8007CF84; // type:func
+mDemo_End = 0x8007CF84; // type:func
 mDemo_Main = 0x8007CFB4; // type:func
 func_8007CFD8_jp = 0x8007CFD8; // type:func
 func_8007D030_jp = 0x8007D030; // type:func
@@ -1420,7 +1420,7 @@ func_8008BE00_jp = 0x8008BE00; // type:func
 func_8008BE38_jp = 0x8008BE38; // type:func
 func_8008BF34_jp = 0x8008BF34; // type:func
 func_8008BFC4_jp = 0x8008BFC4; // type:func
-func_8008C058_jp = 0x8008C058; // type:func
+mFI_SetPlayerWade = 0x8008C058; // type:func
 mFI_CheckPlayerWade = 0x8008C0FC; // type:func
 mFI_GetPlayerWade = 0x8008C120; // type:func
 func_8008C130_jp = 0x8008C130; // type:func
@@ -2537,7 +2537,7 @@ func_800B1BB8_jp = 0x800B1BB8; // type:func
 func_800B1BE8_jp = 0x800B1BE8; // type:func
 get_player_actor_withoutCheck = 0x800B1C84; // type:func
 func_800B1C90_jp = 0x800B1C90; // type:func
-func_800B1CBC_jp = 0x800B1CBC; // type:func
+mPlib_get_player_actor_main_index = 0x800B1CBC; // type:func
 func_800B1CE0_jp = 0x800B1CE0; // type:func
 func_800B1D14_jp = 0x800B1D14; // type:func
 func_800B1D40_jp = 0x800B1D40; // type:func
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 680b69f..16d8a57 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -2475,9 +2475,9 @@ func_808B4DE8_jp = 0x808B4DE8; // type:func
 func_808B4E34_jp = 0x808B4E34; // type:func
 func_808B4EE4_jp = 0x808B4EE4; // type:func
 func_808B4EF4_jp = 0x808B4EF4; // type:func
-func_808B4F04_jp = 0x808B4F04; // type:func
+Player_actor_SetPosition_OBJtoLine_forItem = 0x808B4F04; // type:func
 func_808B5150_jp = 0x808B5150; // type:func
-func_808B525C_jp = 0x808B525C; // type:func
+Player_actor_set_eye_PositionAndAngle = 0x808B525C; // type:func
 func_808B527C_jp = 0x808B527C; // type:func
 func_808B5310_jp = 0x808B5310; // type:func
 func_808B5348_jp = 0x808B5348; // type:func
@@ -2504,7 +2504,7 @@ func_808B5960_jp = 0x808B5960; // type:func
 func_808B59C0_jp = 0x808B59C0; // type:func
 func_808B5A10_jp = 0x808B5A10; // type:func
 func_808B5B38_jp = 0x808B5B38; // type:func
-func_808B5B60_jp = 0x808B5B60; // type:func
+Player_actor_Set_OldAngle = 0x808B5B60; // type:func
 func_808B5C58_jp = 0x808B5C58; // type:func
 func_808B5C68_jp = 0x808B5C68; // type:func
 func_808B5D44_jp = 0x808B5D44; // type:func
@@ -2525,7 +2525,7 @@ func_808B6284_jp = 0x808B6284; // type:func
 func_808B6310_jp = 0x808B6310; // type:func
 func_808B6334_jp = 0x808B6334; // type:func
 func_808B6360_jp = 0x808B6360; // type:func
-func_808B638C_jp = 0x808B638C; // type:func
+Player_actor_CheckScene_AbleOutItem = 0x808B638C; // type:func
 func_808B63B4_jp = 0x808B63B4; // type:func
 func_808B63EC_jp = 0x808B63EC; // type:func
 func_808B6424_jp = 0x808B6424; // type:func
@@ -2540,7 +2540,7 @@ func_808B80D0_jp = 0x808B80D0; // type:func
 func_808B8114_jp = 0x808B8114; // type:func
 func_808B81B4_jp = 0x808B81B4; // type:func
 func_808B8204_jp = 0x808B8204; // type:func
-func_808B828C_jp = 0x808B828C; // type:func
+Player_actor_SetFootMark_for_settle_main = 0x808B828C; // type:func
 func_808B83B4_jp = 0x808B83B4; // type:func
 func_808B846C_jp = 0x808B846C; // type:func
 func_808B84DC_jp = 0x808B84DC; // type:func
@@ -2551,11 +2551,11 @@ func_808B8778_jp = 0x808B8778; // type:func
 func_808B87C8_jp = 0x808B87C8; // type:func
 func_808B87FC_jp = 0x808B87FC; // type:func
 func_808B8874_jp = 0x808B8874; // type:func
-func_808B88D4_jp = 0x808B88D4; // type:func
+Player_actor_cancel_request_change_proc_index = 0x808B88D4; // type:func
 func_808B8928_jp = 0x808B8928; // type:func
 func_808B8948_jp = 0x808B8948; // type:func
 func_808B89F8_jp = 0x808B89F8; // type:func
-func_808B8B00_jp = 0x808B8B00; // type:func
+Player_actor_cancel_request_change_proc_index_by_A_btn = 0x808B8B00; // type:func
 func_808B8B54_jp = 0x808B8B54; // type:func
 func_808B8B90_jp = 0x808B8B90; // type:func
 func_808B8C04_jp = 0x808B8C04; // type:func
@@ -2563,10 +2563,10 @@ func_808B8C5C_jp = 0x808B8C5C; // type:func
 func_808B8CF4_jp = 0x808B8CF4; // type:func
 func_808B8DB8_jp = 0x808B8DB8; // type:func
 func_808B8EA8_jp = 0x808B8EA8; // type:func
-func_808B8F34_jp = 0x808B8F34; // type:func
-func_808B8F90_jp = 0x808B8F90; // type:func
-func_808B8FD0_jp = 0x808B8FD0; // type:func
-func_808B9008_jp = 0x808B9008; // type:func
+Player_actor_request_camera2_main_simple_fishing = 0x808B8F34; // type:func
+Player_actor_request_camera2_main_simple_return = 0x808B8F90; // type:func
+Player_actor_request_camera2_main_normal = 0x808B8FD0; // type:func
+Player_actor_request_camera2_change_priority = 0x808B9008; // type:func
 func_808B9028_jp = 0x808B9028; // type:func
 func_808B90C8_jp = 0x808B90C8; // type:func
 func_808B91CC_jp = 0x808B91CC; // type:func
@@ -2586,18 +2586,18 @@ func_808B996C_jp = 0x808B996C; // type:func
 func_808BA0B0_jp = 0x808BA0B0; // type:func
 func_808BA13C_jp = 0x808BA13C; // type:func
 func_808BA1DC_jp = 0x808BA1DC; // type:func
-func_808BA388_jp = 0x808BA388; // type:func
-func_808BA75C_jp = 0x808BA75C; // type:func
+Player_actor_check_little_shake_tree = 0x808BA388; // type:func
+Player_actor_check_shake_tree_timer = 0x808BA75C; // type:func
 func_808BA7BC_jp = 0x808BA7BC; // type:func
 func_808BA88C_jp = 0x808BA88C; // type:func
 func_808BA94C_jp = 0x808BA94C; // type:func
 func_808BAA18_jp = 0x808BAA18; // type:func
 func_808BAAE4_jp = 0x808BAAE4; // type:func
 func_808BAB34_jp = 0x808BAB34; // type:func
-func_808BAC20_jp = 0x808BAC20; // type:func
+Player_actor_check_pitfall = 0x808BAC20; // type:func
 func_808BADFC_jp = 0x808BADFC; // type:func
 func_808BAE38_jp = 0x808BAE38; // type:func
-func_808BAF40_jp = 0x808BAF40; // type:func
+Player_actor_set_ripple = 0x808BAF40; // type:func
 func_808BB098_jp = 0x808BB098; // type:func
 func_808BB158_jp = 0x808BB158; // type:func
 func_808BB1DC_jp = 0x808BB1DC; // type:func
@@ -2607,8 +2607,8 @@ func_808BB520_jp = 0x808BB520; // type:func
 func_808BB570_jp = 0x808BB570; // type:func
 func_808BB604_jp = 0x808BB604; // type:func
 func_808BB650_jp = 0x808BB650; // type:func
-func_808BB6A4_jp = 0x808BB6A4; // type:func
-func_808BB6B8_jp = 0x808BB6B8; // type:func
+Player_actor_Culc_player_frame_counter = 0x808BB6A4; // type:func
+Player_actor_Reset_excute_cancel_wade = 0x808BB6B8; // type:func
 func_808BB724_jp = 0x808BB724; // type:func
 func_808BB904_jp = 0x808BB904; // type:func
 func_808BB98C_jp = 0x808BB98C; // type:func
@@ -2618,7 +2618,7 @@ func_808BBCA8_jp = 0x808BBCA8; // type:func
 func_808BBD34_jp = 0x808BBD34; // type:func
 func_808BBD80_jp = 0x808BBD80; // type:func
 func_808BBDE8_jp = 0x808BBDE8; // type:func
-func_808BBE50_jp = 0x808BBE50; // type:func
+Player_actor_Set_Indoor_Camera_Index = 0x808BBE50; // type:func
 func_808BBF38_jp = 0x808BBF38; // type:func
 func_808BBFA0_jp = 0x808BBFA0; // type:func
 func_808BBFD4_jp = 0x808BBFD4; // type:func
@@ -2626,81 +2626,81 @@ func_808BC2D8_jp = 0x808BC2D8; // type:func
 func_808BC308_jp = 0x808BC308; // type:func
 func_808BC358_jp = 0x808BC358; // type:func
 func_808BC3A0_jp = 0x808BC3A0; // type:func
-func_808BC3D0_jp = 0x808BC3D0; // type:func
-func_808BC494_jp = 0x808BC494; // type:func
-func_808BC4C4_jp = 0x808BC4C4; // type:func
-func_808BC4F0_jp = 0x808BC4F0; // type:func
-func_808BC520_jp = 0x808BC520; // type:func
-func_808BC584_jp = 0x808BC584; // type:func
-func_808BC5C0_jp = 0x808BC5C0; // type:func
-func_808BC5E8_jp = 0x808BC5E8; // type:func
-func_808BC610_jp = 0x808BC610; // type:func
-func_808BC638_jp = 0x808BC638; // type:func
-func_808BC658_jp = 0x808BC658; // type:func
-func_808BC678_jp = 0x808BC678; // type:func
-func_808BC6E0_jp = 0x808BC6E0; // type:func
-func_808BC748_jp = 0x808BC748; // type:func
-func_808BC798_jp = 0x808BC798; // type:func
-func_808BC7D4_jp = 0x808BC7D4; // type:func
-func_808BC7F4_jp = 0x808BC7F4; // type:func
-func_808BC814_jp = 0x808BC814; // type:func
-func_808BC834_jp = 0x808BC834; // type:func
-func_808BC854_jp = 0x808BC854; // type:func
-func_808BC874_jp = 0x808BC874; // type:func
-func_808BC894_jp = 0x808BC894; // type:func
-func_808BC8B4_jp = 0x808BC8B4; // type:func
-func_808BC8D4_jp = 0x808BC8D4; // type:func
-func_808BC8F4_jp = 0x808BC8F4; // type:func
-func_808BC914_jp = 0x808BC914; // type:func
-func_808BC934_jp = 0x808BC934; // type:func
-func_808BC954_jp = 0x808BC954; // type:func
-func_808BC974_jp = 0x808BC974; // type:func
-func_808BC994_jp = 0x808BC994; // type:func
-func_808BC9B4_jp = 0x808BC9B4; // type:func
-func_808BC9D8_jp = 0x808BC9D8; // type:func
-func_808BC9FC_jp = 0x808BC9FC; // type:func
-func_808BCA1C_jp = 0x808BCA1C; // type:func
-func_808BCA3C_jp = 0x808BCA3C; // type:func
-func_808BCA5C_jp = 0x808BCA5C; // type:func
-func_808BCA7C_jp = 0x808BCA7C; // type:func
-func_808BCABC_jp = 0x808BCABC; // type:func
-func_808BCAE0_jp = 0x808BCAE0; // type:func
-func_808BCB00_jp = 0x808BCB00; // type:func
-func_808BCB20_jp = 0x808BCB20; // type:func
-func_808BCB40_jp = 0x808BCB40; // type:func
-func_808BCB60_jp = 0x808BCB60; // type:func
-func_808BCB88_jp = 0x808BCB88; // type:func
-func_808BCBA8_jp = 0x808BCBA8; // type:func
-func_808BCBC8_jp = 0x808BCBC8; // type:func
-func_808BCBE8_jp = 0x808BCBE8; // type:func
-func_808BCC08_jp = 0x808BCC08; // type:func
-func_808BCC28_jp = 0x808BCC28; // type:func
-func_808BCC48_jp = 0x808BCC48; // type:func
-func_808BCCD8_jp = 0x808BCCD8; // type:func
-func_808BCCEC_jp = 0x808BCCEC; // type:func
-func_808BCD0C_jp = 0x808BCD0C; // type:func
-func_808BCD64_jp = 0x808BCD64; // type:func
-func_808BCD84_jp = 0x808BCD84; // type:func
-func_808BCDDC_jp = 0x808BCDDC; // type:func
-func_808BCDEC_jp = 0x808BCDEC; // type:func
-func_808BCE30_jp = 0x808BCE30; // type:func
-func_808BCE50_jp = 0x808BCE50; // type:func
-func_808BCE70_jp = 0x808BCE70; // type:func
-func_808BCE90_jp = 0x808BCE90; // type:func
-func_808BCEB0_jp = 0x808BCEB0; // type:func
-func_808BCED4_jp = 0x808BCED4; // type:func
-func_808BCEF8_jp = 0x808BCEF8; // type:func
-func_808BCF68_jp = 0x808BCF68; // type:func
-func_808BCFE4_jp = 0x808BCFE4; // type:func
-func_808BD0B8_jp = 0x808BD0B8; // type:func
-func_808BD1A8_jp = 0x808BD1A8; // type:func
-func_808BD218_jp = 0x808BD218; // type:func
-func_808BD320_jp = 0x808BD320; // type:func
-func_808BD340_jp = 0x808BD340; // type:func
-func_808BD350_jp = 0x808BD350; // type:func
-func_808BD360_jp = 0x808BD360; // type:func
-func_808BD380_jp = 0x808BD380; // type:func
-func_808BD3D8_jp = 0x808BD3D8; // type:func
+Player_actor_sound_SetStatus = 0x808BC3D0; // type:func
+Player_actor_set_sound_common1 = 0x808BC494; // type:func
+Player_actor_set_sound_common2 = 0x808BC4C4; // type:func
+Player_actor_sound_FootStep1 = 0x808BC4F0; // type:func
+Player_actor_sound_FootStep2 = 0x808BC520; // type:func
+Player_actor_sound_Tumble = 0x808BC584; // type:func
+Player_actor_sound_AMI_FURI = 0x808BC5C0; // type:func
+Player_actor_sound_AMI_HIT = 0x808BC5E8; // type:func
+Player_actor_sound_AMI_GET = 0x808BC610; // type:func
+Player_actor_sound_GASAGOSO = 0x808BC638; // type:func
+Player_actor_sound_AXE_FURI = 0x808BC658; // type:func
+Player_actor_sound_AXE_HIT = 0x808BC678; // type:func
+Player_actor_sound_AXE_CUT = 0x808BC6E0; // type:func
+Player_actor_sound_SIT = 0x808BC748; // type:func
+Player_actor_sound_STANDUP = 0x808BC798; // type:func
+Player_actor_sound_JUMP = 0x808BC7D4; // type:func
+Player_actor_sound_LANDING = 0x808BC7F4; // type:func
+Player_actor_sound_ITEM_GET = 0x808BC814; // type:func
+Player_actor_sound_BED_IN = 0x808BC834; // type:func
+Player_actor_sound_BED_NEGAERI = 0x808BC854; // type:func
+Player_actor_sound_BED_OUT = 0x808BC874; // type:func
+Player_actor_sound_ROD_STROKE = 0x808BC894; // type:func
+Player_actor_sound_ROD_STROKE_small = 0x808BC8B4; // type:func
+Player_actor_sound_ROD_BACK = 0x808BC8D4; // type:func
+Player_actor_sound_scoop1 = 0x808BC8F4; // type:func
+Player_actor_sound_scoop_umeru = 0x808BC914; // type:func
+Player_actor_sound_scoop_hit = 0x808BC934; // type:func
+Player_actor_sound_scoop_shigemi = 0x808BC954; // type:func
+Player_actor_sound_ITEM_HORIDASHI = 0x808BC974; // type:func
+Player_actor_sound_slip = 0x808BC994; // type:func
+Player_actor_sound_tree_touch = 0x808BC9B4; // type:func
+Player_actor_sound_tree_yurasu = 0x808BC9D8; // type:func
+Player_actor_sound_kirikabu_scoop = 0x808BC9FC; // type:func
+Player_actor_sound_kirikabu_out = 0x808BCA1C; // type:func
+Player_actor_sound_coin_gasagoso = 0x808BCA3C; // type:func
+Player_actor_sound_knock = 0x808BCA5C; // type:func
+Player_actor_sound_araiiki = 0x808BCA7C; // type:func
+Player_actor_sound_zassou_nuku = 0x808BCABC; // type:func
+Player_actor_sound_hachi_sasareru = 0x808BCAE0; // type:func
+Player_actor_sound_wear = 0x808BCB00; // type:func
+Player_actor_sound_dai_ue_kakunou = 0x808BCB20; // type:func
+Player_actor_sound_umbrella_rotate = 0x808BCB40; // type:func
+Player_actor_sound_Get_bgm_num_forCompletePayment = 0x808BCB60; // type:func
+Player_actor_sound_camera_move1 = 0x808BCB88; // type:func
+Player_actor_sound_camera_move2 = 0x808BCBA8; // type:func
+Player_actor_sound_karaburi = 0x808BCBC8; // type:func
+Player_actor_sound_scoop_tree_hit = 0x808BCBE8; // type:func
+Player_actor_sound_scoop_item_hit = 0x808BCC08; // type:func
+Player_actor_sound_axe_ball_hit = 0x808BCC28; // type:func
+Player_actor_ct_other_func1 = 0x808BCC48; // type:func
+Player_actor_setup_main_Wade_other_func1 = 0x808BCCD8; // type:func
+Player_actor_setup_main_Wade_snowball_other_func1 = 0x808BCCEC; // type:func
+Player_actor_setup_main_Wade_other_func2 = 0x808BCD0C; // type:func
+Player_actor_setup_main_Wade_snowball_other_func2 = 0x808BCD64; // type:func
+Player_actor_setup_main_Demo_wade_other_func2 = 0x808BCD84; // type:func
+Player_actor_main_Wade_other_func1 = 0x808BCDDC; // type:func
+Player_actor_main_Sitdown_wait_other_func2 = 0x808BCDEC; // type:func
+Player_actor_main_Relax_rod_other_func2 = 0x808BCE30; // type:func
+Player_actor_main_Vib_rod_other_func2 = 0x808BCE50; // type:func
+Player_actor_main_Collect_rod_other_func2 = 0x808BCE70; // type:func
+Player_actor_main_Fly_rod_other_func2 = 0x808BCE90; // type:func
+Player_actor_settle_main_Collect_rod_other_func2 = 0x808BCEB0; // type:func
+Player_actor_settle_main_Fly_rod_other_func2 = 0x808BCED4; // type:func
+Player_actor_set_nextgoto_info_type0 = 0x808BCEF8; // type:func
+Player_actor_set_nextgoto_info_type1 = 0x808BCF68; // type:func
+Player_actor_check_nextgoto = 0x808BCFE4; // type:func
+Player_actor_check_forward = 0x808BD0B8; // type:func
+Player_actor_move_other_func1 = 0x808BD1A8; // type:func
+Player_actor_move_other_func2 = 0x808BD218; // type:func
+Player_actor_draw_other_func2 = 0x808BD320; // type:func
+Player_actor_change_main_index_other_func1 = 0x808BD340; // type:func
+Player_actor_change_main_index_other_func2 = 0x808BD350; // type:func
+Player_actor_settle_main_other_func2 = 0x808BD360; // type:func
+Player_actor_SetActorUki = 0x808BD380; // type:func
+Player_actor_Item_main_other_func1 = 0x808BD3D8; // type:func
 func_808BD3F8_jp = 0x808BD3F8; // type:func
 func_808BD584_jp = 0x808BD584; // type:func
 Player_actor_Get_ItemKind = 0x808BD5C4; // type:func
@@ -3843,11 +3843,11 @@ func_808DD318_jp = 0x808DD318; // type:func
 func_808DD398_jp = 0x808DD398; // type:func
 Player_actor_ct = 0x808DD748; // type:func
 Player_actor_dt = 0x808DD81C; // type:func
-func_808DD874_jp = 0x808DD874; // type:func
-func_808DD8F0_jp = 0x808DD8F0; // type:func
+Player_actor_request_main_change_from_submenu = 0x808DD874; // type:func
+Player_actor_request_change_item = 0x808DD8F0; // type:func
 func_808DD9B4_jp = 0x808DD9B4; // type:func
 func_808DDA18_jp = 0x808DDA18; // type:func
-func_808DDB34_jp = 0x808DDB34; // type:func
+Player_actor_change_proc_index = 0x808DDB34; // type:func
 Player_actor_move = 0x808DDB5C; // type:func
 Player_actor_draw = 0x808DDBD4; // type:func