diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 49461966..76b6a988 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -3605,7 +3605,7 @@ 0202AA24 0000002C .text CreateParentMenuWrapper (main_0200C4CC.o) 0202AA50 000001F8 .text CreateParentMenuInternal (main_0200C4CC.o) 0202AC40 00000000 .text $d (main_0200C4CC.o) - 0202AC48 00000038 .text sub_0202A954 (main_0200C4CC.o) + 0202AC48 00000038 .text ResumeParentMenu (main_0200C4CC.o) 0202AC48 00000000 .text $a (main_0200C4CC.o) 0202AC80 0000011C .text sub_0202A98C (main_0200C4CC.o) 0202AD9C 00000014 .text SetParentMenuState7 (main_0200C4CC.o) @@ -3629,7 +3629,7 @@ 0202B578 0000020C .text CreateSimpleMenuInternal (main_0200C4CC.o) 0202B77C 00000000 .text $d (main_0200C4CC.o) 0202B784 00000000 .text $a (main_0200C4CC.o) - 0202B784 00000034 .text sub_0202B490 (main_0200C4CC.o) + 0202B784 00000034 .text ResumeSimpleMenu (main_0200C4CC.o) 0202B7B8 0000002C .text CloseSimpleMenu (main_0200C4CC.o) 0202B7E4 00000020 .text IsSimpleMenuActive (main_0200C4CC.o) 0202B804 00000020 .text CheckSimpleMenuField0x1A0 (main_0200C4CC.o) @@ -3645,7 +3645,7 @@ 0202BD00 00000014 .text SetSimpleMenuField0x1AC (main_0200C4CC.o) 0202BD14 000001D0 .text CreateAdvancedMenu (main_0200C4CC.o) 0202BEDC 00000000 .text $d (main_0200C4CC.o) - 0202BEE4 00000038 .text sub_0202BBF0 (main_0200C4CC.o) + 0202BEE4 00000038 .text ResumeAdvancedMenu (main_0200C4CC.o) 0202BEE4 00000000 .text $a (main_0200C4CC.o) 0202BF1C 0000001C .text sub_0202BC28 (main_0200C4CC.o) 0202BF38 0000001C .text CloseAdvancedMenu (main_0200C4CC.o) @@ -5381,7 +5381,7 @@ 0204CC24 00000014 .text GetSpecialEpisodeType (main_0200C4CC.o) 0204CC34 00000000 .text $d (main_0200C4CC.o) 0204CC38 00000000 .text $a (main_0200C4CC.o) - 0204CC38 00000018 .text sub_0204C900 (main_0200C4CC.o) + 0204CC38 00000018 .text SetSpecialEpisodeType (main_0200C4CC.o) 0204CC4C 00000000 .text $d (main_0200C4CC.o) 0204CC50 00000000 .text $a (main_0200C4CC.o) 0204CC50 00000010 .text sub_0204C918 (main_0200C4CC.o) @@ -5393,7 +5393,7 @@ 0204CC70 00000014 .text GetExecuteSpecialEpisodeType (main_0200C4CC.o) 0204CC80 00000000 .text $d (main_0200C4CC.o) 0204CC84 00000000 .text $a (main_0200C4CC.o) - 0204CC84 0000002C .text sub_0204C94C (main_0200C4CC.o) + 0204CC84 0000002C .text IsSpecialEpisodeOpen (main_0200C4CC.o) 0204CCB0 00000028 .text sub_0204C978 (main_0200C4CC.o) 0204CCD4 00000000 .text $d (main_0200C4CC.o) 0204CCD8 00000000 .text $a (main_0200C4CC.o) @@ -5514,7 +5514,7 @@ 0204DFD8 00000000 .text $a (main_0200C4CC.o) 0204E0B4 00000000 .text $d (main_0200C4CC.o) 0204E0B8 00000000 .text $a (main_0200C4CC.o) - 0204E0B8 000000FC .text sub_0204DD80 (main_0200C4CC.o) + 0204E0B8 000000FC .text WonderMailPasswordToMission (main_0200C4CC.o) 0204E1AC 00000000 .text $d (main_0200C4CC.o) 0204E1B4 00000000 .text $a (main_0200C4CC.o) 0204E1B4 000000D8 .text sub_0204DE7C (main_0200C4CC.o) @@ -6355,7 +6355,7 @@ 02055C10 00000000 .text $a (main_02054C24.o) 02055C68 00000000 .text $d (main_02054C24.o) 02055C70 00000000 .text $a (main_02054C24.o) - 02055C70 00000070 .text sub_020558F4 (main_02054C24.o) + 02055C70 00000070 .text GetFirstMatchingMemberIdx (main_02054C24.o) 02055CD8 00000000 .text $d (main_02054C24.o) 02055CE0 00000000 .text $a (main_02054C24.o) 02055CE0 00000074 .text GetFirstEmptyMemberIdx (main_02054C24.o) @@ -6828,10 +6828,10 @@ 0205CAD8 000000F8 .text sub_0205C75C (main_02054C24.o) 0205CBCC 00000000 .text $d (main_02054C24.o) 0205CBD0 00000000 .text $a (main_02054C24.o) - 0205CBD0 0000001C .text sub_0205C854 (main_02054C24.o) + 0205CBD0 0000001C .text IsMissionSuspendedAndValid (main_02054C24.o) 0205CBEC 00000070 .text sub_0205C870 (main_02054C24.o) 0205CC5C 00000054 .text sub_0205C8E0 (main_02054C24.o) - 0205CCB0 0000010C .text sub_0205C934 (main_02054C24.o) + 0205CCB0 0000010C .text AreMissionsEquivalent (main_02054C24.o) 0205CDBC 00000518 .text IsMissionValid (main_02054C24.o) 0205D28C 00000000 .text $d (main_02054C24.o) 0205D2D4 00000000 .text $a (main_02054C24.o) @@ -6856,7 +6856,7 @@ 0205E564 00000050 .text sub_0205E1E8 (main_02054C24.o) 0205E5B0 00000000 .text $d (main_02054C24.o) 0205E5B4 00000000 .text $a (main_02054C24.o) - 0205E5B4 00000020 .text sub_0205E238 (main_02054C24.o) + 0205E5B4 00000020 .text IsMissionTypeSpecialEpisode (main_02054C24.o) 0205E5D4 00000030 .text sub_0205E258 (main_02054C24.o) 0205E604 00000030 .text sub_0205E288 (main_02054C24.o) 0205E634 00000140 .text sub_0205E2B8 (main_02054C24.o) @@ -6908,13 +6908,13 @@ 0205EFF4 00000020 .text sub_0205EC78 (main_02054C24.o) 0205F00C 00000000 .text $d (main_02054C24.o) 0205F014 00000000 .text $a (main_02054C24.o) - 0205F014 0000005C .text sub_0205EC98 (main_02054C24.o) + 0205F014 0000005C .text AlreadyHaveMission (main_02054C24.o) 0205F06C 00000000 .text $d (main_02054C24.o) 0205F070 00000090 .text sub_0205ECF4 (main_02054C24.o) 0205F070 00000000 .text $a (main_02054C24.o) 0205F0FC 00000000 .text $d (main_02054C24.o) 0205F100 00000000 .text $a (main_02054C24.o) - 0205F100 00000020 .text sub_0205ED84 (main_02054C24.o) + 0205F100 00000020 .text CountJobListMissions (main_02054C24.o) 0205F118 00000000 .text $d (main_02054C24.o) 0205F120 0000006C .text DungeonRequestsDone (main_02054C24.o) 0205F120 00000000 .text $a (main_02054C24.o) @@ -6930,7 +6930,7 @@ 0205F388 000000AC .text sub_0205F00C (main_02054C24.o) 0205F430 00000000 .text $d (main_02054C24.o) 0205F434 00000000 .text $a (main_02054C24.o) - 0205F434 00000020 .text sub_0205F0B8 (main_02054C24.o) + 0205F434 00000020 .text AddMissionToJobList (main_02054C24.o) 0205F44C 00000000 .text $d (main_02054C24.o) 0205F454 00000000 .text $a (main_02054C24.o) 0205F454 00000018 .text GetAcceptedMission (main_02054C24.o) @@ -6963,7 +6963,7 @@ 0205FA8C 00000028 .text sub_0205F710 (main_02054C24.o) 0205FAA8 00000000 .text $d (main_02054C24.o) 0205FAB4 00000000 .text $a (main_02054C24.o) - 0205FAB4 00000020 .text sub_0205F738 (main_02054C24.o) + 0205FAB4 00000020 .text GetAllPossibleMonsters (main_02054C24.o) 0205FAD0 00000000 .text $d (main_02054C24.o) 0205FAD4 00000000 .text $a (main_02054C24.o) 0205FAD4 0000006C .text GenerateAllPossibleMonstersList (main_02054C24.o) @@ -7093,7 +7093,7 @@ 02062EE0 00000054 .text sub_02062B64 (main_02054C24.o) 02062F2C 00000000 .text $d (main_02054C24.o) 02062F34 00000000 .text $a (main_02054C24.o) - 02062F34 00000094 .text sub_02062BB8 (main_02054C24.o) + 02062F34 00000094 .text CanDungeonBeUsedForMission (main_02054C24.o) 02062FC8 000000F4 .text sub_02062C4C (main_02054C24.o) 020630BC 0000001C .text sub_02062D40 (main_02054C24.o) 020630D8 00000040 .text sub_02062D5C (main_02054C24.o) @@ -7462,7 +7462,7 @@ 02069B28 00000070 .text sub_02069790 (main_02054C24.o) 02069B28 00000000 .text $a (main_02054C24.o) 02069B8C 00000000 .text $d (main_02054C24.o) - 02069B98 00000070 .text sub_02069800 (main_02054C24.o) + 02069B98 00000070 .text CreateJobSummary (main_02054C24.o) 02069B98 00000000 .text $a (main_02054C24.o) 02069BFC 00000000 .text $d (main_02054C24.o) 02069C08 00000024 .text sub_02069870 (main_02054C24.o) @@ -12283,7 +12283,7 @@ 020B1390 00000000 .text _020B0A4C (main_02075600.o) 020B1398 00000000 .text _020B0A54 (main_02075600.o) 020B13A0 00000000 .text _020B0A5C (main_02075600.o) - 020B13A4 00000000 .text _020B0A60 (main_02075600.o) + 020B13A4 00000000 .text MISSION_DELIVER_LIST_PTR (main_02075600.o) 020B13C0 00000000 .text REMOTE_STRING_PTR_TABLE (main_02075600.o) 020B13DC 00000000 .text RANK_STRING_PTR_TABLE (main_02075600.o) 020B141C 00000000 .text _020B0AD8 (main_02075600.o) @@ -39872,5 +39872,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Jan 06 20:32:56 2024 -# Link end time: Sat Jan 06 20:32:56 2024 +# Link start time: Thu Jan 18 16:42:50 2024 +# Link end time: Thu Jan 18 16:42:50 2024 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 82dccc7a..9654b31b 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -3587,7 +3587,7 @@ 0202A75C 000001F8 .text CreateParentMenuInternal (main_0200C4CC.o) 0202A94C 00000000 .text $d (main_0200C4CC.o) 0202A954 00000000 .text $a (main_0200C4CC.o) - 0202A954 00000038 .text sub_0202A954 (main_0200C4CC.o) + 0202A954 00000038 .text ResumeParentMenu (main_0200C4CC.o) 0202A98C 0000011C .text sub_0202A98C (main_0200C4CC.o) 0202AAA8 00000014 .text SetParentMenuState7 (main_0200C4CC.o) 0202AABC 0000002C .text CloseParentMenu (main_0200C4CC.o) @@ -3609,7 +3609,7 @@ 0202B1AC 00000000 .text $a (main_0200C4CC.o) 0202B284 0000020C .text CreateSimpleMenuInternal (main_0200C4CC.o) 0202B488 00000000 .text $d (main_0200C4CC.o) - 0202B490 00000034 .text sub_0202B490 (main_0200C4CC.o) + 0202B490 00000034 .text ResumeSimpleMenu (main_0200C4CC.o) 0202B490 00000000 .text $a (main_0200C4CC.o) 0202B4C4 0000002C .text CloseSimpleMenu (main_0200C4CC.o) 0202B4F0 00000020 .text IsSimpleMenuActive (main_0200C4CC.o) @@ -3627,7 +3627,7 @@ 0202BA20 000001D0 .text CreateAdvancedMenu (main_0200C4CC.o) 0202BBE8 00000000 .text $d (main_0200C4CC.o) 0202BBF0 00000000 .text $a (main_0200C4CC.o) - 0202BBF0 00000038 .text sub_0202BBF0 (main_0200C4CC.o) + 0202BBF0 00000038 .text ResumeAdvancedMenu (main_0200C4CC.o) 0202BC28 0000001C .text sub_0202BC28 (main_0200C4CC.o) 0202BC44 0000001C .text CloseAdvancedMenu (main_0200C4CC.o) 0202BC60 0000005C .text sub_0202BC60 (main_0200C4CC.o) @@ -5362,7 +5362,7 @@ 0204C8EC 00000014 .text GetSpecialEpisodeType (main_0200C4CC.o) 0204C8FC 00000000 .text $d (main_0200C4CC.o) 0204C900 00000000 .text $a (main_0200C4CC.o) - 0204C900 00000018 .text sub_0204C900 (main_0200C4CC.o) + 0204C900 00000018 .text SetSpecialEpisodeType (main_0200C4CC.o) 0204C914 00000000 .text $d (main_0200C4CC.o) 0204C918 00000010 .text sub_0204C918 (main_0200C4CC.o) 0204C918 00000000 .text $a (main_0200C4CC.o) @@ -5374,7 +5374,7 @@ 0204C938 00000014 .text GetExecuteSpecialEpisodeType (main_0200C4CC.o) 0204C948 00000000 .text $d (main_0200C4CC.o) 0204C94C 00000000 .text $a (main_0200C4CC.o) - 0204C94C 0000002C .text sub_0204C94C (main_0200C4CC.o) + 0204C94C 0000002C .text IsSpecialEpisodeOpen (main_0200C4CC.o) 0204C978 00000028 .text sub_0204C978 (main_0200C4CC.o) 0204C99C 00000000 .text $d (main_0200C4CC.o) 0204C9A0 00000000 .text $a (main_0200C4CC.o) @@ -5495,7 +5495,7 @@ 0204DCA0 000000E0 .text sub_0204DCA0 (main_0200C4CC.o) 0204DD7C 00000000 .text $d (main_0200C4CC.o) 0204DD80 00000000 .text $a (main_0200C4CC.o) - 0204DD80 000000FC .text sub_0204DD80 (main_0200C4CC.o) + 0204DD80 000000FC .text WonderMailPasswordToMission (main_0200C4CC.o) 0204DE74 00000000 .text $d (main_0200C4CC.o) 0204DE7C 00000000 .text $a (main_0200C4CC.o) 0204DE7C 000000D8 .text sub_0204DE7C (main_0200C4CC.o) @@ -6336,7 +6336,7 @@ 02055894 00000000 .text $a (main_02054C24.o) 020558EC 00000000 .text $d (main_02054C24.o) 020558F4 00000000 .text $a (main_02054C24.o) - 020558F4 00000070 .text sub_020558F4 (main_02054C24.o) + 020558F4 00000070 .text GetFirstMatchingMemberIdx (main_02054C24.o) 0205595C 00000000 .text $d (main_02054C24.o) 02055964 00000000 .text $a (main_02054C24.o) 02055964 00000074 .text GetFirstEmptyMemberIdx (main_02054C24.o) @@ -6809,10 +6809,10 @@ 0205C75C 000000F8 .text sub_0205C75C (main_02054C24.o) 0205C850 00000000 .text $d (main_02054C24.o) 0205C854 00000000 .text $a (main_02054C24.o) - 0205C854 0000001C .text sub_0205C854 (main_02054C24.o) + 0205C854 0000001C .text IsMissionSuspendedAndValid (main_02054C24.o) 0205C870 00000070 .text sub_0205C870 (main_02054C24.o) 0205C8E0 00000054 .text sub_0205C8E0 (main_02054C24.o) - 0205C934 0000010C .text sub_0205C934 (main_02054C24.o) + 0205C934 0000010C .text AreMissionsEquivalent (main_02054C24.o) 0205CA40 00000518 .text IsMissionValid (main_02054C24.o) 0205CF10 00000000 .text $d (main_02054C24.o) 0205CF58 00000000 .text $a (main_02054C24.o) @@ -6837,7 +6837,7 @@ 0205E1E8 00000050 .text sub_0205E1E8 (main_02054C24.o) 0205E234 00000000 .text $d (main_02054C24.o) 0205E238 00000000 .text $a (main_02054C24.o) - 0205E238 00000020 .text sub_0205E238 (main_02054C24.o) + 0205E238 00000020 .text IsMissionTypeSpecialEpisode (main_02054C24.o) 0205E258 00000030 .text sub_0205E258 (main_02054C24.o) 0205E288 00000030 .text sub_0205E288 (main_02054C24.o) 0205E2B8 00000140 .text sub_0205E2B8 (main_02054C24.o) @@ -6889,13 +6889,13 @@ 0205EC78 00000020 .text sub_0205EC78 (main_02054C24.o) 0205EC90 00000000 .text $d (main_02054C24.o) 0205EC98 00000000 .text $a (main_02054C24.o) - 0205EC98 0000005C .text sub_0205EC98 (main_02054C24.o) + 0205EC98 0000005C .text AlreadyHaveMission (main_02054C24.o) 0205ECF0 00000000 .text $d (main_02054C24.o) 0205ECF4 00000090 .text sub_0205ECF4 (main_02054C24.o) 0205ECF4 00000000 .text $a (main_02054C24.o) 0205ED80 00000000 .text $d (main_02054C24.o) 0205ED84 00000000 .text $a (main_02054C24.o) - 0205ED84 00000020 .text sub_0205ED84 (main_02054C24.o) + 0205ED84 00000020 .text CountJobListMissions (main_02054C24.o) 0205ED9C 00000000 .text $d (main_02054C24.o) 0205EDA4 0000006C .text DungeonRequestsDone (main_02054C24.o) 0205EDA4 00000000 .text $a (main_02054C24.o) @@ -6911,7 +6911,7 @@ 0205F00C 000000AC .text sub_0205F00C (main_02054C24.o) 0205F0B4 00000000 .text $d (main_02054C24.o) 0205F0B8 00000000 .text $a (main_02054C24.o) - 0205F0B8 00000020 .text sub_0205F0B8 (main_02054C24.o) + 0205F0B8 00000020 .text AddMissionToJobList (main_02054C24.o) 0205F0D0 00000000 .text $d (main_02054C24.o) 0205F0D8 00000000 .text $a (main_02054C24.o) 0205F0D8 00000018 .text GetAcceptedMission (main_02054C24.o) @@ -6944,7 +6944,7 @@ 0205F710 00000028 .text sub_0205F710 (main_02054C24.o) 0205F72C 00000000 .text $d (main_02054C24.o) 0205F738 00000000 .text $a (main_02054C24.o) - 0205F738 00000020 .text sub_0205F738 (main_02054C24.o) + 0205F738 00000020 .text GetAllPossibleMonsters (main_02054C24.o) 0205F754 00000000 .text $d (main_02054C24.o) 0205F758 00000000 .text $a (main_02054C24.o) 0205F758 0000006C .text GenerateAllPossibleMonstersList (main_02054C24.o) @@ -7074,7 +7074,7 @@ 02062B64 00000054 .text sub_02062B64 (main_02054C24.o) 02062BB0 00000000 .text $d (main_02054C24.o) 02062BB8 00000000 .text $a (main_02054C24.o) - 02062BB8 00000094 .text sub_02062BB8 (main_02054C24.o) + 02062BB8 00000094 .text CanDungeonBeUsedForMission (main_02054C24.o) 02062C4C 000000F4 .text sub_02062C4C (main_02054C24.o) 02062D40 0000001C .text sub_02062D40 (main_02054C24.o) 02062D5C 00000040 .text sub_02062D5C (main_02054C24.o) @@ -7443,7 +7443,7 @@ 02069790 00000070 .text sub_02069790 (main_02054C24.o) 02069790 00000000 .text $a (main_02054C24.o) 020697F4 00000000 .text $d (main_02054C24.o) - 02069800 00000070 .text sub_02069800 (main_02054C24.o) + 02069800 00000070 .text CreateJobSummary (main_02054C24.o) 02069800 00000000 .text $a (main_02054C24.o) 02069864 00000000 .text $d (main_02054C24.o) 02069870 00000024 .text sub_02069870 (main_02054C24.o) @@ -12190,7 +12190,7 @@ 020B0A4C 00000000 .text _020B0A4C (main_02075600.o) 020B0A54 00000000 .text _020B0A54 (main_02075600.o) 020B0A5C 00000000 .text _020B0A5C (main_02075600.o) - 020B0A60 00000000 .text _020B0A60 (main_02075600.o) + 020B0A60 00000000 .text MISSION_DELIVER_LIST_PTR (main_02075600.o) 020B0A7C 00000000 .text REMOTE_STRING_PTR_TABLE (main_02075600.o) 020B0A98 00000000 .text RANK_STRING_PTR_TABLE (main_02075600.o) 020B0AD8 00000000 .text _020B0AD8 (main_02075600.o) @@ -39838,5 +39838,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Jan 06 20:32:13 2024 -# Link end time: Sat Jan 06 20:32:13 2024 +# Link start time: Thu Jan 18 16:42:05 2024 +# Link end time: Thu Jan 18 16:42:06 2024