From b09d43ccecc1f05de1f097e537f8a2241bb4bdcc Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 6 Oct 2023 04:36:32 +0000 Subject: [PATCH] Merge pull request #31 from AnonymousRandomPerson/main --- pmdskyus.xMAP | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 90ab66b7..97d95416 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -1395,7 +1395,7 @@ 0200D814 00000000 .text $d (main_0200C4CC.o) 0200D81C 00000018 .text ItemZInit (main_0200C4CC.o) 0200D81C 00000000 .text $a (main_0200C4CC.o) - 0200D834 00000060 .text sub_0200D834 (main_0200C4CC.o) + 0200D834 00000060 .text AreItemsEquivalent (main_0200C4CC.o) 0200D894 00000018 .text sub_0200D894 (main_0200C4CC.o) 0200D8AC 00000038 .text sub_0200D8AC (main_0200C4CC.o) 0200D8DC 00000000 .text $d (main_0200C4CC.o) @@ -1421,7 +1421,7 @@ 0200E1F8 00000000 .text $a (main_0200C4CC.o) 0200E1F8 000001A8 .text NormalizeTreasureBox (main_0200C4CC.o) 0200E39C 00000000 .text $d (main_0200C4CC.o) - 0200E3A0 00000270 .text sub_0200E3A0 (main_0200C4CC.o) + 0200E3A0 00000270 .text SortItemList (main_0200C4CC.o) 0200E3A0 00000000 .text $a (main_0200C4CC.o) 0200E610 000000C8 .text RemoveEmptyItems (main_0200C4CC.o) 0200E6D8 00000088 .text LoadItemPspi2n (main_0200C4CC.o) @@ -1599,10 +1599,10 @@ 0200F884 00000000 .text $a (main_0200C4CC.o) 0200F884 0000008C .text AddItemToBag (main_0200C4CC.o) 0200F90C 00000000 .text $d (main_0200C4CC.o) - 0200F910 00000030 .text sub_0200F910 (main_0200C4CC.o) + 0200F910 00000030 .text CleanStickyItemsInBag (main_0200C4CC.o) 0200F910 00000000 .text $a (main_0200C4CC.o) 0200F93C 00000000 .text $d (main_0200C4CC.o) - 0200F940 00000074 .text sub_0200F940 (main_0200C4CC.o) + 0200F940 00000074 .text CountStickyItemsInBag (main_0200C4CC.o) 0200F940 00000000 .text $a (main_0200C4CC.o) 0200F9B0 00000000 .text $d (main_0200C4CC.o) 0200F9B4 00000000 .text $a (main_0200C4CC.o) @@ -1611,23 +1611,23 @@ 0200FA0C 00000000 .text $a (main_0200C4CC.o) 0200FA0C 0000005C .text sub_0200FA0C (main_0200C4CC.o) 0200FA64 00000000 .text $d (main_0200C4CC.o) - 0200FA68 00000084 .text sub_0200FA68 (main_0200C4CC.o) + 0200FA68 00000084 .text TransmuteHeldItemInBag (main_0200C4CC.o) 0200FA68 00000000 .text $a (main_0200C4CC.o) 0200FAE8 00000000 .text $d (main_0200C4CC.o) - 0200FAEC 00000068 .text sub_0200FAEC (main_0200C4CC.o) + 0200FAEC 00000068 .text SetFlagsForHeldItemInBag (main_0200C4CC.o) 0200FAEC 00000000 .text $a (main_0200C4CC.o) 0200FB50 00000000 .text $d (main_0200C4CC.o) - 0200FB54 0000008C .text sub_0200FB54 (main_0200C4CC.o) + 0200FB54 0000008C .text RemoveHolderForItemInBag (main_0200C4CC.o) 0200FB54 00000000 .text $a (main_0200C4CC.o) 0200FBDC 00000000 .text $d (main_0200C4CC.o) 0200FBE0 00000000 .text $a (main_0200C4CC.o) - 0200FBE0 00000044 .text sub_0200FBE0 (main_0200C4CC.o) + 0200FBE0 00000044 .text SetHolderForItemInBag (main_0200C4CC.o) 0200FC20 00000000 .text $d (main_0200C4CC.o) - 0200FC24 00000088 .text sub_0200FC24 (main_0200C4CC.o) + 0200FC24 00000088 .text SortItemsInBag (main_0200C4CC.o) 0200FC24 00000000 .text $a (main_0200C4CC.o) 0200FCA8 00000000 .text $d (main_0200C4CC.o) 0200FCAC 00000000 .text $a (main_0200C4CC.o) - 0200FCAC 0000008C .text sub_0200FCAC (main_0200C4CC.o) + 0200FCAC 0000008C .text RemovePokeItemsInBag (main_0200C4CC.o) 0200FD34 00000000 .text $d (main_0200C4CC.o) 0200FD38 00000000 .text $a (main_0200C4CC.o) 0200FD38 00000004 .text sub_0200FD38 (main_0200C4CC.o) @@ -1637,13 +1637,13 @@ 0200FD48 00000000 .text $a (main_0200C4CC.o) 0200FD50 00000000 .text $d (main_0200C4CC.o) 0200FD54 00000000 .text $a (main_0200C4CC.o) - 0200FD54 00000024 .text ScriptSpecialProcess0x39 (main_0200C4CC.o) - 0200FD78 00000038 .text sub_0200FD78 (main_0200C4CC.o) + 0200FD54 00000024 .text IsStorageFull (main_0200C4CC.o) + 0200FD78 00000038 .text CountNbOfItemsInStorage (main_0200C4CC.o) 0200FDAC 00000000 .text $d (main_0200C4CC.o) 0200FDB0 00000000 .text $a (main_0200C4CC.o) - 0200FDB0 00000050 .text sub_0200FDB0 (main_0200C4CC.o) + 0200FDB0 00000050 .text CountNbOfValidItemsInStorage (main_0200C4CC.o) 0200FDFC 00000000 .text $d (main_0200C4CC.o) - 0200FE00 000000A8 .text sub_0200FE00 (main_0200C4CC.o) + 0200FE00 000000A8 .text CountNbOfValidItemsInTimeDarknessInStorage (main_0200C4CC.o) 0200FE00 00000000 .text $a (main_0200C4CC.o) 0200FEA4 00000000 .text $d (main_0200C4CC.o) 0200FEA8 0000003C .text CountNbItemsOfTypeInStorage (main_0200C4CC.o) @@ -1653,13 +1653,13 @@ 0200FEE4 00000000 .text $a (main_0200C4CC.o) 0200FF4C 00000000 .text $d (main_0200C4CC.o) 0200FF50 00000000 .text $a (main_0200C4CC.o) - 0200FF50 0000005C .text sub_0200FF50 (main_0200C4CC.o) + 0200FF50 0000005C .text GetEquivBulkItemIdxInStorage (main_0200C4CC.o) 0200FFA8 00000000 .text $d (main_0200C4CC.o) - 0200FFAC 00000048 .text sub_0200FFAC (main_0200C4CC.o) + 0200FFAC 00000048 .text ConvertStorageItemAtIdxToBulkItem (main_0200C4CC.o) 0200FFAC 00000000 .text $a (main_0200C4CC.o) 0200FFF0 00000000 .text $d (main_0200C4CC.o) 0200FFF4 00000000 .text $a (main_0200C4CC.o) - 0200FFF4 00000050 .text sub_0200FFF4 (main_0200C4CC.o) + 0200FFF4 00000050 .text ConvertStorageItemAtIdxToItem (main_0200C4CC.o) 02010040 00000000 .text $d (main_0200C4CC.o) 02010044 00000000 .text $a (main_0200C4CC.o) 02010044 0000001C .text sub_02010044 (main_0200C4CC.o) @@ -1673,25 +1673,25 @@ 02010154 0000004C .text sub_02010154 (main_0200C4CC.o) 02010154 00000000 .text $a (main_0200C4CC.o) 0201019C 00000000 .text $d (main_0200C4CC.o) - 020101A0 00000044 .text sub_020101A0 (main_0200C4CC.o) + 020101A0 00000044 .text RemoveItemAtIdxInStorage (main_0200C4CC.o) 020101A0 00000000 .text $a (main_0200C4CC.o) 020101E0 00000000 .text $d (main_0200C4CC.o) 020101E4 00000000 .text $a (main_0200C4CC.o) - 020101E4 0000007C .text RemoveItemsTypeInStorage (main_0200C4CC.o) + 020101E4 0000007C .text RemoveBulkItemInStorage (main_0200C4CC.o) 0201025C 00000000 .text $d (main_0200C4CC.o) 02010260 00000000 .text $a (main_0200C4CC.o) - 02010260 0000007C .text sub_02010260 (main_0200C4CC.o) + 02010260 0000007C .text RemoveItemInStorage (main_0200C4CC.o) 020102D8 00000000 .text $d (main_0200C4CC.o) - 020102DC 00000040 .text sub_020102DC (main_0200C4CC.o) + 020102DC 00000040 .text StorageZInit (main_0200C4CC.o) 020102DC 00000000 .text $a (main_0200C4CC.o) 02010318 00000000 .text $d (main_0200C4CC.o) - 0201031C 00000090 .text AddItemToStorage (main_0200C4CC.o) + 0201031C 00000090 .text AddBulkItemToStorage (main_0200C4CC.o) 0201031C 00000000 .text $a (main_0200C4CC.o) 020103A8 00000000 .text $d (main_0200C4CC.o) - 020103AC 00000078 .text sub_020103AC (main_0200C4CC.o) + 020103AC 00000078 .text AddItemToStorage (main_0200C4CC.o) 020103AC 00000000 .text $a (main_0200C4CC.o) 02010420 00000000 .text $d (main_0200C4CC.o) - 02010424 0000016C .text sub_02010424 (main_0200C4CC.o) + 02010424 0000016C .text SortItemsInStorage (main_0200C4CC.o) 02010424 00000000 .text $a (main_0200C4CC.o) 0201058C 00000000 .text $d (main_0200C4CC.o) 02010590 00000004 .text sub_02010590 (main_0200C4CC.o) @@ -1788,13 +1788,13 @@ 020110D8 00000094 .text BagHasExclusiveItemTypeForMonster (main_0200C4CC.o) 02011164 00000000 .text $d (main_0200C4CC.o) 0201116C 00000000 .text $a (main_0200C4CC.o) - 0201116C 000000B4 .text sub_0201116C (main_0200C4CC.o) + 0201116C 000000B4 .text GetExclusiveItemForMonsterFromBag (main_0200C4CC.o) 02011218 00000000 .text $d (main_0200C4CC.o) 02011220 00000174 .text sub_02011220 (main_0200C4CC.o) 02011220 00000000 .text $a (main_0200C4CC.o) 0201138C 00000000 .text $d (main_0200C4CC.o) 02011394 00000000 .text $a (main_0200C4CC.o) - 02011394 0000008C .text sub_02011394 (main_0200C4CC.o) + 02011394 0000008C .text GetHpBoostFromExclusiveItems (main_0200C4CC.o) 0201141C 00000000 .text $d (main_0200C4CC.o) 02011420 00000000 .text $a (main_0200C4CC.o) 02011420 000000D8 .text sub_02011420 (main_0200C4CC.o) @@ -5789,7 +5789,7 @@ 02050CCC 00000000 .text $d (main_0200C4CC.o) 02050CD0 00000014 .text sub_02050CD0 (main_0200C4CC.o) 02050CD0 00000000 .text $a (main_0200C4CC.o) - 02050CE4 00000014 .text sub_02050CE4 (main_0200C4CC.o) + 02050CE4 00000014 .text GetRankStorageSize (main_0200C4CC.o) 02050CF8 0000008C .text sub_02050CF8 (main_0200C4CC.o) 02050D70 00000000 .text $d (main_0200C4CC.o) 02050D84 00000084 .text sub_02050D84 (main_0200C4CC.o) @@ -6640,11 +6640,11 @@ 0205A340 000000F0 .text sub_0205A340 (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 00000064 .text GetStatBoostsForMonsterSummary (main_0200C4CC.o) 0205A450 00000000 .text $a (main_0200C4CC.o) 0205A4B4 00000974 .text sub_0205A4B4 (main_0200C4CC.o) 0205ADA0 00000000 .text $d (main_0200C4CC.o) - 0205AE28 000001E0 .text sub_0205AE28 (main_0200C4CC.o) + 0205AE28 000001E0 .text CreateMonsterSummaryFromTeamMember (main_0200C4CC.o) 0205AE28 00000000 .text $a (main_0200C4CC.o) 0205B004 00000000 .text $d (main_0200C4CC.o) 0205B008 00000000 .text $a (main_0200C4CC.o) @@ -34958,7 +34958,7 @@ 022F89A4 00000000 .text $d (overlay_29_022F7388.o) 022F89AC 00000020 .text ov29_022F89AC (overlay_29_022F7388.o) 022F89AC 00000000 .text $a (overlay_29_022F7388.o) - 022F89CC 0000062C .text ov29_022F89CC (overlay_29_022F7388.o) + 022F89CC 0000062C .text CreateMonsterSummaryFromMonster (overlay_29_022F7388.o) 022F8FF0 00000000 .text $d (overlay_29_022F7388.o) 022F8FF8 00000060 .text ov29_022F8FF8 (overlay_29_022F7388.o) 022F8FF8 00000000 .text $a (overlay_29_022F7388.o) @@ -40223,5 +40223,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Oct 04 00:51:14 2023 -# Link end time: Wed Oct 04 00:51:15 2023 +# Link start time: Fri Oct 06 04:35:59 2023 +# Link end time: Fri Oct 06 04:36:00 2023