Merge pull request #62 from AnonymousRandomPerson/main

pret · Feb 10, 2024 · 4f883da · 4f883da
1 parent 8a14da7
commit 4f883da
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP
@@ -7641,7 +7641,7 @@
   0206CD54 00000110 .text   DseMem_Allocate	(main_02054C24.o)
   0206CD54 00000000 .text   $a	(main_02054C24.o)
   0206CE5C 00000000 .text   $d	(main_02054C24.o)
-  0206CE64 00000148 .text   DseMem_Alloc2	(main_02054C24.o)
+  0206CE64 00000148 .text   DseMem_AllocateThreadStack	(main_02054C24.o)
   0206CE64 00000000 .text   $a	(main_02054C24.o)
   0206CFA4 00000000 .text   $d	(main_02054C24.o)
   0206CFAC 000000A8 .text   DseMem_Free	(main_02054C24.o)
@@ -7651,13 +7651,13 @@
   0206D054 00000000 .text   $a	(main_02054C24.o)
   0206D0B4 00000080 .text   DseFile_CheckHeader	(main_02054C24.o)
   0206D130 00000000 .text   $d	(main_02054C24.o)
-  0206D134 0000008C .text   sub_0206CD9C	(main_02054C24.o)
+  0206D134 0000008C .text   DseSwd_SysInit	(main_02054C24.o)
   0206D134 00000000 .text   $a	(main_02054C24.o)
   0206D1B0 00000000 .text   $d	(main_02054C24.o)
-  0206D1C0 00000040 .text   sub_0206CE28	(main_02054C24.o)
+  0206D1C0 00000040 .text   DseSwd_SysQuit	(main_02054C24.o)
   0206D1C0 00000000 .text   $a	(main_02054C24.o)
   0206D1F8 00000000 .text   $d	(main_02054C24.o)
-  0206D200 00000060 .text   sub_0206CE68	(main_02054C24.o)
+  0206D200 00000060 .text   DseSwd_SampleLoaderMain	(main_02054C24.o)
   0206D200 00000000 .text   $a	(main_02054C24.o)
   0206D25C 00000000 .text   $d	(main_02054C24.o)
   0206D260 00000000 .text   $a	(main_02054C24.o)
@@ -7667,13 +7667,13 @@
   0206D4A0 00000204 .text   DseSwd_LoadBank	(main_02054C24.o)
   0206D4A0 00000000 .text   $a	(main_02054C24.o)
   0206D67C 00000000 .text   $d	(main_02054C24.o)
-  0206D6A4 0000001C .text   sub_0206D30C	(main_02054C24.o)
+  0206D6A4 0000001C .text   DseSwd_IsBankLoading	(main_02054C24.o)
   0206D6A4 00000000 .text   $a	(main_02054C24.o)
   0206D6BC 00000000 .text   $d	(main_02054C24.o)
-  0206D6C0 000000B0 .text   DseSwd_LoadBankWavesFromMainBank	(main_02054C24.o)
+  0206D6C0 000000B0 .text   DseSwd_LoadWaves	(main_02054C24.o)
   0206D6C0 00000000 .text   $a	(main_02054C24.o)
   0206D768 00000000 .text   $d	(main_02054C24.o)
-  0206D770 0000010C .text   DseSwd_LoadWaves	(main_02054C24.o)
+  0206D770 0000010C .text   DseSwd_LoadWavesInternal	(main_02054C24.o)
   0206D770 00000000 .text   $a	(main_02054C24.o)
   0206D87C 00000074 .text   DseSwd_Unload	(main_02054C24.o)
   0206D8E8 00000000 .text   $d	(main_02054C24.o)
@@ -7719,10 +7719,10 @@
   0206E108 000002F4 .text   DseSequence_SetFades	(main_02054C24.o)
   0206E108 00000000 .text   $a	(main_02054C24.o)
   0206E3F4 00000000 .text   $d	(main_02054C24.o)
-  0206E3FC 000001B4 .text   sub_0206E064	(main_02054C24.o)
+  0206E3FC 000001B4 .text   DseSequence_GetParameter	(main_02054C24.o)
   0206E3FC 00000000 .text   $a	(main_02054C24.o)
   0206E5AC 00000000 .text   $d	(main_02054C24.o)
