Skip to content

Commit

Permalink
Merge pull request #37 from AnonymousRandomPerson/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnonymousRandomPerson
AnonymousRandomPerson committed Nov 22, 2023
1 parent e41574c commit affe3b8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions pmdskyeu.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2253,7 +2253,7 @@
02017BF4 00000000 .text $a (main_0200C4CC.o)
02017BF4 0000000C .text PlayBgmByIdVeneer (main_0200C4CC.o)
02017BFC 00000000 .text $d (main_0200C4CC.o)
02017C00 0000000C .text sub_02017B64 (main_0200C4CC.o)
02017C00 0000000C .text PlayBgmByIdVolumeVeneer (main_0200C4CC.o)
02017C00 00000000 .text $a (main_0200C4CC.o)
02017C08 00000000 .text $d (main_0200C4CC.o)
02017C0C 0000000C .text sub_02017B70 (main_0200C4CC.o)
Expand All @@ -2271,7 +2271,7 @@
02017C70 0000000C .text sub_02017BD4 (main_0200C4CC.o)
02017C70 00000000 .text $a (main_0200C4CC.o)
02017C78 00000000 .text $d (main_0200C4CC.o)
02017C7C 0000000C .text PlayBgmByIdVolumeVeneer (main_0200C4CC.o)
02017C7C 0000000C .text sub_02017BE0 (main_0200C4CC.o)
02017C7C 00000000 .text $a (main_0200C4CC.o)
02017C84 00000000 .text $d (main_0200C4CC.o)
02017C88 00000000 .text $a (main_0200C4CC.o)
Expand Down Expand Up @@ -2337,7 +2337,7 @@
02017E90 0000007C .text PlayBgmById (main_0200C4CC.o)
02017E90 00000000 .text $a (main_0200C4CC.o)
02017F04 00000000 .text $d (main_0200C4CC.o)
02017F0C 00000078 .text sub_02017E70 (main_0200C4CC.o)
02017F0C 00000078 .text PlayBgmByIdVolume (main_0200C4CC.o)
02017F0C 00000000 .text $a (main_0200C4CC.o)
02017F7C 00000000 .text $d (main_0200C4CC.o)
02017F84 00000040 .text StopBgmCommand (main_0200C4CC.o)
Expand All @@ -2361,7 +2361,7 @@
020180C0 00000000 .text $a (main_0200C4CC.o)
020180C0 0000007C .text sub_02018024 (main_0200C4CC.o)
02018134 00000000 .text $d (main_0200C4CC.o)
0201813C 00000078 .text PlayBgmByIdVolume (main_0200C4CC.o)
0201813C 00000078 .text sub_020180A0 (main_0200C4CC.o)
0201813C 00000000 .text $a (main_0200C4CC.o)
020181AC 00000000 .text $d (main_0200C4CC.o)
020181B4 00000040 .text sub_02018118 (main_0200C4CC.o)
Expand Down Expand Up @@ -26091,7 +26091,7 @@
022C51F4 00000000 .text ov10_022C489C (overlay_10.o)
022C51F8 00000000 .text ov10_022C48A0 (overlay_10.o)
022C51FC 00000000 .text SOLARBEAM_DAMAGE_MULTIPLIER (overlay_10.o)
022C5200 00000000 .text ov10_022C48A8 (overlay_10.o)
022C5200 00000000 .text SKY_ATTACK_DAMAGE_MULTIPLIER (overlay_10.o)
022C5204 00000000 .text ov10_022C48AC (overlay_10.o)
022C5208 00000000 .text RAZOR_WIND_DAMAGE_MULTIPLIER (overlay_10.o)
022C520C 00000000 .text FOCUS_PUNCH_DAMAGE_MULTIPLIER (overlay_10.o)
Expand Down Expand Up @@ -38854,7 +38854,7 @@
02353EC8 00000000 .text ov29_023532B8 (overlay_29_0234EC38.o)
02353ED0 00000000 .text ov29_023532C0 (overlay_29_0234EC38.o)
02353ED8 00000000 .text ov29_023532C8 (overlay_29_0234EC38.o)
02353EE0 00000000 .text GUMMI_IQ_STRING_IDS (overlay_29_0234EC38.o)
02353EE0 00000000 .text GUMMI_LIKE_STRING_IDS (overlay_29_0234EC38.o)
02353EE8 00000000 .text ov29_023532D8 (overlay_29_0234EC38.o)
02353EF0 00000000 .text ov29_02353238 (overlay_29_0234EC38.o)
02353EF8 00000000 .text ov29_023532E0 (overlay_29_0234EC38.o)
Expand Down Expand Up @@ -39817,5 +39817,5 @@
00000000 00000000 00004000 check.ITCM
00000000 00000000 00002880 check.DTCM

