m_choice_main OK (#191)

* work

* m_choice_main OK

1 files changed, 109 insertions, 109 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index c53d247..d3bc38c 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -502,94 +502,94 @@ func_80064F48_jp = 0x80064F48; // type:func
 func_80064F84_jp = 0x80064F84; // type:func
 Camera2_process = 0x80064FD8; // type:func
 Camera2_draw = 0x80065028; // type:func
-func_80065040_jp = 0x80065040; // type:func
-func_80065064_jp = 0x80065064; // type:func
-func_80065158_jp = 0x80065158; // type:func
-func_80065164_jp = 0x80065164; // type:func
-func_80065170_jp = 0x80065170; // type:func
-func_80065198_jp = 0x80065198; // type:func
-func_800651A4_jp = 0x800651A4; // type:func
-func_80065278_jp = 0x80065278; // type:func
-func_80065348_jp = 0x80065348; // type:func
-func_800653CC_jp = 0x800653CC; // type:func
-func_800653DC_jp = 0x800653DC; // type:func
-func_800654FC_jp = 0x800654FC; // type:func
-func_80065508_jp = 0x80065508; // type:func
-func_80065518_jp = 0x80065518; // type:func
-func_80065528_jp = 0x80065528; // type:func
-func_80065668_jp = 0x80065668; // type:func
-func_8006568C_jp = 0x8006568C; // type:func
-func_800656C8_jp = 0x800656C8; // type:func
-func_80065704_jp = 0x80065704; // type:func
-func_80065728_jp = 0x80065728; // type:func
-func_8006574C_jp = 0x8006574C; // type:func
-func_80065770_jp = 0x80065770; // type:func
-func_80065794_jp = 0x80065794; // type:func
-func_800657B8_jp = 0x800657B8; // type:func
-func_800657DC_jp = 0x800657DC; // type:func
-func_80065800_jp = 0x80065800; // type:func
-func_8006584C_jp = 0x8006584C; // type:func
-func_8006586C_jp = 0x8006586C; // type:func
-func_80065890_jp = 0x80065890; // type:func
-func_800658B4_jp = 0x800658B4; // type:func
-func_800658D8_jp = 0x800658D8; // type:func
-func_800658FC_jp = 0x800658FC; // type:func
-func_80065920_jp = 0x80065920; // type:func
-func_80065944_jp = 0x80065944; // type:func
-func_80065968_jp = 0x80065968; // type:func
-func_8006598C_jp = 0x8006598C; // type:func
-func_800659B0_jp = 0x800659B0; // type:func
-func_800659D4_jp = 0x800659D4; // type:func
-func_800659F8_jp = 0x800659F8; // type:func
-func_80065A1C_jp = 0x80065A1C; // type:func
-func_80065A40_jp = 0x80065A40; // type:func
-func_80065A64_jp = 0x80065A64; // type:func
-func_80065A88_jp = 0x80065A88; // type:func
-func_80065AAC_jp = 0x80065AAC; // type:func
-func_80065AD0_jp = 0x80065AD0; // type:func
-func_80065AF4_jp = 0x80065AF4; // type:func
-func_80065B18_jp = 0x80065B18; // type:func
-func_80065B5C_jp = 0x80065B5C; // type:func
-func_80065B80_jp = 0x80065B80; // type:func
-func_80065BA4_jp = 0x80065BA4; // type:func
-func_80065BF0_jp = 0x80065BF0; // type:func
-func_80065C10_jp = 0x80065C10; // type:func
-func_80065C34_jp = 0x80065C34; // type:func
-func_80065C58_jp = 0x80065C58; // type:func
-func_80065C7C_jp = 0x80065C7C; // type:func
-func_80065CA0_jp = 0x80065CA0; // type:func
-func_80065CF8_jp = 0x80065CF8; // type:func
-func_80065D90_jp = 0x80065D90; // type:func
-func_80065EE8_jp = 0x80065EE8; // type:func
-func_80065EF8_jp = 0x80065EF8; // type:func
-func_80065F18_jp = 0x80065F18; // type:func
-func_80065F38_jp = 0x80065F38; // type:func
-func_80065F58_jp = 0x80065F58; // type:func
-func_80065F78_jp = 0x80065F78; // type:func
-func_80065F98_jp = 0x80065F98; // type:func
-func_80066068_jp = 0x80066068; // type:func
-func_80066094_jp = 0x80066094; // type:func
-func_800660DC_jp = 0x800660DC; // type:func
-func_80066130_jp = 0x80066130; // type:func
-func_80066194_jp = 0x80066194; // type:func
-func_800665C0_jp = 0x800665C0; // type:func
-func_800665EC_jp = 0x800665EC; // type:func
-func_80066634_jp = 0x80066634; // type:func
-func_8006666C_jp = 0x8006666C; // type:func
-func_80066740_jp = 0x80066740; // type:func
-func_8006676C_jp = 0x8006676C; // type:func
-func_800667B4_jp = 0x800667B4; // type:func
-func_8006680C_jp = 0x8006680C; // type:func
-func_8006685C_jp = 0x8006685C; // type:func
-func_800668A4_jp = 0x800668A4; // type:func
-func_800669A4_jp = 0x800669A4; // type:func
-func_80066A60_jp = 0x80066A60; // type:func
-func_80066A80_jp = 0x80066A80; // type:func
-func_80066B18_jp = 0x80066B18; // type:func
-func_80066BB0_jp = 0x80066BB0; // type:func
-func_80066D4C_jp = 0x80066D4C; // type:func
-func_80066DFC_jp = 0x80066DFC; // type:func
-func_80066E34_jp = 0x80066E34; // type:func
+mChoice_Get_base_window_p = 0x80065040; // type:func
+mChoice_init = 0x80065064; // type:func
+ mChoice_Change_request_main_index	= 0x80065158; // type:func
+ mChoice_check_main_index	= 0x80065164; // type:func
+ mChoice_check_main_normal	= 0x80065170; // type:func
+ mChoice_Init_choice_data	= 0x80065198; // type:func
+ mChoice_Add_choice_data	= 0x800651A4; // type:func
+ mChoice_Set_choice_data	= 0x80065278; // type:func
+ mChoice_Get_MaxStringDotWidth	= 0x80065348; // type:func
+ mChoice_Get_MaxStringDotHeight	= 0x800653CC; // type:func
+ mChoice_Set_DisplayScaleAndDisplayPos	= 0x800653DC; // type:func
+ mChoice_Get_ChoseNum	= 0x800654FC; // type:func
+ mChoice_Clear_ChoseNum	= 0x80065508; // type:func
+ mChoice_check_ct	= 0x80065518; // type:func
+ mChoice_Get_StringDataAddressAndSize	= 0x80065528; // type:func
+ mChoice_Put_String_PLAYER_NAME	= 0x80065668; // type:func
+ mChoice_Put_String_TALK_NAME	= 0x8006568C; // type:func
+ mChoice_Put_String_TAIL	= 0x800656C8; // type:func
+ mChoice_Put_String_YEAR	= 0x80065704; // type:func
+ mChoice_Put_String_MONTH	= 0x80065728; // type:func
+ mChoice_Put_String_WEEK	= 0x8006574C; // type:func
+ mChoice_Put_String_DAY	= 0x80065770; // type:func
+ mChoice_Put_String_HOUR	= 0x80065794; // type:func
+ mChoice_Put_String_MIN	= 0x800657B8; // type:func
+ mChoice_Put_String_SEC	= 0x800657DC; // type:func
+ mChoice_Put_String_FREE	= 0x80065800; // type:func
+ mChoice_Put_String_FREE0	= 0x8006584C; // type:func
+ mChoice_Put_String_FREE1	= 0x8006586C; // type:func
+ mChoice_Put_String_FREE2	= 0x80065890; // type:func
+ mChoice_Put_String_FREE3	= 0x800658B4; // type:func
+ mChoice_Put_String_FREE4	= 0x800658D8; // type:func
+ mChoice_Put_String_FREE5	= 0x800658FC; // type:func
+ mChoice_Put_String_FREE6	= 0x80065920; // type:func
+ mChoice_Put_String_FREE7	= 0x80065944; // type:func
+ mChoice_Put_String_FREE8	= 0x80065968; // type:func
+ mChoice_Put_String_FREE9	= 0x8006598C; // type:func
+ mChoice_Put_String_FREE10	= 0x800659B0; // type:func
+ mChoice_Put_String_FREE11	= 0x800659D4; // type:func
+ mChoice_Put_String_FREE12	= 0x800659F8; // type:func
+ mChoice_Put_String_FREE13	= 0x80065A1C; // type:func
+ mChoice_Put_String_FREE14	= 0x80065A40; // type:func
+ mChoice_Put_String_FREE15	= 0x80065A64; // type:func
+ mChoice_Put_String_FREE16	= 0x80065A88; // type:func
+ mChoice_Put_String_FREE17	= 0x80065AAC; // type:func
+ mChoice_Put_String_FREE18	= 0x80065AD0; // type:func
+ mChoice_Put_String_FREE19	= 0x80065AF4; // type:func
+ mChoice_Put_String_DETERMINATION	= 0x80065B18; // type:func
+ mChoice_Put_String_COUNTRY_NAME	= 0x80065B5C; // type:func
+ mChoice_Put_String_RAMDOM_NUMBER2	= 0x80065B80; // type:func
+ mChoice_Put_String_ITEM	= 0x80065BA4; // type:func
+ mChoice_Put_String_ITEM0	= 0x80065BF0; // type:func
+ mChoice_Put_String_ITEM1	= 0x80065C10; // type:func
+ mChoice_Put_String_ITEM2	= 0x80065C34; // type:func
+ mChoice_Put_String_ITEM3	= 0x80065C58; // type:func
+ mChoice_Put_String_ITEM4	= 0x80065C7C; // type:func
+ mChoice_Put_String	= 0x80065CA0; // type:func
+ mChoice_Change_ControlCode	= 0x80065CF8; // type:func
+ mChoice_Load_ChoseStringFromRom	= 0x80065D90; // type:func
+ mChoice_no_b_set	= 0x80065EE8; // type:func
+ mChoice_sound_SENTAKU_KETTEI	= 0x80065EF8; // type:func
+ mChoice_sound_SENTAKU_OPEN	= 0x80065F18; // type:func
+ mChoice_sound_CURSOL	= 0x80065F38; // type:func
+ mChoice_Main_Hide	= 0x80065F58; // type:func
+ mChoice_MainSetup_Hide	= 0x80065F78; // type:func
+ mChoice_Main_Appear_SetScale	= 0x80065F98; // type:func
+ mChoice_request_main_index_fromAppear	= 0x80066068; // type:func
+ mChoice_Main_Appear	= 0x80066094; // type:func
+ mChoice_MainSetup_Appear	= 0x800660DC; // type:func
+ mChoice_determimation_set	= 0x80066130; // type:func
+ mChoice_Main_Normal_SetChoice	= 0x80066194; // type:func
+ mChoice_request_main_index_fromNormal	= 0x800665C0; // type:func
+ mChoice_Main_Normal	= 0x800665EC; // type:func
+ mChoice_MainSetup_Normal	= 0x80066634; // type:func
+ mChoice_Main_Disappear_SetScale	= 0x8006666C; // type:func
+ mChoice_request_main_index_fromDisappear	= 0x80066740; // type:func
+ mChoice_Main_Disappear	= 0x8006676C; // type:func
+ mChoice_MainSetup_Disappear	= 0x800667B4; // type:func
+ mChoice_MainSetup	= 0x8006680C; // type:func
+ mChoice_Main	= 0x8006685C; // type:func
+ mChoice_SetMatrix	= 0x800668A4; // type:func
+ mChoice_SetMatrixDisplay	= 0x800669A4; // type:func
+ mChoice_UnSetMatrix	= 0x80066A60; // type:func
+ mChoice_UnSetMatrixDisplay	= 0x80066A80; // type:func
+ mChoice_DrawWindowBody	= 0x80066B18; // type:func
+ mChoice_DrawFont	= 0x80066BB0; // type:func
+ mChoice_Draw	= 0x80066D4C; // type:func
+ mChoice_ct	= 0x80066DFC; // type:func
+ mChoice_dt	= 0x80066E34; // type:func
 clip_clear = 0x80066E50; // type:func
 mCkRh_GokiFamilyCount2Good = 0x80066E90; // type:func
 mCkRh_InitGokiSaveData_1Room = 0x80066EB8; // type:func
@@ -1531,7 +1531,7 @@ func_80090140_jp = 0x80090140; // type:func
 func_80090178_jp = 0x80090178; // type:func
 func_80090188_jp = 0x80090188; // type:func
 func_8009028C_jp = 0x8009028C; // type:func
-func_800902CC_jp = 0x800902CC; // type:func
+mFont_GetStringWidth = 0x800902CC; // type:func
 func_8009034C_jp = 0x8009034C; // type:func
 func_800903A8_jp = 0x800903A8; // type:func
 func_800903CC_jp = 0x800903CC; // type:func
@@ -1582,7 +1582,7 @@ func_80091F98_jp = 0x80091F98; // type:func
 func_80091FCC_jp = 0x80091FCC; // type:func
 func_80092000_jp = 0x80092000; // type:func
 func_80092034_jp = 0x80092034; // type:func
-func_800921D0_jp = 0x800921D0; // type:func
+mFont_SetMarkChar = 0x800921D0; // type:func
 func_80092440_jp = 0x80092440; // type:func
 func_80092468_jp = 0x80092468; // type:func
 func_800924CC_jp = 0x800924CC; // type:func
@@ -1988,22 +1988,22 @@ func_8009EA18_jp = 0x8009EA18; // type:func
 func_8009EA2C_jp = 0x8009EA2C; // type:func
 func_8009EB44_jp = 0x8009EB44; // type:func
 func_8009EBB0_jp = 0x8009EBB0; // type:func
-func_8009EC88_jp = 0x8009EC88; // type:func
-func_8009ED14_jp = 0x8009ED14; // type:func
-func_8009EDBC_jp = 0x8009EDBC; // type:func
-func_8009EE78_jp = 0x8009EE78; // type:func
-func_8009EF00_jp = 0x8009EF00; // type:func
-func_8009EF88_jp = 0x8009EF88; // type:func
-func_8009F010_jp = 0x8009F010; // type:func
-func_8009F098_jp = 0x8009F098; // type:func
-func_8009F120_jp = 0x8009F120; // type:func
-func_8009F1A8_jp = 0x8009F1A8; // type:func
-func_8009F230_jp = 0x8009F230; // type:func
+mMsg_CopyPlayerName = 0x8009EC88; // type:func
+mMsg_CopyTalkName = 0x8009ED14; // type:func
+mMsg_CopyTail = 0x8009EDBC; // type:func
+mMsg_CopyYear = 0x8009EE78; // type:func
+mMsg_CopyMonth = 0x8009EF00; // type:func
+mMsg_CopyWeek = 0x8009EF88; // type:func
+mMsg_CopyDay = 0x8009F010; // type:func
+mMsg_CopyHour = 0x8009F098; // type:func
+mMsg_CopyMin = 0x8009F120; // type:func
+mMsg_CopySec = 0x8009F1A8; // type:func
+mMsg_CopyFree = 0x8009F230; // type:func
 func_8009F2EC_jp = 0x8009F2EC; // type:func
-func_8009F3A8_jp = 0x8009F3A8; // type:func
-func_8009F428_jp = 0x8009F428; // type:func
-func_8009F50C_jp = 0x8009F50C; // type:func
-func_8009F5B4_jp = 0x8009F5B4; // type:func
+mMsg_CopyDetermination = 0x8009F3A8; // type:func
+mMsg_CopyCountryName = 0x8009F428; // type:func
+mMsg_CopyRamdomNumber2 = 0x8009F50C; // type:func
+mMsg_CopyItem = 0x8009F5B4; // type:func
 func_8009F670_jp = 0x8009F670; // type:func
 func_8009F730_jp = 0x8009F730; // type:func
 func_8009F75C_jp = 0x8009F75C; // type:func
@@ -4229,10 +4229,10 @@ D_80102A48_jp = 0x80102A48; //
 D_80102A80_jp = 0x80102A80; //
 D_80102C04_jp = 0x80102C04; //
 D_80102C14_jp = 0x80102C14; //
-D_80102C28_jp = 0x80102C28; //
-D_80102C68_jp = 0x80102C68; //
-D_80103C68_jp = 0x80103C68; //
-D_80103CE0_jp = 0x80103CE0; //
+con_sentaku2_v = 0x80102C28; //
+con_waku_swaku3_tex = 0x80102C68; //
+con_sentaku2_modelT = 0x80103C68; //
+mChoice_init_disp = 0x80103CE0; //
 CanLookGokiCount = 0x80103D50; // type:s32
 D_80103D55_jp = 0x80103D55; // type:u8
 D_80103D59_jp = 0x80103D59; // type:u8