-  0206E5B0 00000054 .text   sub_0206E218	(main_02054C24.o)
+  0206E5B0 00000054 .text   DseSequence_GetSmallestNumLoops	(main_02054C24.o)
   0206E5B0 00000000 .text   $a	(main_02054C24.o)
   0206E600 00000000 .text   $d	(main_02054C24.o)
   0206E604 00000158 .text   DseSequence_Reset	(main_02054C24.o)
@@ -7748,7 +7748,7 @@
   0206EBEC 00000000 .text   $d	(main_02054C24.o)
   0206EBF4 00000000 .text   $a	(main_02054C24.o)
   0206EBF4 00000050 .text   DseSequence_InitTracks	(main_02054C24.o)
-  0206EC44 00000074 .text   sub_0206E8AC	(main_02054C24.o)
+  0206EC44 00000074 .text   DseBgm_SysSetupNoteList	(main_02054C24.o)
   0206ECAC 00000000 .text   $d	(main_02054C24.o)
   0206ECB8 00000000 .text   $a	(main_02054C24.o)
   0206ECB8 000000F8 .text   DseSe_SysReset	(main_02054C24.o)
@@ -7892,14 +7892,14 @@
   02071238 0000003C .text   sub_02070EA0	(main_02054C24.o)
   02071238 00000000 .text   $a	(main_02054C24.o)
   0207126C 00000000 .text   $d	(main_02054C24.o)
-  02071274 00000070 .text   sub_02070EDC	(main_02054C24.o)
+  02071274 00000070 .text   DseDriver_StartTickTimer	(main_02054C24.o)
   02071274 00000000 .text   $a	(main_02054C24.o)
   020712D4 00000000 .text   $d	(main_02054C24.o)
   020712E4 00000000 .text   $a	(main_02054C24.o)
   020712E4 00000088 .text   sub_02070F4C	(main_02054C24.o)
   0207135C 00000000 .text   $d	(main_02054C24.o)
   0207136C 00000000 .text   $a	(main_02054C24.o)
-  0207136C 00000040 .text   sub_02070FD4	(main_02054C24.o)
+  0207136C 00000040 .text   DseDriver_NotifyTick	(main_02054C24.o)
   020713A4 00000000 .text   $d	(main_02054C24.o)
   020713AC 00000000 .text   $a	(main_02054C24.o)
   020713AC 0000014C .text   DseDriver_Main	(main_02054C24.o)
@@ -8130,12 +8130,12 @@
   02074028 00000048 .text   DseChannel_SetKeyBend	(main_02054C24.o)
   02074070 00000090 .text   DseChannel_AllocateNote	(main_02054C24.o)
   020740FC 00000000 .text   $d	(main_02054C24.o)
-  02074100 000000A8 .text   DseChannel_ReleaseNote	(main_02054C24.o)
+  02074100 000000A8 .text   DseChannel_ReleaseNoteInternal	(main_02054C24.o)
   02074100 00000000 .text   $a	(main_02054C24.o)
   020741A4 00000000 .text   $d	(main_02054C24.o)
   020741A8 00000090 .text   DseChannel_ChangeNote	(main_02054C24.o)
   020741A8 00000000 .text   $a	(main_02054C24.o)
-  02074238 0000003C .text   DseChannel_ReleaseNote2	(main_02054C24.o)
+  02074238 0000003C .text   DseChannel_ReleaseNote	(main_02054C24.o)
   02074274 00000274 .text   DseVoice_PlayNote	(main_02054C24.o)
   020744DC 00000000 .text   $d	(main_02054C24.o)
   020744E8 00000044 .text   DseVoice_ReleaseNote	(main_02054C24.o)
@@ -39872,5 +39872,5 @@
   00000000 00000000 00004000 check.ITCM
   00000000 00000000 00002880 check.DTCM
 
