From 9e5bf2104ed9be3f6c08ccb4cf589bcb69bc86ee Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 28 Nov 2023 23:06:09 +0000 Subject: [PATCH] Merge pull request #38 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 26 +++++++++++++------------- pmdskyus.xMAP | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 397d4b61..f45371b3 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -8639,7 +8639,7 @@ 020794B4 00000000 .text $a (main_0200C4CC.o) 020794DC 0000000C .text sub_02079144 (main_0200C4CC.o) 020794E4 00000000 .text $d (main_0200C4CC.o) - 020794E8 00000018 .text sub_02079150 (main_0200C4CC.o) + 020794E8 00000018 .text IncrementThreadCount (main_0200C4CC.o) 020794E8 00000000 .text $a (main_0200C4CC.o) 020794FC 00000000 .text $d (main_0200C4CC.o) 02079500 00000078 .text sub_02079168 (main_0200C4CC.o) @@ -8647,7 +8647,7 @@ 02079578 00000034 .text sub_020791E0 (main_0200C4CC.o) 020795AC 00000054 .text sub_02079214 (main_0200C4CC.o) 02079600 00000030 .text sub_02079268 (main_0200C4CC.o) - 02079630 00000060 .text sub_02079298 (main_0200C4CC.o) + 02079630 00000060 .text InsertThreadIntoList (main_0200C4CC.o) 0207968C 00000000 .text $d (main_0200C4CC.o) 02079690 00000048 .text sub_020792F8 (main_0200C4CC.o) 02079690 00000000 .text $a (main_0200C4CC.o) @@ -8661,11 +8661,11 @@ 020798E8 00000010 .text sub_02079550 (main_0200C4CC.o) 020798E8 00000000 .text $a (main_0200C4CC.o) 020798F4 00000000 .text $d (main_0200C4CC.o) - 020798F8 000000FC .text sub_02079560 (main_0200C4CC.o) + 020798F8 000000FC .text StartThread (main_0200C4CC.o) 020798F8 00000000 .text $a (main_0200C4CC.o) 020799E8 00000000 .text $d (main_0200C4CC.o) 020799F4 00000000 .text $a (main_0200C4CC.o) - 020799F4 00000020 .text sub_0207965C (main_0200C4CC.o) + 020799F4 00000020 .text ThreadExit (main_0200C4CC.o) 02079A10 00000000 .text $d (main_0200C4CC.o) 02079A14 0000005C .text sub_0207967C (main_0200C4CC.o) 02079A14 00000000 .text $a (main_0200C4CC.o) @@ -8715,9 +8715,9 @@ 02079FE0 00000034 .text sub_02079C48 (main_0200C4CC.o) 02079FE0 00000000 .text $a (main_0200C4CC.o) 0207A010 00000000 .text $d (main_0200C4CC.o) - 0207A014 00000008 .text sub_02079C7C (main_0200C4CC.o) + 0207A014 00000008 .text SetThreadField0xB4 (main_0200C4CC.o) 0207A014 00000000 .text $a (main_0200C4CC.o) - 0207A01C 00000084 .text sub_02079C84 (main_0200C4CC.o) + 0207A01C 00000084 .text InitThread (main_0200C4CC.o) 0207A0A0 0000004C .text sub_02079D08 (main_0200C4CC.o) 0207A0E8 00000000 .text $d (main_0200C4CC.o) 0207A0EC 00000044 .text sub_02079D54 (main_0200C4CC.o) @@ -33552,7 +33552,7 @@ 022E3D0C 00000000 .text $a (overlay_29_022E330C.o) 022E3D0C 000000D4 .text ov29_022E335C (overlay_29_022E330C.o) 022E3DD8 00000000 .text $d (overlay_29_022E330C.o) - 022E3DE0 00000080 .text ov29_022E3430 (overlay_29_022E330C.o) + 022E3DE0 00000080 .text RevealWholeFloor (overlay_29_022E330C.o) 022E3DE0 00000000 .text $a (overlay_29_022E330C.o) 022E3E58 00000000 .text $d (overlay_29_022E330C.o) 022E3E60 00000018 .text ov29_022E34B0 (overlay_29_022E330C.o) @@ -34207,7 +34207,7 @@ 022EAFFC 000000CC .text ov29_022EA64C (overlay_29_022E9618.o) 022EB0B8 00000000 .text $d (overlay_29_022E9618.o) 022EB0C8 00000000 .text $a (overlay_29_022E9618.o) - 022EB0C8 000000F4 .text ov29_022EA718 (overlay_29_022E9618.o) + 022EB0C8 000000F4 .text DisplayAnimatedNumbers (overlay_29_022E9618.o) 022EB1AC 00000000 .text $d (overlay_29_022E9618.o) 022EB1BC 00000000 .text $a (overlay_29_022E9618.o) 022EB1BC 0000015C .text ov29_022EA80C (overlay_29_022E9618.o) @@ -37511,7 +37511,7 @@ 0233B208 0000000C .text LoadFixedRoomDataVeneer (overlay_29_02337CCC.o) 0233B208 00000000 .text $a (overlay_29_02337CCC.o) 0233B210 00000000 .text $d (overlay_29_02337CCC.o) - 0233B214 00000024 .text ov29_0233A630 (overlay_29_02337CCC.o) + 0233B214 00000024 .text UnloadFixedRoomData (overlay_29_02337CCC.o) 0233B214 00000000 .text $a (overlay_29_02337CCC.o) 0233B234 00000000 .text $d (overlay_29_02337CCC.o) 0233B238 00000084 .text IsNormalFloor (overlay_29_02337CCC.o) @@ -39291,8 +39291,8 @@ 02385DC0 000001FC .text MovesMenu (overlay_31.o) 02385FB8 00000000 .text $d (overlay_31.o) 02385FBC 00000000 .text $a (overlay_31.o) - 02385FBC 00000024 .text ov31_023853BC (overlay_31.o) - 02385FE0 00000024 .text ov31_023853E0 (overlay_31.o) + 02385FBC 00000024 .text HandleMovesMenuWrapper0 (overlay_31.o) + 02385FE0 00000024 .text HandleMovesMenuWrapper1 (overlay_31.o) 02386004 00000BC8 .text HandleMovesMenu (overlay_31.o) 02386B94 00000000 .text $d (overlay_31.o) 02386BCC 00000000 .text $a (overlay_31.o) @@ -39817,5 +39817,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Nov 22 21:15:53 2023 -# Link end time: Wed Nov 22 21:15:54 2023 +# Link start time: Tue Nov 28 23:05:41 2023 +# Link end time: Tue Nov 28 23:05:42 2023 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index bcc70ed1..3a3ccfb2 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -8621,14 +8621,14 @@ 02079144 0000000C .text sub_02079144 (main_0200C4CC.o) 0207914C 00000000 .text $d (main_0200C4CC.o) 02079150 00000000 .text $a (main_0200C4CC.o) - 02079150 00000018 .text sub_02079150 (main_0200C4CC.o) + 02079150 00000018 .text IncrementThreadCount (main_0200C4CC.o) 02079164 00000000 .text $d (main_0200C4CC.o) 02079168 00000078 .text sub_02079168 (main_0200C4CC.o) 02079168 00000000 .text $a (main_0200C4CC.o) 020791E0 00000034 .text sub_020791E0 (main_0200C4CC.o) 02079214 00000054 .text sub_02079214 (main_0200C4CC.o) 02079268 00000030 .text sub_02079268 (main_0200C4CC.o) - 02079298 00000060 .text sub_02079298 (main_0200C4CC.o) + 02079298 00000060 .text InsertThreadIntoList (main_0200C4CC.o) 020792F4 00000000 .text $d (main_0200C4CC.o) 020792F8 00000048 .text sub_020792F8 (main_0200C4CC.o) 020792F8 00000000 .text $a (main_0200C4CC.o) @@ -8642,10 +8642,10 @@ 02079550 00000010 .text sub_02079550 (main_0200C4CC.o) 02079550 00000000 .text $a (main_0200C4CC.o) 0207955C 00000000 .text $d (main_0200C4CC.o) - 02079560 000000FC .text sub_02079560 (main_0200C4CC.o) + 02079560 000000FC .text StartThread (main_0200C4CC.o) 02079560 00000000 .text $a (main_0200C4CC.o) 02079650 00000000 .text $d (main_0200C4CC.o) - 0207965C 00000020 .text sub_0207965C (main_0200C4CC.o) + 0207965C 00000020 .text ThreadExit (main_0200C4CC.o) 0207965C 00000000 .text $a (main_0200C4CC.o) 02079678 00000000 .text $d (main_0200C4CC.o) 0207967C 0000005C .text sub_0207967C (main_0200C4CC.o) @@ -8696,9 +8696,9 @@ 02079C48 00000034 .text sub_02079C48 (main_0200C4CC.o) 02079C48 00000000 .text $a (main_0200C4CC.o) 02079C78 00000000 .text $d (main_0200C4CC.o) - 02079C7C 00000008 .text sub_02079C7C (main_0200C4CC.o) + 02079C7C 00000008 .text SetThreadField0xB4 (main_0200C4CC.o) 02079C7C 00000000 .text $a (main_0200C4CC.o) - 02079C84 00000084 .text sub_02079C84 (main_0200C4CC.o) + 02079C84 00000084 .text InitThread (main_0200C4CC.o) 02079D08 0000004C .text sub_02079D08 (main_0200C4CC.o) 02079D50 00000000 .text $d (main_0200C4CC.o) 02079D54 00000044 .text sub_02079D54 (main_0200C4CC.o) @@ -33513,7 +33513,7 @@ 022E335C 00000000 .text $a (overlay_29_022E330C.o) 022E335C 000000D4 .text ov29_022E335C (overlay_29_022E330C.o) 022E3428 00000000 .text $d (overlay_29_022E330C.o) - 022E3430 00000080 .text ov29_022E3430 (overlay_29_022E330C.o) + 022E3430 00000080 .text RevealWholeFloor (overlay_29_022E330C.o) 022E3430 00000000 .text $a (overlay_29_022E330C.o) 022E34A8 00000000 .text $d (overlay_29_022E330C.o) 022E34B0 00000018 .text ov29_022E34B0 (overlay_29_022E330C.o) @@ -34168,7 +34168,7 @@ 022EA64C 000000CC .text ov29_022EA64C (overlay_29_022E9618.o) 022EA708 00000000 .text $d (overlay_29_022E9618.o) 022EA718 00000000 .text $a (overlay_29_022E9618.o) - 022EA718 000000F4 .text ov29_022EA718 (overlay_29_022E9618.o) + 022EA718 000000F4 .text DisplayAnimatedNumbers (overlay_29_022E9618.o) 022EA7FC 00000000 .text $d (overlay_29_022E9618.o) 022EA80C 00000000 .text $a (overlay_29_022E9618.o) 022EA80C 0000015C .text ov29_022EA80C (overlay_29_022E9618.o) @@ -37472,7 +37472,7 @@ 0233A624 0000000C .text LoadFixedRoomDataVeneer (overlay_29_02337CCC.o) 0233A624 00000000 .text $a (overlay_29_02337CCC.o) 0233A62C 00000000 .text $d (overlay_29_02337CCC.o) - 0233A630 00000024 .text ov29_0233A630 (overlay_29_02337CCC.o) + 0233A630 00000024 .text UnloadFixedRoomData (overlay_29_02337CCC.o) 0233A630 00000000 .text $a (overlay_29_02337CCC.o) 0233A650 00000000 .text $d (overlay_29_02337CCC.o) 0233A654 00000084 .text IsNormalFloor (overlay_29_02337CCC.o) @@ -39253,8 +39253,8 @@ 023851C0 000001FC .text MovesMenu (overlay_31.o) 023853B8 00000000 .text $d (overlay_31.o) 023853BC 00000000 .text $a (overlay_31.o) - 023853BC 00000024 .text ov31_023853BC (overlay_31.o) - 023853E0 00000024 .text ov31_023853E0 (overlay_31.o) + 023853BC 00000024 .text HandleMovesMenuWrapper0 (overlay_31.o) + 023853E0 00000024 .text HandleMovesMenuWrapper1 (overlay_31.o) 02385404 00000BA4 .text HandleMovesMenu (overlay_31.o) 02385F70 00000000 .text $d (overlay_31.o) 02385FA8 00000000 .text $a (overlay_31.o) @@ -39783,5 +39783,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Nov 22 21:15:10 2023 -# Link end time: Wed Nov 22 21:15:10 2023 +# Link start time: Tue Nov 28 23:04:58 2023 +# Link end time: Tue Nov 28 23:04:59 2023