m_demo OK (#221)

* m_demo OK

* camera fix

1 files changed, 90 insertions, 90 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index c7b45d0..a416f05 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -317,8 +317,8 @@ func_8005E83C_jp = 0x8005E83C; // type:func
 func_8005E8F4_jp = 0x8005E8F4; // type:func
 func_8005E9B4_jp = 0x8005E9B4; // type:func
 func_8005E9C8_jp = 0x8005E9C8; // type:func
-func_8005E9DC_jp = 0x8005E9DC; // type:func
-func_8005E9F0_jp = 0x8005E9F0; // type:func
+mBGMPsComp_volume_talk_start = 0x8005E9DC; // type:func
+mBGMPsComp_volume_talk_end = 0x8005E9F0; // type:func
 func_8005EA14_jp = 0x8005EA14; // type:func
 func_8005EA24_jp = 0x8005EA24; // type:func
 func_8005EA38_jp = 0x8005EA38; // type:func
@@ -337,7 +337,7 @@ func_8005ED44_jp = 0x8005ED44; // type:func
 func_8005ED78_jp = 0x8005ED78; // type:func
 func_8005ED98_jp = 0x8005ED98; // type:func
 func_8005EDC4_jp = 0x8005EDC4; // type:func
-func_8005EDD8_jp = 0x8005EDD8; // type:func
+mBGMForce_inform_end = 0x8005EDD8; // type:func
 func_8005EDEC_jp = 0x8005EDEC; // type:func
 mBGMForce_room_nonstop_start = 0x8005EE00; // type:func
 func_8005EE20_jp = 0x8005EE20; // type:func
@@ -400,7 +400,7 @@ func_8006109C_jp = 0x8006109C; // type:func
 func_80061104_jp = 0x80061104; // type:func
 func_80061134_jp = 0x80061134; // type:func
 func_80061188_jp = 0x80061188; // type:func
-func_800611D4_jp = 0x800611D4; // type:func
+Camera2_request_main_talk = 0x800611D4; // type:func
 func_80061280_jp = 0x80061280; // type:func
 func_8006136C_jp = 0x8006136C; // type:func
 func_800613DC_jp = 0x800613DC; // type:func
@@ -435,7 +435,7 @@ func_8006295C_jp = 0x8006295C; // type:func
 func_80062B24_jp = 0x80062B24; // type:func
 func_80062B74_jp = 0x80062B74; // type:func
 func_80062BA0_jp = 0x80062BA0; // type:func
-func_80062C84_jp = 0x80062C84; // type:func
+Camera2_request_main_item = 0x80062C84; // type:func
 func_80062CD8_jp = 0x80062CD8; // type:func
 func_80062DD8_jp = 0x80062DD8; // type:func
 func_80062E00_jp = 0x80062E00; // type:func
@@ -451,7 +451,7 @@ func_80063170_jp = 0x80063170; // type:func
 func_800631C0_jp = 0x800631C0; // type:func
 func_800631EC_jp = 0x800631EC; // type:func
 func_8006328C_jp = 0x8006328C; // type:func
-func_800632C8_jp = 0x800632C8; // type:func
+Camera2_request_main_door = 0x800632C8; // type:func
 func_8006333C_jp = 0x8006333C; // type:func
 func_8006339C_jp = 0x8006339C; // type:func
 func_80063468_jp = 0x80063468; // type:func
@@ -460,18 +460,18 @@ func_800635B8_jp = 0x800635B8; // type:func
 func_80063608_jp = 0x80063608; // type:func
 func_80063628_jp = 0x80063628; // type:func
 func_80063674_jp = 0x80063674; // type:func
-func_8006370C_jp = 0x8006370C; // type:func
+Camera2_request_main_simple_kirin = 0x8006370C; // type:func
 func_800637C8_jp = 0x800637C8; // type:func
 func_8006393C_jp = 0x8006393C; // type:func
-func_800639A0_jp = 0x800639A0; // type:func
+Camera2_request_main_simple = 0x800639A0; // type:func
 func_80063A34_jp = 0x80063A34; // type:func
-func_80063AA0_jp = 0x80063AA0; // type:func
+Camera2_main_Simple_AngleDistStd = 0x80063AA0; // type:func
 func_80063B1C_jp = 0x80063B1C; // type:func
 func_80063B8C_jp = 0x80063B8C; // type:func
 func_80063CA0_jp = 0x80063CA0; // type:func
 func_80063D10_jp = 0x80063D10; // type:func
 func_80063D38_jp = 0x80063D38; // type:func
-func_80063D9C_jp = 0x80063D9C; // type:func
+Camera2_request_main_listen_front_low_talk = 0x80063D9C; // type:func
 func_80063E14_jp = 0x80063E14; // type:func
 func_80063E94_jp = 0x80063E94; // type:func
 func_80063EF0_jp = 0x80063EF0; // type:func
@@ -983,78 +983,78 @@ Debug_mode_output_sub = 0x8007AC1C; // type:func
 Debug_mode_zelda_malloc_info_output = 0x8007ADF8; // type:func
 Debug_mode_output = 0x8007AED8; // type:func
 mDemo_Get_talk_actor = 0x8007B410; // type:func
-func_8007B44C_jp = 0x8007B44C; // type:func
-func_8007B49C_jp = 0x8007B49C; // type:func
-func_8007B4EC_jp = 0x8007B4EC; // type:func
+mDemo_Set_OrderValue = 0x8007B44C; // type:func
+mDemo_Get_OrderValue = 0x8007B49C; // type:func
+mDemo_Init_OrderValue = 0x8007B4EC; // type:func
 mDemo_Set_msg_num = 0x8007B5C0; // type:func
-func_8007B5F4_jp = 0x8007B5F4; // type:func
-func_8007B650_jp = 0x8007B650; // type:func
-func_8007B670_jp = 0x8007B670; // type:func
-func_8007B684_jp = 0x8007B684; // type:func
-func_8007B6A4_jp = 0x8007B6A4; // type:func
-func_8007B724_jp = 0x8007B724; // type:func
-func_8007B760_jp = 0x8007B760; // type:func
+mDemo_Get_Talk_Actors = 0x8007B5F4; // type:func
+mDemo_Set_change_player_destiny = 0x8007B650; // type:func
+mDemo_Get_change_player_destiny = 0x8007B670; // type:func
+mDemo_Clear_change_player_destiny = 0x8007B684; // type:func
+mDemo_Copy_change_player_destiny = 0x8007B6A4; // type:func
+mDemo_Set_use_zoom_sound = 0x8007B724; // type:func
+mDemo_Get_use_zoom_sound = 0x8007B760; // type:func
 mDemo_Set_talk_display_name = 0x8007B79C; // type:func
-func_8007B7DC_jp = 0x8007B7DC; // type:func
-func_8007B818_jp = 0x8007B818; // type:func
-func_8007B854_jp = 0x8007B854; // type:func
-func_8007B890_jp = 0x8007B890; // type:func
-func_8007B8CC_jp = 0x8007B8CC; // type:func
-func_8007B908_jp = 0x8007B908; // type:func
-func_8007B944_jp = 0x8007B944; // type:func
+mDemo_Get_talk_display_name = 0x8007B7DC; // type:func
+mDemo_Set_talk_change_player = 0x8007B818; // type:func
+mDemo_Get_talk_change_player = 0x8007B854; // type:func
+mDemo_Set_talk_return_demo_wait = 0x8007B890; // type:func
+mDemo_Get_talk_return_demo_wait = 0x8007B8CC; // type:func
+mDemo_Set_talk_turn = 0x8007B908; // type:func
+mDemo_Get_talk_turn = 0x8007B944; // type:func
 mDemo_Set_talk_window_color = 0x8007B980; // type:func
-func_8007B9E0_jp = 0x8007B9E0; // type:func
+mDemo_Get_talk_window_color_p = 0x8007B9E0; // type:func
 mDemo_Set_camera = 0x8007BA1C; // type:func
-func_8007BA38_jp = 0x8007BA38; // type:func
-func_8007BA4C_jp = 0x8007BA4C; // type:func
-func_8007BA84_jp = 0x8007BA84; // type:func
-func_8007BC28_jp = 0x8007BC28; // type:func
-func_8007BCE4_jp = 0x8007BCE4; // type:func
-func_8007BD9C_jp = 0x8007BD9C; // type:func
-func_8007BE58_jp = 0x8007BE58; // type:func
-func_8007C00C_jp = 0x8007C00C; // type:func
-func_8007C0B4_jp = 0x8007C0B4; // type:func
-func_8007C0C0_jp = 0x8007C0C0; // type:func
-func_8007C104_jp = 0x8007C104; // type:func
-func_8007C24C_jp = 0x8007C24C; // type:func
-func_8007C290_jp = 0x8007C290; // type:func
-func_8007C3D8_jp = 0x8007C3D8; // type:func
-func_8007C484_jp = 0x8007C484; // type:func
-func_8007C570_jp = 0x8007C570; // type:func
-func_8007C5EC_jp = 0x8007C5EC; // type:func
+mDemo_Get_camera = 0x8007BA38; // type:func
+mDemo_CheckDemoType = 0x8007BA4C; // type:func
+change_camera = 0x8007BA84; // type:func
+set_speak_default = 0x8007BC28; // type:func
+set_report_default = 0x8007BCE4; // type:func
+set_talk_default = 0x8007BD9C; // type:func
+wait_talk_start = 0x8007BE58; // type:func
+wait_talk_end = 0x8007C00C; // type:func
+wait_scroll_start = 0x8007C0B4; // type:func
+set_door_default = 0x8007C0C0; // type:func
+wait_door_start = 0x8007C104; // type:func
+mDemo_Set_house_info = 0x8007C24C; // type:func
+wait_door2_start = 0x8007C290; // type:func
+get_title_no_for_event = 0x8007C3D8; // type:func
+set_emsg_default = 0x8007C484; // type:func
+wait_emsg_start = 0x8007C570; // type:func
+wait_emsg_end = 0x8007C5EC; // type:func
 weight_of_talk_position = 0x8007C6C0; // type:func
-func_8007C808_jp = 0x8007C808; // type:func
-func_8007C814_jp = 0x8007C814; // type:func
-func_8007C820_jp = 0x8007C820; // type:func
-func_8007C844_jp = 0x8007C844; // type:func
-func_8007C868_jp = 0x8007C868; // type:func
-func_8007C88C_jp = 0x8007C88C; // type:func
-func_8007C8B0_jp = 0x8007C8B0; // type:func
-func_8007C8D4_jp = 0x8007C8D4; // type:func
-func_8007C8FC_jp = 0x8007C8FC; // type:func
-func_8007C924_jp = 0x8007C924; // type:func
-func_8007CB28_jp = 0x8007CB28; // type:func
-func_8007CB50_jp = 0x8007CB50; // type:func
-func_8007CBEC_jp = 0x8007CBEC; // type:func
-func_8007CC9C_jp = 0x8007CC9C; // type:func
+allways_true = 0x8007C808; // type:func
+allways_false = 0x8007C814; // type:func
+scroll_check = 0x8007C820; // type:func
+scroll2_check = 0x8007C844; // type:func
+scroll3_check = 0x8007C868; // type:func
+door_check = 0x8007C88C; // type:func
+outdoor_check = 0x8007C8B0; // type:func
+talk_check = 0x8007C8D4; // type:func
+speak_check = 0x8007C8FC; // type:func
+choice_demo = 0x8007C924; // type:func
+emsg_set = 0x8007CB28; // type:func
+init_demo = 0x8007CB50; // type:func
+run_demo = 0x8007CBEC; // type:func
+main_proc = 0x8007CC9C; // type:func
 mDemo_stock_clear = 0x8007CDB8; // type:func
 mDemo_Request = 0x8007CDD8; // type:func
 mDemo_Check = 0x8007CF00; // type:func
-func_8007CF34_jp = 0x8007CF34; // type:func
-func_8007CF44_jp = 0x8007CF44; // type:func
+mDemo_Start = 0x8007CF34; // type:func
+mDemo_Check_and_Go = 0x8007CF44; // type:func
 mDemo_End = 0x8007CF84; // type:func
 mDemo_Main = 0x8007CFB4; // type:func
-func_8007CFD8_jp = 0x8007CFD8; // type:func
-func_8007D030_jp = 0x8007D030; // type:func
-func_8007D048_jp = 0x8007D048; // type:func
-func_8007D080_jp = 0x8007D080; // type:func
+mDemo_Init = 0x8007CFD8; // type:func
+mDemo_CheckDemo = 0x8007D030; // type:func
+mDemo_CheckDemo4Event = 0x8007D048; // type:func
+mDemo_Set_SpeakerAble = 0x8007D080; // type:func
 mDemo_Set_ListenAble = 0x8007D098; // type:func
-func_8007D0B0_jp = 0x8007D0B0; // type:func
-func_8007D0C4_jp = 0x8007D0C4; // type:func
-func_8007D0D8_jp = 0x8007D0D8; // type:func
+mDemo_Unset_SpeakerAble = 0x8007D0B0; // type:func
+mDemo_Unset_ListenAble = 0x8007D0C4; // type:func
+mDemo_Check_SpeakerAble = 0x8007D0D8; // type:func
 mDemo_Check_ListenAble = 0x8007D0EC; // type:func
 mDemo_Check_DiffAngle_forTalk = 0x8007D100; // type:func
-func_8007D128_jp = 0x8007D128; // type:func
+mDemo_KeepCamera = 0x8007D128; // type:func
 func_8007D140_jp = 0x8007D140; // type:func
 func_8007D180_jp = 0x8007D180; // type:func
 mEv_ClearEventSaveInfo = 0x8007D1A8; // type:func
@@ -1904,13 +1904,13 @@ func_8009D1A8_jp = 0x8009D1A8; // type:func
 mMsg_Get_base_window_p = 0x8009D1F0; // type:func
 func_8009D200_jp = 0x8009D200; // type:func
 func_8009D210_jp = 0x8009D210; // type:func
-func_8009D260_jp = 0x8009D260; // type:func
+mMsg_Check_main_index = 0x8009D260; // type:func
 func_8009D274_jp = 0x8009D274; // type:func
 mMsg_Check_not_series_main_wait = 0x8009D294; // type:func
 mMsg_Check_main_hide = 0x8009D2E8; // type:func
 func_8009D308_jp = 0x8009D308; // type:func
 func_8009D3B4_jp = 0x8009D3B4; // type:func
-func_8009D3E4_jp = 0x8009D3E4; // type:func
+mMsg_request_main_appear = 0x8009D3E4; // type:func
 func_8009D458_jp = 0x8009D458; // type:func
 func_8009D4A0_jp = 0x8009D4A0; // type:func
 func_8009D4F0_jp = 0x8009D4F0; // type:func
@@ -2557,7 +2557,7 @@ func_800B2170_jp = 0x800B2170; // type:func
 func_800B21A0_jp = 0x800B21A0; // type:func
 func_800B21D0_jp = 0x800B21D0; // type:func
 func_800B21E0_jp = 0x800B21E0; // type:func
-func_800B21F0_jp = 0x800B21F0; // type:func
+mPlib_Check_able_force_speak_label = 0x800B21F0; // type:func
 func_800B2244_jp = 0x800B2244; // type:func
 func_800B2284_jp = 0x800B2284; // type:func
 func_800B22A4_jp = 0x800B22A4; // type:func
@@ -2567,8 +2567,8 @@ func_800B2350_jp = 0x800B2350; // type:func
 mPlib_request_main_invade_type1 = 0x800B23A4; // type:func
 mPlib_request_main_refuse_type1 = 0x800B23DC; // type:func
 mPlib_request_main_wait_type3 = 0x800B2414; // type:func
-func_800B2450_jp = 0x800B2450; // type:func
-func_800B24A0_jp = 0x800B24A0; // type:func
+mPlib_request_main_talk_end_type1 = 0x800B2450; // type:func
+mPlib_request_main_talk_type1 = 0x800B24A0; // type:func
 func_800B24F8_jp = 0x800B24F8; // type:func
 func_800B255C_jp = 0x800B255C; // type:func
 func_800B25F4_jp = 0x800B25F4; // type:func
@@ -2576,8 +2576,8 @@ func_800B2698_jp = 0x800B2698; // type:func
 func_800B26E8_jp = 0x800B26E8; // type:func
 func_800B2720_jp = 0x800B2720; // type:func
 func_800B2778_jp = 0x800B2778; // type:func
-func_800B27B0_jp = 0x800B27B0; // type:func
-func_800B2814_jp = 0x800B2814; // type:func
+mPlib_request_main_door_type1 = 0x800B27B0; // type:func
+mPlib_request_main_door_type2 = 0x800B2814; // type:func
 func_800B286C_jp = 0x800B286C; // type:func
 func_800B28B0_jp = 0x800B28B0; // type:func
 func_800B2908_jp = 0x800B2908; // type:func
@@ -2594,18 +2594,18 @@ func_800B2C80_jp = 0x800B2C80; // type:func
 func_800B2CD8_jp = 0x800B2CD8; // type:func
 func_800B2D18_jp = 0x800B2D18; // type:func
 func_800B2D74_jp = 0x800B2D74; // type:func
-func_800B2DAC_jp = 0x800B2DAC; // type:func
-func_800B2EBC_jp = 0x800B2EBC; // type:func
-func_800B2F1C_jp = 0x800B2F1C; // type:func
-func_800B2F7C_jp = 0x800B2F7C; // type:func
-func_800B2FDC_jp = 0x800B2FDC; // type:func
-func_800B30A4_jp = 0x800B30A4; // type:func
+mPlib_check_request_main_talk_type1_priority = 0x800B2DAC; // type:func
+mPlib_check_request_main_speak_type1_priority = 0x800B2EBC; // type:func
+mPlib_check_request_main_demo_geton_boat_wade_priority = 0x800B2F1C; // type:func
+mPlib_check_request_main_door_type1_priority = 0x800B2F7C; // type:func
+mPlib_check_request_main_wade_priority = 0x800B2FDC; // type:func
+mPlib_check_request_main_demo_wade_priority = 0x800B30A4; // type:func
 func_800B3104_jp = 0x800B3104; // type:func
 func_800B314C_jp = 0x800B314C; // type:func
 func_800B31B4_jp = 0x800B31B4; // type:func
 func_800B321C_jp = 0x800B321C; // type:func
-func_800B3284_jp = 0x800B3284; // type:func
-func_800B32EC_jp = 0x800B32EC; // type:func
+mPlib_strength_request_main_door_priority = 0x800B3284; // type:func
+mPlib_check_request_main_outdoor_priority = 0x800B32EC; // type:func
 func_800B32FC_jp = 0x800B32FC; // type:func
 func_800B3330_jp = 0x800B3330; // type:func
 func_800B33AC_jp = 0x800B33AC; // type:func
@@ -4391,15 +4391,15 @@ D_80104A0C_jp = 0x80104A0C; //
 D_80104A10_jp = 0x80104A10; //
 D_80104A14_jp = 0x80104A14; //
 D_80104A18_jp = 0x80104A18; //
-D_FLT_80104A20_jp = 0x80104A20; // type:f32
-D_80104A60_jp = 0x80104A60; // type:s16
-D_80104A70_jp = 0x80104A70; //
+direct_vector = 0x80104A20; // type:f32
+direct_back_angle = 0x80104A60; // type:s16
+demo = 0x80104A70; //
 D_80104A74_jp = 0x80104A74; //
 D_80104A90_jp = 0x80104A90; //
 D_80104AAC_jp = 0x80104AAC; //
 D_80104AE4_jp = 0x80104AE4; //
-D_80104AE8_jp = 0x80104AE8; //
-D_80104B20_jp = 0x80104B20; //
+wait_start = 0x80104AE8; //
+wait_end = 0x80104B20; //
 D_80104B60_jp = 0x80104B60; //
 D_80104F2C_jp = 0x80104F2C; //
 D_80104F90_jp = 0x80104F90; //
@@ -6009,7 +6009,7 @@ debug_display = 0x80138E60; //
 B_80138E70_jp = 0x80138E70; // type:s8
 B_80138E73_jp = 0x80138E73; //
 B_80139C30_jp = 0x80139C30; //
-B_80139C40_jp = 0x80139C40; //
+demo_data = 0x80139C40; //
 B_80139F70_jp = 0x80139F70; //
 B_80139F98_jp = 0x80139F98; //
 B_8013A098_jp = 0x8013A098; // type:u8