Added more DSE functions

-Contributed by Rhokin.
pret · Feb 7, 2024 · 2c4f4a3 · 2c4f4a3
1 parent 2c24f0d
commit 2c4f4a3
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 60 deletions.
diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc
@@ -803,9 +803,10 @@
 .public DseSe_Stop
 .public DseSe_StopAll
 .public DseSe_Unload
+.public DseSequence_GetParameter
 .public DseSwd_LoadBank
-.public DseSwd_LoadBankWavesFromMainBank
 .public DseSwd_LoadMainBank
+.public DseSwd_LoadWaves
 .public DseSwd_Unload
 .public DUNGEON_DATA_LIST
 .public DUNGEON_MOVE_TABLES
@@ -1125,7 +1126,6 @@
 .public sub_0206C6BC
 .public sub_0206C754
 .public sub_0206D30C
-.public sub_0206E064
 .public sub_0206F5C8
 .public sub_02079094
 .public sub_0207A2DC

diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s
@@ -17195,7 +17195,7 @@ IsSongOver: ; 0x02019850
 	ldr r0, [r0]
 	add r2, sp, #0
 	mov r1, #0xa
-	bl sub_0206E064
+	bl DseSequence_GetParameter
 	ldr r0, _020198B4 ; =_022A4E58
 	ldr r2, [sp]
 	ldr r1, [r0, #0x40]
@@ -17304,7 +17304,7 @@ _02019970:
 	str r0, [r2, #4]
 	mov r0, r1, lsr #0x10
 	mov r1, #0
-	bl DseSwd_LoadBankWavesFromMainBank
+	bl DseSwd_LoadWaves
 	mov r1, r0
 	ldr r0, _02019B20 ; =_022A4E50
 	ldr r2, _02019B08 ; =_022A4E58
@@ -17323,7 +17323,7 @@ _02019970:
 	ldr r1, [r0, #0x2c]
 	mov r0, r2, lsl #0x10
 	mov r0, r0, lsr #0x10
-	bl DseSwd_LoadBankWavesFromMainBank
+	bl DseSwd_LoadWaves
 _02019A5C:
 	bl sub_02003AB0
 	bl sub_0206D30C
@@ -17650,7 +17650,7 @@ _02019E3C:
 	str r0, [r2, #0xc]
 	mov r0, r1, lsr #0x10
 	mov r1, #0
-	bl DseSwd_LoadBankWavesFromMainBank
+	bl DseSwd_LoadWaves
 	mov r1, r0
 	ldr r0, _02019FE0 ; =_022A4E50
 	ldr r2, _02019FC8 ; =_022A4E58
@@ -17669,7 +17669,7 @@ _02019E3C:
 	ldr r1, [r0, #0x54]
 	mov r0, r2, lsl #0x10
 	mov r0, r0, lsr #0x10
-	bl DseSwd_LoadBankWavesFromMainBank
+	bl DseSwd_LoadWaves
 _02019F1C:
 	bl sub_02003AB0
 	bl sub_0206D30C