-# Link start time: Mon Jan 29 04:13:49 2024
-# Link end time: Mon Jan 29 04:13:50 2024
+# Link start time: Sat Feb 10 23:10:40 2024
+# Link end time: Sat Feb 10 23:10:41 2024
diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP
@@ -7622,7 +7622,7 @@
   0206C9BC 00000110 .text   DseMem_Allocate	(main_02054C24.o)
   0206C9BC 00000000 .text   $a	(main_02054C24.o)
   0206CAC4 00000000 .text   $d	(main_02054C24.o)
-  0206CACC 00000148 .text   DseMem_Alloc2	(main_02054C24.o)
+  0206CACC 00000148 .text   DseMem_AllocateThreadStack	(main_02054C24.o)
   0206CACC 00000000 .text   $a	(main_02054C24.o)
   0206CC0C 00000000 .text   $d	(main_02054C24.o)
   0206CC14 000000A8 .text   DseMem_Free	(main_02054C24.o)
@@ -7632,13 +7632,13 @@
   0206CCBC 00000000 .text   $a	(main_02054C24.o)
   0206CD1C 00000080 .text   DseFile_CheckHeader	(main_02054C24.o)
   0206CD98 00000000 .text   $d	(main_02054C24.o)
-  0206CD9C 0000008C .text   sub_0206CD9C	(main_02054C24.o)
+  0206CD9C 0000008C .text   DseSwd_SysInit	(main_02054C24.o)
   0206CD9C 00000000 .text   $a	(main_02054C24.o)
   0206CE18 00000000 .text   $d	(main_02054C24.o)
-  0206CE28 00000040 .text   sub_0206CE28	(main_02054C24.o)
+  0206CE28 00000040 .text   DseSwd_SysQuit	(main_02054C24.o)
   0206CE28 00000000 .text   $a	(main_02054C24.o)
   0206CE60 00000000 .text   $d	(main_02054C24.o)
-  0206CE68 00000060 .text   sub_0206CE68	(main_02054C24.o)
+  0206CE68 00000060 .text   DseSwd_SampleLoaderMain	(main_02054C24.o)
   0206CE68 00000000 .text   $a	(main_02054C24.o)
   0206CEC4 00000000 .text   $d	(main_02054C24.o)
   0206CEC8 00000000 .text   $a	(main_02054C24.o)
@@ -7648,13 +7648,13 @@
   0206D108 00000204 .text   DseSwd_LoadBank	(main_02054C24.o)
   0206D108 00000000 .text   $a	(main_02054C24.o)
   0206D2E4 00000000 .text   $d	(main_02054C24.o)
-  0206D30C 0000001C .text   sub_0206D30C	(main_02054C24.o)
+  0206D30C 0000001C .text   DseSwd_IsBankLoading	(main_02054C24.o)
   0206D30C 00000000 .text   $a	(main_02054C24.o)
   0206D324 00000000 .text   $d	(main_02054C24.o)
-  0206D328 000000B0 .text   DseSwd_LoadBankWavesFromMainBank	(main_02054C24.o)
+  0206D328 000000B0 .text   DseSwd_LoadWaves	(main_02054C24.o)
   0206D328 00000000 .text   $a	(main_02054C24.o)
   0206D3D0 00000000 .text   $d	(main_02054C24.o)
-  0206D3D8 0000010C .text   DseSwd_LoadWaves	(main_02054C24.o)
+  0206D3D8 0000010C .text   DseSwd_LoadWavesInternal	(main_02054C24.o)
   0206D3D8 00000000 .text   $a	(main_02054C24.o)
   0206D4E4 00000074 .text   DseSwd_Unload	(main_02054C24.o)
   0206D550 00000000 .text   $d	(main_02054C24.o)
@@ -7700,10 +7700,10 @@
   0206DD70 000002F4 .text   DseSequence_SetFades	(main_02054C24.o)
   0206DD70 00000000 .text   $a	(main_02054C24.o)
   0206E05C 00000000 .text   $d	(main_02054C24.o)
-  0206E064 000001B4 .text   sub_0206E064	(main_02054C24.o)
+  0206E064 000001B4 .text   DseSequence_GetParameter	(main_02054C24.o)
   0206E064 00000000 .text   $a	(main_02054C24.o)
   0206E214 00000000 .text   $d	(main_02054C24.o)
