diff --git a/asm/include/overlay_03_0233CA98.inc b/asm/include/overlay_03_0233CA98.inc index d851ffc8..eedd7d57 100644 --- a/asm/include/overlay_03_0233CA98.inc +++ b/asm/include/overlay_03_0233CA98.inc @@ -194,6 +194,7 @@ .public RandInt .public RollRandomItemReward .public SetQuestionMarks +.public SetWindowTitle .public ShowKeyboard .public StrcpyName .public StringFromId @@ -210,7 +211,6 @@ .public sub_0202836C .public sub_02029F88 .public sub_02029FBC -.public sub_02030A2C .public sub_02037468 .public sub_02037570 .public sub_020376EC diff --git a/asm/include/overlay_11_022EE5E4.inc b/asm/include/overlay_11_022EE5E4.inc index a13620f8..70d44c92 100644 --- a/asm/include/overlay_11_022EE5E4.inc +++ b/asm/include/overlay_11_022EE5E4.inc @@ -785,6 +785,7 @@ .public SetNewFriendActor .public SetParentMenuState7 .public SetSpriteIdForAnimationControl +.public SetWindowTitle .public ShowDialogueBox .public ShowKeyboard .public ShowStringIdInDialogueBox @@ -871,7 +872,6 @@ .public sub_0202F3F8 .public sub_0202F954 .public sub_020307EC -.public sub_02030A2C .public sub_02034840 .public sub_0203559C .public sub_02035CE4 diff --git a/asm/include/overlay_31_023838E4.inc b/asm/include/overlay_31_023838E4.inc index 2942e128..b08f6894 100644 --- a/asm/include/overlay_31_023838E4.inc +++ b/asm/include/overlay_31_023838E4.inc @@ -234,6 +234,7 @@ .public SetAdvancedTextBoxState5 .public SetMonsterActionFields .public SetPreprocessorArgsIdVal +.public SetWindowTitle .public ShowStringInDialogueBox .public SortItemsInBag .public SpecificRecruitCheck @@ -253,7 +254,6 @@ .public sub_0202F474 .public sub_0202F954 .public sub_020307EC -.public sub_02030A2C .public sub_0203F150 .public sub_0203F398 .public sub_0203F990 diff --git a/asm/main_0202A3E4.s b/asm/main_0202A3E4.s index 7d9e6a72..9189010c 100644 --- a/asm/main_0202A3E4.s +++ b/asm/main_0202A3E4.s @@ -7769,14 +7769,14 @@ GetWindowIdPageStart: ; 0x02030A18 ldmia sp!, {r3, pc} arm_func_end GetWindowIdPageStart - arm_func_start sub_02030A2C -sub_02030A2C: ; 0x02030A2C + arm_func_start SetWindowTitle +SetWindowTitle: ; 0x02030A2C stmdb sp!, {r4, lr} mov r4, r1 bl GetWindowContents strh r4, [r0, #0x20] ldmia sp!, {r4, pc} - arm_func_end sub_02030A2C + arm_func_end SetWindowTitle arm_func_start GetAdvancedTextBoxFlags2 GetAdvancedTextBoxFlags2: ; 0x02030A40 diff --git a/asm/overlay_03_0233CA98.s b/asm/overlay_03_0233CA98.s index 3f334662..48ffb97a 100644 --- a/asm/overlay_03_0233CA98.s +++ b/asm/overlay_03_0233CA98.s @@ -9229,7 +9229,7 @@ ov03_02344970: ; 0x02344970 mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, lsr #0x10 - bl sub_02030A2C + bl SetWindowTitle #if defined(EUROPE) add r0, r5, #0x5c add r0, r0, #0x3c00 diff --git a/asm/overlay_11_022EE5E4.s b/asm/overlay_11_022EE5E4.s index e530962e..cb442fdd 100644 --- a/asm/overlay_11_022EE5E4.s +++ b/asm/overlay_11_022EE5E4.s @@ -34084,7 +34084,7 @@ ov11_0230A2D0: ; 0x0230A2D0 mov r1, r4, lsl #3 ldrh r1, [r0, r1] mov r0, r5 - bl sub_02030A2C + bl SetWindowTitle #if defined(EUROPE) add r0, r4, #0xc3 add r0, r0, #0x3f00 diff --git a/asm/overlay_31_023838E4.s b/asm/overlay_31_023838E4.s index ea845a59..71e9ef27 100644 --- a/asm/overlay_31_023838E4.s +++ b/asm/overlay_31_023838E4.s @@ -6911,7 +6911,7 @@ DrawDungeonHintContents: ; 0x023891A8 mov r1, r4, lsl #3 ldrh r1, [r0, r1] mov r0, r5 - bl sub_02030A2C + bl SetWindowTitle #if defined(EUROPE) add r0, r4, #0xb2 add r0, r0, #0x3f00 diff --git a/tools/sync_pmdsky_debug/symbol_details.py b/tools/sync_pmdsky_debug/symbol_details.py index 71f5b3aa..ae8210d5 100644 --- a/tools/sync_pmdsky_debug/symbol_details.py +++ b/tools/sync_pmdsky_debug/symbol_details.py @@ -31,7 +31,13 @@ NONMATCHING_SYMBOLS_ARM9 = { 'CTRDGi_RestoreAccessCycle': 'Ctrdgi_RestoreAccessCycle', 'CTRDGi_SendtoPxi': 'Ctrdgi_SendtoPxi', 'CTRDGi_UnlockByProcessor': 'Ctrdgi_UnlockByProcessor', + 'DGT_Hash2GetDigest': 'Dgt_Hash2GetDigest', + 'DGT_Hash2Reset': 'Dgt_Hash2Reset', + 'DGT_Hash2SetSource': 'Dgt_Hash2SetSource', 'disableBankForX_': 'DisableBankForX', + 'FifoCtrlInit': 'FIFO_CTRL_INIT', + 'fsi_arc_rom': 'FSI_ARC_ROM', + 'fsi_digest_key_len': 'FSI_DIGEST_KEY_LEN', 'FX_AtanIdxTable_': 'FX_ATAN_IDX_TABLE', 'G2x_ChangeBlendBrightness_': 'G2x_ChangeBlendBrightness', 'G2x_SetBlendAlpha_': 'G2x_SetBlendAlpha', @@ -132,7 +138,9 @@ NONMATCHING_SYMBOLS_ARM9 = { 'PXI_SetFifoRecvCallback': 'Pxi_SetFifoRecvCallback', 'PXIi_HandlerRecvFifoNotEmpty': 'Pxii_HandlerRecvFifoNotEmpty', 'resetBankForX_': 'EnableVramBanksInSet', + 'sCallbackTable': 'CALLBACK_TABLE', 'sClrImg': 'CLR_IMG', + 'sDayOfYear': 'DAY_OF_YEAR', 'sDispMode': 'DISP_MODE', 'sIsDispOn': 'IS_DISP_ON', 'SND_CommandInit': 'Snd_CommandInit', @@ -153,14 +161,6 @@ NONMATCHING_SYMBOLS_ARM9 = { 'VEC_DotProduct': 'Vec_DotProduct', 'VEC_Normalize': 'Vec_Normalize', 'VolumeTable': 'VOLUME_TABLE', - 'DGT_Hash2GetDigest': 'Dgt_Hash2GetDigest', - 'DGT_Hash2Reset': 'Dgt_Hash2Reset', - 'DGT_Hash2SetSource': 'Dgt_Hash2SetSource', - 'fsi_digest_key_len': 'FSI_DIGEST_KEY_LEN', - 'sDayOfYear': 'DAY_OF_YEAR', - 'FifoCtrlInit': 'FIFO_CTRL_INIT', - 'fsi_arc_rom': 'FSI_ARC_ROM', - 'sCallbackTable': 'CALLBACK_TABLE', } NONMATCHING_SYMBOLS_ARM7 = {