From 6897a5a620ce49b6ab0d46c813e84286c74e3edb Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 17 Sep 2026 23:57:06 +0000 Subject: [PATCH] Merge pull request #299 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 10 +++++----- pmdskyjp.xMAP | 10 +++++----- pmdskyus.xMAP | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 2e9dbfe1..8386a6d6 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -9113,7 +9113,7 @@ 02053830 00000000 .text $d (main_02052B44.o) 02053838 00000000 .text $a (main_02052B44.o) 02053838 000000AC .text sub_020534BC (main_02052B44.o) - 020538E4 000000C0 .text sub_02053568 (main_02052B44.o) + 020538E4 000000C0 .text AddUniqueStarterMoveTo (main_02052B44.o) 02053998 00000000 .text $d (main_02052B44.o) 020539A4 00000000 .text $a (main_02052B44.o) 020539A4 00000024 .text sub_02053628 (main_02052B44.o) @@ -14351,7 +14351,7 @@ 020A3824 00000000 .rodata _020A3200 (main_rodata_020A2808.o) 020A3834 00000000 .rodata _020A3210 (main_rodata_020A2808.o) 020A3848 00000000 .rodata _020A3248 (main_rodata_020A2808.o) - 020A3858 00000000 .rodata _020A3258 (main_rodata_020A2808.o) + 020A3858 00000000 .rodata STARTER_MOVES_ARRAY (main_rodata_020A2808.o) 020A387C 00000000 .rodata _020A327C (main_rodata_020A2808.o) 020A388C 00000000 .rodata _020A328C (main_rodata_020A2808.o) 020A38D4 00000000 .rodata _020A32D4 (main_rodata_020A2808.o) @@ -37254,7 +37254,7 @@ 022E5564 0000004C .text ov29_022E4BB4 (overlay_29_022E4BB4.o) 022E5564 00000A88 .text .text (overlay_29_022E4BB4.o) 022E5564 00000000 .text $a (overlay_29_022E4BB4.o) - 022E55B0 0000004C .text ov29_022E4C00 (overlay_29_022E4BB4.o) + 022E55B0 0000004C .text PlayAttractHitEffect (overlay_29_022E4BB4.o) 022E55FC 00000038 .text ov29_022E4C4C (overlay_29_022E4BB4.o) 022E5634 00000050 .text ov29_022E4C84 (overlay_29_022E4BB4.o) 022E5680 00000000 .text $d (overlay_29_022E4BB4.o) @@ -43792,5 +43792,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Sep 16 22:00:11 2026 -# Link end time: Wed Sep 16 22:00:12 2026 +# Link start time: Thu Sep 17 23:53:50 2026 +# Link end time: Thu Sep 17 23:53:51 2026 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index f94c97b4..f69c67a7 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -9097,7 +9097,7 @@ 020537EC 00000000 .text $d (main_02052B44.o) 020537F4 00000000 .text $a (main_02052B44.o) 020537F4 000000AC .text sub_020534BC (main_02052B44.o) - 020538A0 000000C0 .text sub_02053568 (main_02052B44.o) + 020538A0 000000C0 .text AddUniqueStarterMoveTo (main_02052B44.o) 02053954 00000000 .text $d (main_02052B44.o) 02053960 00000000 .text $a (main_02052B44.o) 02053960 00000024 .text sub_02053628 (main_02052B44.o) @@ -14566,7 +14566,7 @@ 020A45F4 00000000 .rodata _020A3210 (main_rodata_020A2808.o) 020A4610 00000000 .rodata _020A322C (main_rodata_020A2808.o) 020A462C 00000000 .rodata _020A3248 (main_rodata_020A2808.o) - 020A463C 00000000 .rodata _020A3258 (main_rodata_020A2808.o) + 020A463C 00000000 .rodata STARTER_MOVES_ARRAY (main_rodata_020A2808.o) 020A4660 00000000 .rodata _020A327C (main_rodata_020A2808.o) 020A4670 00000000 .rodata _020A328C (main_rodata_020A2808.o) 020A46B8 00000000 .rodata _020A32D4 (main_rodata_020A2808.o) @@ -37497,7 +37497,7 @@ 022E6224 0000004C .text ov29_022E4BB4 (overlay_29_022E4BB4.o) 022E6224 00000A88 .text .text (overlay_29_022E4BB4.o) 022E6224 00000000 .text $a (overlay_29_022E4BB4.o) - 022E6270 0000004C .text ov29_022E4C00 (overlay_29_022E4BB4.o) + 022E6270 0000004C .text PlayAttractHitEffect (overlay_29_022E4BB4.o) 022E62BC 00000038 .text ov29_022E4C4C (overlay_29_022E4BB4.o) 022E62F4 00000050 .text ov29_022E4C84 (overlay_29_022E4BB4.o) 022E6340 00000000 .text $d (overlay_29_022E4BB4.o) @@ -43998,5 +43998,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Sep 16 22:03:29 2026 -# Link end time: Wed Sep 16 22:03:30 2026 +# Link start time: Thu Sep 17 23:56:34 2026 +# Link end time: Thu Sep 17 23:56:35 2026 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 0819de08..aa42b2bd 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -9093,7 +9093,7 @@ 020534B4 00000000 .text $d (main_02052B44.o) 020534BC 00000000 .text $a (main_02052B44.o) 020534BC 000000AC .text sub_020534BC (main_02052B44.o) - 02053568 000000C0 .text sub_02053568 (main_02052B44.o) + 02053568 000000C0 .text AddUniqueStarterMoveTo (main_02052B44.o) 0205361C 00000000 .text $d (main_02052B44.o) 02053628 00000000 .text $a (main_02052B44.o) 02053628 00000024 .text sub_02053628 (main_02052B44.o) @@ -14295,7 +14295,7 @@ 020A3210 00000000 .rodata _020A3210 (main_rodata_020A2808.o) 020A322C 00000000 .rodata _020A322C (main_rodata_020A2808.o) 020A3248 00000000 .rodata _020A3248 (main_rodata_020A2808.o) - 020A3258 00000000 .rodata _020A3258 (main_rodata_020A2808.o) + 020A3258 00000000 .rodata STARTER_MOVES_ARRAY (main_rodata_020A2808.o) 020A327C 00000000 .rodata _020A327C (main_rodata_020A2808.o) 020A328C 00000000 .rodata _020A328C (main_rodata_020A2808.o) 020A32D4 00000000 .rodata _020A32D4 (main_rodata_020A2808.o) @@ -37214,7 +37214,7 @@ 022E4BB4 0000004C .text ov29_022E4BB4 (overlay_29_022E4BB4.o) 022E4BB4 00000A88 .text .text (overlay_29_022E4BB4.o) 022E4BB4 00000000 .text $a (overlay_29_022E4BB4.o) - 022E4C00 0000004C .text ov29_022E4C00 (overlay_29_022E4BB4.o) + 022E4C00 0000004C .text PlayAttractHitEffect (overlay_29_022E4BB4.o) 022E4C4C 00000038 .text ov29_022E4C4C (overlay_29_022E4BB4.o) 022E4C84 00000050 .text ov29_022E4C84 (overlay_29_022E4BB4.o) 022E4CD0 00000000 .text $d (overlay_29_022E4BB4.o) @@ -43756,5 +43756,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Wed Sep 16 21:56:43 2026 -# Link end time: Wed Sep 16 21:56:45 2026 +# Link start time: Thu Sep 17 23:51:03 2026 +# Link end time: Thu Sep 17 23:51:04 2026