-  0206E218 00000054 .text   sub_0206E218	(main_02054C24.o)
+  0206E218 00000054 .text   DseSequence_GetSmallestNumLoops	(main_02054C24.o)
   0206E218 00000000 .text   $a	(main_02054C24.o)
   0206E268 00000000 .text   $d	(main_02054C24.o)
   0206E26C 00000158 .text   DseSequence_Reset	(main_02054C24.o)
@@ -7729,7 +7729,7 @@
   0206E854 00000000 .text   $d	(main_02054C24.o)
   0206E85C 00000000 .text   $a	(main_02054C24.o)
   0206E85C 00000050 .text   DseSequence_InitTracks	(main_02054C24.o)
-  0206E8AC 00000074 .text   sub_0206E8AC	(main_02054C24.o)
+  0206E8AC 00000074 .text   DseBgm_SysSetupNoteList	(main_02054C24.o)
   0206E914 00000000 .text   $d	(main_02054C24.o)
   0206E920 00000000 .text   $a	(main_02054C24.o)
   0206E920 000000F8 .text   DseSe_SysReset	(main_02054C24.o)
@@ -7873,14 +7873,14 @@
   02070EA0 0000003C .text   sub_02070EA0	(main_02054C24.o)
   02070EA0 00000000 .text   $a	(main_02054C24.o)
   02070ED4 00000000 .text   $d	(main_02054C24.o)
-  02070EDC 00000070 .text   sub_02070EDC	(main_02054C24.o)
+  02070EDC 00000070 .text   DseDriver_StartTickTimer	(main_02054C24.o)
   02070EDC 00000000 .text   $a	(main_02054C24.o)
   02070F3C 00000000 .text   $d	(main_02054C24.o)
   02070F4C 00000000 .text   $a	(main_02054C24.o)
   02070F4C 00000088 .text   sub_02070F4C	(main_02054C24.o)
   02070FC4 00000000 .text   $d	(main_02054C24.o)
   02070FD4 00000000 .text   $a	(main_02054C24.o)
-  02070FD4 00000040 .text   sub_02070FD4	(main_02054C24.o)
+  02070FD4 00000040 .text   DseDriver_NotifyTick	(main_02054C24.o)
   0207100C 00000000 .text   $d	(main_02054C24.o)
   02071014 00000000 .text   $a	(main_02054C24.o)
   02071014 0000014C .text   DseDriver_Main	(main_02054C24.o)
@@ -8111,12 +8111,12 @@
   02073C90 00000048 .text   DseChannel_SetKeyBend	(main_02054C24.o)
   02073CD8 00000090 .text   DseChannel_AllocateNote	(main_02054C24.o)
   02073D64 00000000 .text   $d	(main_02054C24.o)
-  02073D68 000000A8 .text   DseChannel_ReleaseNote	(main_02054C24.o)
+  02073D68 000000A8 .text   DseChannel_ReleaseNoteInternal	(main_02054C24.o)
   02073D68 00000000 .text   $a	(main_02054C24.o)
   02073E0C 00000000 .text   $d	(main_02054C24.o)
   02073E10 00000090 .text   DseChannel_ChangeNote	(main_02054C24.o)
   02073E10 00000000 .text   $a	(main_02054C24.o)
-  02073EA0 0000003C .text   DseChannel_ReleaseNote2	(main_02054C24.o)
+  02073EA0 0000003C .text   DseChannel_ReleaseNote	(main_02054C24.o)
   02073EDC 00000274 .text   DseVoice_PlayNote	(main_02054C24.o)
   02074144 00000000 .text   $d	(main_02054C24.o)
   02074150 00000044 .text   DseVoice_ReleaseNote	(main_02054C24.o)
@@ -39838,5 +39838,5 @@
   00000000 00000000 00004000 check.ITCM
   00000000 00000000 00002880 check.DTCM
 
-# Link start time: Mon Jan 29 04:13:04 2024
-# Link end time: Mon Jan 29 04:13:05 2024
+# Link start time: Sat Feb 10 23:09:55 2024
+# Link end time: Sat Feb 10 23:09:56 2024