diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index d78ec580..90ab66b7 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -1362,9 +1362,9 @@ 0200CF6C 00000000 .text $a (main_0200C4CC.o) 0200CF74 00000000 .text $d (main_0200C4CC.o) 0200CF78 00000000 .text $a (main_0200C4CC.o) - 0200CF78 00000078 .text sub_0200CF78 (main_0200C4CC.o) - 0200CFF0 000000B0 .text sub_0200CFF0 (main_0200C4CC.o) - 0200D0A0 00000030 .text sub_0200D0A0 (main_0200C4CC.o) + 0200CF78 00000078 .text InitBulkItem (main_0200C4CC.o) + 0200CFF0 000000B0 .text BulkItemToItem (main_0200C4CC.o) + 0200D0A0 00000030 .text ItemToBulkItem (main_0200C4CC.o) 0200D0D0 00000048 .text GetDisplayedBuyPrice (main_0200C4CC.o) 0200D118 00000048 .text GetDisplayedSellPrice (main_0200C4CC.o) 0200D160 00000048 .text GetActualBuyPrice (main_0200C4CC.o) @@ -1497,10 +1497,10 @@ 0200EC90 00000000 .text $a (main_0200C4CC.o) 0200EC90 00000048 .text sub_0200EC90 (main_0200C4CC.o) 0200ECD4 00000000 .text $d (main_0200C4CC.o) - 0200ECD8 00000024 .text SetGold (main_0200C4CC.o) + 0200ECD8 00000024 .text SetActiveInventory (main_0200C4CC.o) 0200ECD8 00000000 .text $a (main_0200C4CC.o) 0200ECF8 00000000 .text $d (main_0200C4CC.o) - 0200ECFC 00000020 .text GetGold (main_0200C4CC.o) + 0200ECFC 00000020 .text GetMoneyCarried (main_0200C4CC.o) 0200ECFC 00000000 .text $a (main_0200C4CC.o) 0200ED18 00000000 .text $d (main_0200C4CC.o) 0200ED1C 0000003C .text SetMoneyCarried (main_0200C4CC.o) @@ -1704,13 +1704,13 @@ 020106C4 00000048 .text sub_020106C4 (main_0200C4CC.o) 020106C4 00000000 .text $a (main_0200C4CC.o) 02010708 00000000 .text $d (main_0200C4CC.o) - 0201070C 00000018 .text sub_0201070C (main_0200C4CC.o) + 0201070C 00000018 .text GetMoneyStored (main_0200C4CC.o) 0201070C 00000000 .text $a (main_0200C4CC.o) 02010720 00000000 .text $d (main_0200C4CC.o) 02010724 00000034 .text SetMoneyStored (main_0200C4CC.o) 02010724 00000000 .text $a (main_0200C4CC.o) 02010750 00000000 .text $d (main_0200C4CC.o) - 02010758 00000024 .text sub_02010758 (main_0200C4CC.o) + 02010758 00000024 .text AddMoneyStored (main_0200C4CC.o) 02010758 00000000 .text $a (main_0200C4CC.o) 02010774 00000000 .text $d (main_0200C4CC.o) 0201077C 00000000 .text $a (main_0200C4CC.o) @@ -1746,10 +1746,10 @@ 020108B4 000000A0 .text sub_020108B4 (main_0200C4CC.o) 020108B4 00000000 .text $a (main_0200C4CC.o) 02010950 00000000 .text $d (main_0200C4CC.o) - 02010954 000000F8 .text sub_02010954 (main_0200C4CC.o) + 02010954 000000F8 .text SortKecleonItems1 (main_0200C4CC.o) 02010954 00000000 .text $a (main_0200C4CC.o) 02010A48 00000000 .text $d (main_0200C4CC.o) - 02010A4C 0000007C .text GetKecleonItems1 (main_0200C4CC.o) + 02010A4C 0000007C .text GenerateKecleonItems1 (main_0200C4CC.o) 02010A4C 00000000 .text $a (main_0200C4CC.o) 02010AC0 00000000 .text $d (main_0200C4CC.o) 02010AC8 00000000 .text $a (main_0200C4CC.o) @@ -1768,9 +1768,9 @@ 02010BC0 000000A0 .text sub_02010BC0 (main_0200C4CC.o) 02010C5C 00000000 .text $d (main_0200C4CC.o) 02010C60 00000000 .text $a (main_0200C4CC.o) - 02010C60 000000F8 .text sub_02010C60 (main_0200C4CC.o) + 02010C60 000000F8 .text SortKecleonItems2 (main_0200C4CC.o) 02010D54 00000000 .text $d (main_0200C4CC.o) - 02010D58 00000074 .text GetKecleonItems2 (main_0200C4CC.o) + 02010D58 00000074 .text GenerateKecleonItems2 (main_0200C4CC.o) 02010D58 00000000 .text $a (main_0200C4CC.o) 02010DC4 00000000 .text $d (main_0200C4CC.o) 02010DCC 00000074 .text sub_02010DCC (main_0200C4CC.o) @@ -1801,32 +1801,32 @@ 020114F4 00000000 .text $d (main_0200C4CC.o) 020114F8 00000000 .text $a (main_0200C4CC.o) 020114F8 00000030 .text sub_020114F8 (main_0200C4CC.o) - 02011528 0000002C .text sub_02011528 (main_0200C4CC.o) - 02011554 0000002C .text sub_02011554 (main_0200C4CC.o) - 02011580 0000003C .text sub_02011580 (main_0200C4CC.o) + 02011528 0000002C .text ApplyGummiBoostsToGroundMonster (main_0200C4CC.o) + 02011554 0000002C .text ApplyGummiBoostsToTeamMember (main_0200C4CC.o) + 02011580 0000003C .text ApplySitrusBerryBoostToGroundMonster (main_0200C4CC.o) 020115B8 00000000 .text $d (main_0200C4CC.o) - 020115BC 0000003C .text sub_020115BC (main_0200C4CC.o) + 020115BC 0000003C .text ApplyLifeSeedBoostToGroundMonster (main_0200C4CC.o) 020115BC 00000000 .text $a (main_0200C4CC.o) 020115F4 00000000 .text $d (main_0200C4CC.o) - 020115F8 00000114 .text ProcessGinsengOverworld (main_0200C4CC.o) + 020115F8 00000114 .text ApplyGinsengToGroundMonster (main_0200C4CC.o) 020115F8 00000000 .text $a (main_0200C4CC.o) 02011708 00000000 .text $d (main_0200C4CC.o) - 0201170C 0000003C .text sub_0201170C (main_0200C4CC.o) + 0201170C 0000003C .text ApplyProteinBoostToGroundMonster (main_0200C4CC.o) 0201170C 00000000 .text $a (main_0200C4CC.o) 02011744 00000000 .text $d (main_0200C4CC.o) 02011748 00000000 .text $a (main_0200C4CC.o) - 02011748 0000003C .text sub_02011748 (main_0200C4CC.o) + 02011748 0000003C .text ApplyCalciumBoostToGroundMonster (main_0200C4CC.o) 02011780 00000000 .text $d (main_0200C4CC.o) - 02011784 0000003C .text sub_02011784 (main_0200C4CC.o) + 02011784 0000003C .text ApplyIronBoostToGroundMonster (main_0200C4CC.o) 02011784 00000000 .text $a (main_0200C4CC.o) 020117BC 00000000 .text $d (main_0200C4CC.o) - 020117C0 0000003C .text sub_020117C0 (main_0200C4CC.o) + 020117C0 0000003C .text ApplyZincBoostToGroundMonster (main_0200C4CC.o) 020117C0 00000000 .text $a (main_0200C4CC.o) 020117F8 00000000 .text $d (main_0200C4CC.o) - 020117FC 00000034 .text sub_020117FC (main_0200C4CC.o) + 020117FC 00000034 .text ApplyNectarBoostToGroundMonster (main_0200C4CC.o) 020117FC 00000000 .text $a (main_0200C4CC.o) - 02011830 00000020 .text sub_02011830 (main_0200C4CC.o) - 02011850 0000004C .text sub_02011850 (main_0200C4CC.o) + 02011830 00000020 .text IsMonsterAffectedByGravelyrockGroundMode (main_0200C4CC.o) + 02011850 0000004C .text ApplyGravelyrockBoostToGroundMonster (main_0200C4CC.o) 0201189C 0000021C .text ApplyGummiBoostsGroundMode (main_0200C4CC.o) 02011AA0 00000000 .text $d (main_0200C4CC.o) 02011AB8 00000084 .text sub_02011AB8 (main_0200C4CC.o) @@ -3070,7 +3070,7 @@ 02024C18 00000054 .text sub_02024C18 (main_0200C4CC.o) 02024C18 00000000 .text $a (main_0200C4CC.o) 02024C64 00000000 .text $d (main_0200C4CC.o) - 02024C6C 000000DC .text sub_02024C6C (main_0200C4CC.o) + 02024C6C 000000DC .text GetCurrentTeamNameString (main_0200C4CC.o) 02024C6C 00000000 .text $a (main_0200C4CC.o) 02024D38 00000000 .text $d (main_0200C4CC.o) 02024D48 00000034 .text sub_02024D48 (main_0200C4CC.o) @@ -3108,8 +3108,8 @@ 020251AC 00000044 .text StrncmpSimple (main_0200C4CC.o) 020251F0 00000004 .text sub_020251F0 (main_0200C4CC.o) 020251F4 0000003C .text StrncpySimpleNoPadSafe (main_0200C4CC.o) - 02025230 000000E4 .text SpecialStrcpy (main_0200C4CC.o) - 02025314 000000F0 .text sub_02025314 (main_0200C4CC.o) + 02025230 000000E4 .text StrcpyName (main_0200C4CC.o) + 02025314 000000F0 .text StrncpyName (main_0200C4CC.o) 02025404 00000048 .text sub_02025404 (main_0200C4CC.o) 0202544C 00000034 .text sub_0202544C (main_0200C4CC.o) 02025480 00000078 .text sub_02025480 (main_0200C4CC.o) @@ -3144,8 +3144,8 @@ 020258C0 00000000 .text $d (main_0200C4CC.o) 020258C4 00000020 .text StringFromMessageId (main_0200C4CC.o) 020258C4 00000000 .text $a (main_0200C4CC.o) - 020258E4 00000028 .text sub_020258E4 (main_0200C4CC.o) - 0202590C 00000030 .text CopyStringFromMessageId (main_0200C4CC.o) + 020258E4 00000028 .text CopyStringFromMessageId (main_0200C4CC.o) + 0202590C 00000030 .text CopyNStringFromMessageId (main_0200C4CC.o) 0202593C 00000050 .text LoadTblTalk (main_0200C4CC.o) 02025980 00000000 .text $d (main_0200C4CC.o) 0202598C 0000014C .text GetTalkLine (main_0200C4CC.o) @@ -3171,7 +3171,7 @@ 02025D90 000000F4 .text sub_02025D90 (main_0200C4CC.o) 02025E84 00000064 .text sub_02025E84 (main_0200C4CC.o) 02025EE4 00000000 .text $d (main_0200C4CC.o) - 02025EE8 00000028 .text sub_02025EE8 (main_0200C4CC.o) + 02025EE8 00000028 .text IsAOrBPressed (main_0200C4CC.o) 02025EE8 00000000 .text $a (main_0200C4CC.o) 02025F10 000000D0 .text sub_02025F10 (main_0200C4CC.o) 02025FDC 00000000 .text $d (main_0200C4CC.o) @@ -5305,7 +5305,7 @@ 0204BF68 00000020 .text sub_0204BF68 (main_0200C4CC.o) 0204BF68 00000000 .text $a (main_0200C4CC.o) 0204BF88 00000038 .text sub_0204BF88 (main_0200C4CC.o) - 0204BFC0 00000224 .text sub_0204BFC0 (main_0200C4CC.o) + 0204BFC0 00000224 .text EventFlagResume (main_0200C4CC.o) 0204C1E0 00000000 .text $d (main_0200C4CC.o) 0204C1E4 00000224 .text EventFlagBackup (main_0200C4CC.o) 0204C1E4 00000000 .text $a (main_0200C4CC.o) @@ -5757,7 +5757,7 @@ 0205093C 00000014 .text GetAbilityDescStringId (main_0200C4CC.o) 0205093C 00000000 .text $a (main_0200C4CC.o) 02050950 00000014 .text GetTypeStringId (main_0200C4CC.o) - 02050964 00000010 .text sub_02050964 (main_0200C4CC.o) + 02050964 00000010 .text GetConversion2ConvertToType (main_0200C4CC.o) 02050970 00000000 .text $d (main_0200C4CC.o) 02050974 0000001C .text sub_02050974 (main_0200C4CC.o) 02050974 00000000 .text $a (main_0200C4CC.o) @@ -5767,15 +5767,15 @@ 020509BC 00000000 .text $a (main_0200C4CC.o) 020509C0 00000080 .text CopyBitsTo (main_0200C4CC.o) 02050A40 0000008C .text CopyBitsFrom (main_0200C4CC.o) - 02050ACC 00000044 .text StoreDefaultTeamName (main_0200C4CC.o) + 02050ACC 00000044 .text StoreDefaultTeamData (main_0200C4CC.o) 02050B08 00000000 .text $d (main_0200C4CC.o) - 02050B10 0000006C .text GetTeamNameCheck (main_0200C4CC.o) + 02050B10 0000006C .text GetMainTeamNameWithCheck (main_0200C4CC.o) 02050B10 00000000 .text $a (main_0200C4CC.o) 02050B70 00000000 .text $d (main_0200C4CC.o) - 02050B7C 00000018 .text GetTeamName (main_0200C4CC.o) + 02050B7C 00000018 .text GetMainTeamName (main_0200C4CC.o) 02050B7C 00000000 .text $a (main_0200C4CC.o) 02050B8C 00000000 .text $d (main_0200C4CC.o) - 02050B94 00000024 .text SetTeamName (main_0200C4CC.o) + 02050B94 00000024 .text SetMainTeamName (main_0200C4CC.o) 02050B94 00000000 .text $a (main_0200C4CC.o) 02050BB4 00000000 .text $d (main_0200C4CC.o) 02050BB8 00000058 .text GetRankupPoints (main_0200C4CC.o) @@ -6341,13 +6341,13 @@ 020560A4 00000014 .text sub_020560A4 (main_0200C4CC.o) 020560B8 00000010 .text sub_020560B8 (main_0200C4CC.o) 020560C4 00000000 .text $d (main_0200C4CC.o) - 020560C8 00000090 .text sub_020560C8 (main_0200C4CC.o) + 020560C8 00000090 .text RemoveActiveMembersFromAllTeams (main_0200C4CC.o) 020560C8 00000000 .text $a (main_0200C4CC.o) 02056154 00000000 .text $d (main_0200C4CC.o) 02056158 00000000 .text $a (main_0200C4CC.o) - 02056158 00000068 .text sub_02056158 (main_0200C4CC.o) + 02056158 00000068 .text RemoveActiveMembersFromSpecialEpisodeTeam (main_0200C4CC.o) 020561BC 00000000 .text $d (main_0200C4CC.o) - 020561C0 00000068 .text sub_020561C0 (main_0200C4CC.o) + 020561C0 00000068 .text RemoveActiveMembersFromRescueTeam (main_0200C4CC.o) 020561C0 00000000 .text $a (main_0200C4CC.o) 02056224 00000000 .text $d (main_0200C4CC.o) 02056228 00000000 .text $a (main_0200C4CC.o) @@ -6550,18 +6550,18 @@ 02058AFC 00000000 .text $a (main_0200C4CC.o) 02058AFC 00000120 .text sub_02058AFC (main_0200C4CC.o) 02058C08 00000000 .text $d (main_0200C4CC.o) - 02058C1C 00000014 .text sub_02058C1C (main_0200C4CC.o) + 02058C1C 00000014 .text GetIqSkillStringId (main_0200C4CC.o) 02058C1C 00000000 .text $a (main_0200C4CC.o) 02058C30 0000000C .text sub_02058C30 (main_0200C4CC.o) 02058C38 00000000 .text $d (main_0200C4CC.o) 02058C3C 00000000 .text $a (main_0200C4CC.o) - 02058C3C 00000010 .text sub_02058C3C (main_0200C4CC.o) + 02058C3C 00000010 .text DoesTacticFollowLeader (main_0200C4CC.o) 02058C48 00000000 .text $d (main_0200C4CC.o) - 02058C4C 00000050 .text sub_02058C4C (main_0200C4CC.o) + 02058C4C 00000050 .text GetUnlockedTactics (main_0200C4CC.o) 02058C4C 00000000 .text $a (main_0200C4CC.o) 02058C98 00000000 .text $d (main_0200C4CC.o) 02058C9C 00000000 .text $a (main_0200C4CC.o) - 02058C9C 0000003C .text sub_02058C9C (main_0200C4CC.o) + 02058C9C 0000003C .text GetUnlockedTacticFlags (main_0200C4CC.o) 02058CD4 00000000 .text $d (main_0200C4CC.o) 02058CD8 0000002C .text CanLearnIqSkill (main_0200C4CC.o) 02058CD8 00000000 .text $a (main_0200C4CC.o) @@ -6577,8 +6577,8 @@ 02058E68 00000000 .text $a (main_0200C4CC.o) 02058E88 00000000 .text $d (main_0200C4CC.o) 02058E8C 00000000 .text $a (main_0200C4CC.o) - 02058E8C 00000024 .text sub_02058E8C (main_0200C4CC.o) - 02058EB0 00000054 .text sub_02058EB0 (main_0200C4CC.o) + 02058E8C 00000024 .text DisableAllIqSkills (main_0200C4CC.o) + 02058EB0 00000054 .text EnableAllLearnableIqSkills (main_0200C4CC.o) 02058F04 00000020 .text IqSkillFlagTest (main_0200C4CC.o) 02058F24 00000080 .text GetNextIqSkill (main_0200C4CC.o) 02058F9C 00000000 .text $d (main_0200C4CC.o) @@ -6588,7 +6588,7 @@ 02058FCC 00000000 .text $a (main_0200C4CC.o) 02058FCC 00000094 .text sub_02058FCC (main_0200C4CC.o) 0205905C 00000000 .text $d (main_0200C4CC.o) - 02059060 00000060 .text sub_02059060 (main_0200C4CC.o) + 02059060 00000060 .text GetExplorerMazeTeamName (main_0200C4CC.o) 02059060 00000000 .text $a (main_0200C4CC.o) 020590B8 00000000 .text $d (main_0200C4CC.o) 020590C0 0000001C .text sub_020590C0 (main_0200C4CC.o) @@ -6638,7 +6638,7 @@ 0205A33C 00000000 .text $d (main_0200C4CC.o) 0205A340 00000000 .text $a (main_0200C4CC.o) 0205A340 000000F0 .text sub_0205A340 (main_0200C4CC.o) - 0205A430 00000020 .text sub_0205A430 (main_0200C4CC.o) + 0205A430 00000020 .text CopyTacticString (main_0200C4CC.o) 0205A448 00000000 .text $d (main_0200C4CC.o) 0205A450 00000064 .text sub_0205A450 (main_0200C4CC.o) 0205A450 00000000 .text $a (main_0200C4CC.o) @@ -35587,7 +35587,7 @@ 02308270 00000000 .text $d (overlay_29_02307F1C.o) 0230827C 00000024 .text EntityIsValid__0230827C (overlay_29_0230827C.o) 0230827C 00000000 .text $a (overlay_29_0230827C.o) - 023082A0 00000024 .text ov29_023082A0 (overlay_29_023082A0.o) + 023082A0 00000024 .text ShouldMonsterFollowLeader (overlay_29_023082A0.o) 023082A0 00000000 .text $a (overlay_29_023082A0.o) 023082A0 00000D1C .text .text (overlay_29_023082A0.o) 023082C4 0000007C .text ov29_023082C4 (overlay_29_023082A0.o) @@ -37704,7 +37704,7 @@ 023383A8 00000000 .text $a (overlay_29_02337CCC.o) 023383B4 00000000 .text $d (overlay_29_02337CCC.o) 023383BC 00000000 .text $a (overlay_29_02337CCC.o) - 023383BC 00000074 .text ov29_023383BC (overlay_29_02337CCC.o) + 023383BC 00000074 .text TryActivateGravity (overlay_29_02337CCC.o) 02338424 00000000 .text $d (overlay_29_02337CCC.o) 02338430 00000000 .text $a (overlay_29_02337CCC.o) 02338430 0000002C .text ov29_02338430 (overlay_29_02337CCC.o) @@ -40223,5 +40223,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sat Sep 30 04:14:36 2023 -# Link end time: Sat Sep 30 04:14:37 2023 +# Link start time: Wed Oct 04 00:51:14 2023 +# Link end time: Wed Oct 04 00:51:15 2023