# Link start time: Wed Nov 22 05:20:19 2023
# Link end time: Wed Nov 22 05:20:20 2023
# Link start time: Wed Nov 22 21:15:53 2023
# Link end time: Wed Nov 22 21:15:54 2023
16 changes: 8 additions & 8 deletions pmdskyus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,7 @@
02017B58 0000000C .text PlayBgmByIdVeneer (main_0200C4CC.o)
02017B58 00000000 .text $a (main_0200C4CC.o)
02017B60 00000000 .text $d (main_0200C4CC.o)
02017B64 0000000C .text sub_02017B64 (main_0200C4CC.o)
02017B64 0000000C .text PlayBgmByIdVolumeVeneer (main_0200C4CC.o)
02017B64 00000000 .text $a (main_0200C4CC.o)
02017B6C 00000000 .text $d (main_0200C4CC.o)
02017B70 0000000C .text sub_02017B70 (main_0200C4CC.o)
Expand All @@ -2270,7 +2270,7 @@
02017BD4 0000000C .text sub_02017BD4 (main_0200C4CC.o)
02017BDC 00000000 .text $d (main_0200C4CC.o)
02017BE0 00000000 .text $a (main_0200C4CC.o)
02017BE0 0000000C .text PlayBgmByIdVolumeVeneer (main_0200C4CC.o)
02017BE0 0000000C .text sub_02017BE0 (main_0200C4CC.o)
02017BE8 00000000 .text $d (main_0200C4CC.o)
02017BEC 0000000C .text sub_02017BEC (main_0200C4CC.o)
02017BEC 00000000 .text $a (main_0200C4CC.o)
Expand Down Expand Up @@ -2335,7 +2335,7 @@
02017DF4 0000007C .text PlayBgmById (main_0200C4CC.o)
02017DF4 00000000 .text $a (main_0200C4CC.o)
02017E68 00000000 .text $d (main_0200C4CC.o)
02017E70 00000078 .text sub_02017E70 (main_0200C4CC.o)
02017E70 00000078 .text PlayBgmByIdVolume (main_0200C4CC.o)
02017E70 00000000 .text $a (main_0200C4CC.o)
02017EE0 00000000 .text $d (main_0200C4CC.o)
02017EE8 00000040 .text StopBgmCommand (main_0200C4CC.o)
Expand All @@ -2359,7 +2359,7 @@
02018024 00000000 .text $a (main_0200C4CC.o)
02018024 0000007C .text sub_02018024 (main_0200C4CC.o)
02018098 00000000 .text $d (main_0200C4CC.o)
020180A0 00000078 .text PlayBgmByIdVolume (main_0200C4CC.o)
020180A0 00000078 .text sub_020180A0 (main_0200C4CC.o)
020180A0 00000000 .text $a (main_0200C4CC.o)
02018110 00000000 .text $d (main_0200C4CC.o)
02018118 00000040 .text sub_02018118 (main_0200C4CC.o)
Expand Down Expand Up @@ -26068,7 +26068,7 @@
022C489C 00000000 .text ov10_022C489C (overlay_10.o)
022C48A0 00000000 .text ov10_022C48A0 (overlay_10.o)
022C48A4 00000000 .text SOLARBEAM_DAMAGE_MULTIPLIER (overlay_10.o)
022C48A8 00000000 .text ov10_022C48A8 (overlay_10.o)
022C48A8 00000000 .text SKY_ATTACK_DAMAGE_MULTIPLIER (overlay_10.o)
022C48AC 00000000 .text ov10_022C48AC (overlay_10.o)
022C48B0 00000000 .text RAZOR_WIND_DAMAGE_MULTIPLIER (overlay_10.o)
022C48B4 00000000 .text FOCUS_PUNCH_DAMAGE_MULTIPLIER (overlay_10.o)
Expand Down Expand Up @@ -38816,7 +38816,7 @@
023532B8 00000000 .text ov29_023532B8 (overlay_29_0234EC38.o)
023532C0 00000000 .text ov29_023532C0 (overlay_29_0234EC38.o)
023532C8 00000000 .text ov29_023532C8 (overlay_29_0234EC38.o)
023532D0 00000000 .text GUMMI_IQ_STRING_IDS (overlay_29_0234EC38.o)
023532D0 00000000 .text GUMMI_LIKE_STRING_IDS (overlay_29_0234EC38.o)
023532D8 00000000 .text ov29_023532D8 (overlay_29_0234EC38.o)
023532E0 00000000 .text ov29_023532E0 (overlay_29_0234EC38.o)
023532E8 00000000 .text ov29_023532E8 (overlay_29_0234EC38.o)
Expand Down Expand Up @@ -39783,5 +39783,5 @@
00000000 00000000 00004000 check.ITCM
00000000 00000000 00002880 check.DTCM

# Link start time: Wed Nov 22 05:19:35 2023
# Link end time: Wed Nov 22 05:19:36 2023
# Link start time: Wed Nov 22 21:15:10 2023
# Link end time: Wed Nov 22 21:15:10 2023

0 comments on commit affe3b8

Please sign in to comment.