Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added more DSE functions

Browse Source 
-Contributed by Rhokin.
This commit is contained in:
AnonymousRandomPerson 2024-01-28 22:31:27 -05:00
parent 044e3c395f
commit eeb593808a
6 changed files with 1052 additions and 1052 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
asm/include/main_0200C4CC.inc
View File

@ -787,6 +787,26 @@
.public DirectoryFileMngr_OpenDirectoryFile
.public DisableIqSkill
.public DrawTileGrid
.public DseBgm_IsPlaying
.public DseBgm_Load
.public DseBgm_SetFades
.public DseBgm_SetSignalCallback
.public DseBgm_Stop
.public DseBgm_Unload
.public DseDriver_ConfigureHeap
.public DseDriver_Init
.public DseDriver_LoadDefaultSettings
.public DseSe_GetUsedBankIDs
.public DseSe_HasPlayingInstances
.public DseSe_Load
.public DseSe_Play
.public DseSe_Stop
.public DseSe_StopAll
.public DseSe_Unload
.public DseSwd_LoadBank
.public DseSwd_LoadBankWavesFromMainBank
.public DseSwd_LoadMainBank
.public DseSwd_Unload
.public DUNGEON_DATA_LIST
.public DUNGEON_MOVE_TABLES
.public DUNGEON_PTR
@ -1099,33 +1119,13 @@
.public sub_0206ADA0
.public sub_0206ADB8
.public sub_0206BA5C
.public sub_0206C1C0
.public sub_0206C33C
.public sub_0206C36C
.public sub_0206C39C
.public sub_0206C3E0
.public sub_0206C620
.public sub_0206C6BC
.public sub_0206C754
.public sub_0206CED0
.public sub_0206D108
.public sub_0206D30C
.public sub_0206D328
.public sub_0206D4E4
.public sub_0206D808
.public sub_0206D90C
.public sub_0206D944
.public sub_0206D9A4
.public sub_0206DA9C
.public sub_0206DB3C
.public sub_0206E064
.public sub_0206EA18
.public sub_0206EBCC
.public sub_0206EC5C
.public sub_0206ED30
.public sub_0206EDFC
.public sub_0206F38C
.public sub_0206F4E0
.public sub_0206F5C8
.public sub_02079094
.public sub_0207A2DC

138
asm/include/main_02075600.inc
View File

@ -1702,6 +1702,74 @@
.public ARM9_UNKNOWN_DATA__NA_209EAAC
.public ARM9_UNKNOWN_TABLE__NA_20AE924
.public BaseFormsEqual
.public DseMem_Free
.public DseTrackEvent_Dummy1Byte
.public DseTrackEvent_Dummy2Bytes
.public DseTrackEvent_Dummy2Bytes2
.public DseTrackEvent_EndTrack
.public DseTrackEvent_ForceLfoEnvelopeLevel
.public DseTrackEvent_Invalid
.public DseTrackEvent_MainLoopBegin
.public DseTrackEvent_OctaveDelta
.public DseTrackEvent_PanDelta
.public DseTrackEvent_PanFade
.public DseTrackEvent_RestoreEnvelopeDefaults
.public DseTrackEvent_SetBank
.public DseTrackEvent_SetBankLsb
.public DseTrackEvent_SetBankMsb
.public DseTrackEvent_SetBpm
.public DseTrackEvent_SetBpm2
.public DseTrackEvent_SetEnvelopeAttackBegin
.public DseTrackEvent_SetEnvelopeAttackTime
.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel
.public DseTrackEvent_SetEnvelopeHoldTime
.public DseTrackEvent_SetEnvelopeReleaseTime
.public DseTrackEvent_SetEnvelopeSustainTime
.public DseTrackEvent_SetExpression
.public DseTrackEvent_SetFlagBit1Unknown
.public DseTrackEvent_SetHoldNotes
.public DseTrackEvent_SetInstrument
.public DseTrackEvent_SetKeyBend
.public DseTrackEvent_SetKeyBendRange
.public DseTrackEvent_SetLfoParameter
.public DseTrackEvent_SetNoteDurationMultiplier
.public DseTrackEvent_SetNoteRandomRegion
.public DseTrackEvent_SetOctave
.public DseTrackEvent_SetOptionalVolume
.public DseTrackEvent_SetPan
.public DseTrackEvent_SetTuning
.public DseTrackEvent_SetTuningJitterAmplitude
.public DseTrackEvent_SetUnknown2
.public DseTrackEvent_SetupKeyBendLfo
.public DseTrackEvent_SetupKeyBendLfoEnvelope
.public DseTrackEvent_SetupLfo
.public DseTrackEvent_SetupLfoEnvelope
.public DseTrackEvent_SetupPanLfo
.public DseTrackEvent_SetupPanLfoEnvelope
.public DseTrackEvent_SetupVolumeLfo
.public DseTrackEvent_SetupVolumeLfoEnvelope
.public DseTrackEvent_SetVolume
.public DseTrackEvent_Signal
.public DseTrackEvent_SongVolumeFade
.public DseTrackEvent_SubLoopBegin
.public DseTrackEvent_SubLoopBreakOnLastIteration
.public DseTrackEvent_SubLoopEnd
.public DseTrackEvent_TuningDeltaCoarse
.public DseTrackEvent_TuningDeltaFine
.public DseTrackEvent_TuningDeltaFull
.public DseTrackEvent_TuningFade
.public DseTrackEvent_UseKeyBendLfo
.public DseTrackEvent_UseLfo
.public DseTrackEvent_UsePanLfo
.public DseTrackEvent_UseVolumeLfo
.public DseTrackEvent_VolumeDelta
.public DseTrackEvent_VolumeFade
.public DseTrackEvent_Wait16
.public DseTrackEvent_Wait24
.public DseTrackEvent_Wait8
.public DseTrackEvent_WaitDelta
.public DseTrackEvent_WaitSame
.public DseTrackEvent_WaitUntilFadeout
.public DTCM_BSS
.public FX_AtanIdxTable_
.public GetKeyM2N
@ -1746,7 +1814,7 @@
.public SoundLfoWave_InvalidFunc
.public SoundLfoWave_ReverseSawFunc
.public SoundLfoWave_SawFunc
.public SoundUtil_GetRandomNumber
.public DseUtil_GetRandomNumber
.public sSubBGExtPltt
.public sTexPlttStartAddrTable
.public sTexStartAddrTable
@ -1894,77 +1962,9 @@
.public sub_0206074C
.public sub_02060804
.public sub_02060904
.public sub_0206CC14
.public sub_0206F808
.public sub_0206FD88
.public sub_0206FDE0
.public sub_0207191C
.public sub_02071928
.public sub_02071934
.public sub_0207194C
.public sub_0207195C
.public sub_02071978
.public sub_0207199C
.public sub_020719C8
.public sub_02071A14
.public sub_02071A1C
.public sub_02071A5C
.public sub_02071A98
.public sub_02071AC0
.public sub_02071ACC
.public sub_02071AE0
.public sub_02071B20
.public sub_02071B60
.public sub_02071B8C
.public sub_02071BBC
.public sub_02071BEC
.public sub_02071BF4
.public sub_02071C3C
.public sub_02071CC8
.public sub_02071CE0
.public sub_02071D00
.public sub_02071D20
.public sub_02071D40
.public sub_02071D70
.public sub_02071D90
.public sub_02071DB0
.public sub_02071DBC
.public sub_02071DD8
.public sub_02071E10
.public sub_02071E20
.public sub_02071E2C
.public sub_02071E34
.public sub_02071EB4
.public sub_02071F3C
.public sub_02071FC4
.public sub_02072054
.public sub_02072144
.public sub_0207216C
.public sub_02072184
.public sub_020721B0
.public sub_020721C8
.public sub_020721D4
.public sub_0207222C
.public sub_02072254
.public sub_0207227C
.public sub_02072310
.public sub_020723C0
.public sub_0207241C
.public sub_020724A8
.public sub_02072504
.public sub_0207252C
.public sub_02072554
.public sub_020725D4
.public sub_02072668
.public sub_020726C4
.public sub_02072720
.public sub_02072748
.public sub_02072770
.public sub_020727C8
.public sub_020727FC
.public sub_02072938
.public sub_0207296C
.public sub_0207299C
.public sub_02072D9C
.public sub_02072DBC
.public sub_02072DDC

132
asm/main_0200C4CC.s
View File

@ -16314,7 +16314,7 @@ InitSoundSystem: ; 0x02018C28
mov r1, #0
bl sub_0207C9C4
add r0, sp, #0x10
bl sub_0206C1C0
bl DseDriver_LoadDefaultSettings
mov r0, #0x10000
mov r1, #2
bl MemAlloc
@ -16330,7 +16330,7 @@ InitSoundSystem: ; 0x02018C28
str r0, [r1, #4]
ldr r1, [r1]
add r0, sp, #0x10
bl sub_0206C33C
bl DseDriver_ConfigureHeap
add r0, sp, #0x10
mov r1, #0
mov r2, #4
@ -16340,14 +16340,14 @@ InitSoundSystem: ; 0x02018C28
mov r2, #0xf
bl sub_0206C39C
add r0, sp, #0x10
bl sub_0206C3E0
bl DseDriver_Init
ldr r1, _02018E50 ; =_0209939C
add r0, sp, #8
bl sub_02019314
mov r1, #0
ldr r0, [sp, #8]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
mov r1, r0
ldr r2, _02018E54 ; =_022A4E58
ldr r0, _02018E58 ; =_020993B4
@ -16357,7 +16357,7 @@ InitSoundSystem: ; 0x02018C28
add r0, sp, #8
bl sub_02019314
ldr r0, [sp, #8]
bl sub_0206EA18
bl DseSe_Load
mov r1, r0
ldr r0, _02018E54 ; =_022A4E58
str r1, [r0, #0x7c]
@ -16369,7 +16369,7 @@ InitSoundSystem: ; 0x02018C28
mov r1, #0
ldr r0, [sp]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
mov r1, r0
ldr r2, _02018E54 ; =_022A4E58
ldr r0, _02018E68 ; =_02099418
@ -16379,7 +16379,7 @@ InitSoundSystem: ; 0x02018C28
add r0, sp, #0
bl sub_02019314
ldr r0, [sp]
bl sub_0206EA18
bl DseSe_Load
mov r1, r0
ldr r2, _02018E54 ; =_022A4E58
ldr r0, _02018E70 ; =_02099448
@ -16431,7 +16431,7 @@ _02018E04:
ldr r0, _02018EA0 ; =_020AFB4C
mov r2, r1
mov r3, r1
bl sub_0206CED0
bl DseSwd_LoadMainBank
ldr r1, _02018E54 ; =_022A4E58
str r0, [r1, #4]
ldr r0, _02018E44 ; =_020AFB28
@ -16479,7 +16479,7 @@ ManipBgmPlayback: ; 0x02018EA4
cmp r1, #2
bne _02018F0C
ldr r0, [r0]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _02018F0C
ldr r0, _02019050 ; =_022A4E58
@ -16499,7 +16499,7 @@ _02018F0C:
cmp r1, #2
bne _0201903C
ldr r0, [r0, #8]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _0201903C
ldr r0, _02019050 ; =_022A4E58
@ -16520,7 +16520,7 @@ _02018F5C:
cmpeq r1, #2
bne _0201903C
ldr r0, [r0, #0x10]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _0201903C
bl sub_02019508
@ -16600,7 +16600,7 @@ sub_0201906C: ; 0x0201906C
bne _020190B4
ldr r0, [r0, #0xdc]
mov r1, #0
bl sub_0206ED30
bl DseSe_HasPlayingInstances
cmp r0, #0
bne _020190B4
bl sub_02019790
@ -16646,13 +16646,13 @@ _0201910C:
bne _02019174
ldr r0, _02019254 ; =_022A4E58
ldr r0, [r0, #0x10]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
ble _02019174
ldr r0, _02019254 ; =_022A4E58
mov r1, #0
ldr r0, [r0, #0x10]
bl sub_0206DA9C
bl DseBgm_Stop
ldr r5, _0201924C ; =_020AFB28
ldr r4, _02019254 ; =_022A4E58
b _02019164
@ -16664,7 +16664,7 @@ _02019150:
bl sub_02002CB4
_02019164:
ldr r0, [r4, #0x10]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _02019150
_02019174:
@ -16686,9 +16686,9 @@ _020191A0:
bne _020191D4
ldr r0, [sb]
mov r1, r8
bl sub_0206DA9C
bl DseBgm_Stop
ldr r0, [sb]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _020191D4
bl sub_02019408
@ -16700,9 +16700,9 @@ _020191D4:
bne _02019208
ldr r0, [sb, #8]
mov r1, r5
bl sub_0206DA9C
bl DseBgm_Stop
ldr r0, [sb, #8]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _02019208
bl sub_02019488
@ -16880,12 +16880,12 @@ sub_02019408: ; 0x02019408
ldmneia sp!, {r3, pc}
ldr r0, _02019480 ; =_022A4E58
ldr r0, [r0]
bl sub_0206D90C
bl DseBgm_Unload
ldr r0, _02019480 ; =_022A4E58
ldr r0, [r0, #4]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206D4E4
bl DseSwd_Unload
ldr r0, _02019484 ; =_022A4E50
ldr r1, _02019480 ; =_022A4E58
ldr r0, [r0, #4]
@ -16917,12 +16917,12 @@ sub_02019488: ; 0x02019488
ldmneia sp!, {r3, pc}
ldr r0, _02019500 ; =_022A4E58
ldr r0, [r0, #8]
bl sub_0206D90C
bl DseBgm_Unload
ldr r0, _02019500 ; =_022A4E58
ldr r0, [r0, #0xc]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206D4E4
bl DseSwd_Unload
ldr r0, _02019504 ; =_022A4E50
ldr r1, _02019500 ; =_022A4E58
ldr r0, [r0, #4]
@ -16954,12 +16954,12 @@ sub_02019508: ; 0x02019508
ldmneia sp!, {r3, pc}
ldr r0, _0201956C ; =_022A4E58
ldr r0, [r0, #0x10]
bl sub_0206D90C
bl DseBgm_Unload
ldr r0, _0201956C ; =_022A4E58
ldr r0, [r0, #0x14]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206D4E4
bl DseSwd_Unload
ldr r0, _02019570 ; =_022A4E50
ldr r1, _0201956C ; =_022A4E58
ldr r0, [r0, #4]
@ -17026,14 +17026,14 @@ _020195C8:
bl sub_02002CB4
ldr r0, _02019760 ; =_022A4E58
ldr r0, [r0, #0x9c]
bl sub_0206EA18
bl DseSe_Load
ldr r2, _02019760 ; =_022A4E58
add r1, sp, #4
str r0, [r2, #0xc8]
add r0, r0, r5, lsl #16
str r0, [r2, #0xdc]
mov r2, #4
bl sub_0206EC5C
bl DseSe_GetUsedBankIDs
mov r7, r0
ldr r1, _02019778 ; =_020994D8
mov r2, r6
@ -17078,7 +17078,7 @@ _02019684:
mov r1, #0
ldr r0, [r0, #0xa4]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
add r1, r4, r8, lsl #2
str r0, [r1, #0xcc]
add r8, r8, #1
@ -17096,7 +17096,7 @@ _0201970C:
ldr r0, [r0, #0xc8]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206EBCC
bl DseSe_Unload
ldr r0, _0201978C ; =_022A4E50
ldr r1, _02019760 ; =_022A4E58
ldr r0, [r0, #4]
@ -17137,7 +17137,7 @@ _020197B4:
ldr r0, [r0, #0xcc]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206D4E4
bl DseSwd_Unload
add r1, r4, r6, lsl #3
ldr r0, [r7, #4]
ldr r1, [r1, #0xa4]
@ -17150,7 +17150,7 @@ _020197DC:
ldr r0, [r0, #0xc8]
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
bl sub_0206EBCC
bl DseSe_Unload
ldr r0, _02019820 ; =_022A4E50
ldr r1, _0201981C ; =_022A4E58
ldr r0, [r0, #4]
@ -17298,13 +17298,13 @@ _02019970:
mov r1, #0
ldr r0, [r0, #0x24]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
ldr r2, _02019B08 ; =_022A4E58
mov r1, r0, lsl #0x10
str r0, [r2, #4]
mov r0, r1, lsr #0x10
mov r1, #0
bl sub_0206D328
bl DseSwd_LoadBankWavesFromMainBank
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 sub_0206D328
bl DseSwd_LoadBankWavesFromMainBank
_02019A5C:
bl sub_02003AB0
bl sub_0206D30C
@ -17334,12 +17334,12 @@ _02019A5C:
bl sub_02002CB4
ldr r0, _02019B08 ; =_022A4E58
ldr r0, [r0, #0x34]
bl sub_0206D808
bl DseBgm_Load
ldr r3, _02019B08 ; =_022A4E58
ldr r1, _02019B24 ; =sub_0201AABC
mov r2, #0
str r0, [r3]
bl sub_0206D944
bl DseBgm_SetSignalCallback
mov r0, #0x3e8
mov r1, #4
str r1, [sp, #4]
@ -17418,7 +17418,7 @@ _02019B78:
ldr r2, _02019C44 ; =_022A4E58
mov r1, r1, lsr #0x10
ldr r0, [r2]
bl sub_0206DA9C
bl DseBgm_Stop
ldr r0, _02019C44 ; =_022A4E58
str r4, [sp]
ldrh r3, [r0, #0x20]
@ -17444,7 +17444,7 @@ _02019BF0:
bl sub_02002CB4
_02019C04:
ldr r0, [r4]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _02019BF0
bl sub_02019408
@ -17503,7 +17503,7 @@ ChangeBgm: ; 0x02019C50
add r1, sp, #0
str r3, [sp, #0xc]
str r2, [sp]
bl sub_0206DB3C
bl DseBgm_SetFades
_02019CE0:
ldr r0, _02019D00 ; =_022A4E58
strh r4, [r0, #0x22]
@ -17644,13 +17644,13 @@ _02019E3C:
mov r1, #0
ldr r0, [r0, #0x4c]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
ldr r2, _02019FC8 ; =_022A4E58
mov r1, r0, lsl #0x10
str r0, [r2, #0xc]
mov r0, r1, lsr #0x10
mov r1, #0
bl sub_0206D328
bl DseSwd_LoadBankWavesFromMainBank
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 sub_0206D328
bl DseSwd_LoadBankWavesFromMainBank
_02019F1C:
bl sub_02003AB0
bl sub_0206D30C
@ -17680,12 +17680,12 @@ _02019F1C:
bl sub_02002CB4
ldr r0, _02019FC8 ; =_022A4E58
ldr r0, [r0, #0x5c]
bl sub_0206D808
bl DseBgm_Load
ldr r3, _02019FC8 ; =_022A4E58
ldr r1, _02019FE4 ; =sub_0201AABC
mov r2, #0
str r0, [r3, #8]
bl sub_0206D944
bl DseBgm_SetSignalCallback
mov r0, #0x3e8
mov r1, #4
str r1, [sp, #4]
@ -17763,7 +17763,7 @@ _0201A034:
ldr r2, _0201A0E0 ; =_022A4E58
mov r1, r1, lsr #0x10
ldr r0, [r2, #8]
bl sub_0206DA9C
bl DseBgm_Stop
cmp r4, #0
beq _0201A084
ldr r0, _0201A0E0 ; =_022A4E58
@ -17782,7 +17782,7 @@ _0201A090:
bl sub_02002CB4
_0201A0A4:
ldr r0, [r4, #8]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _0201A090
bl sub_02019488
@ -17839,7 +17839,7 @@ ChangeBgm2: ; 0x0201A0E8
add r1, sp, #0
str r3, [sp, #0xc]
str r2, [sp]
bl sub_0206DB3C
bl DseBgm_SetFades
_0201A178:
ldr r0, _0201A198 ; =_022A4E58
strh r4, [r0, #0x4a]
@ -17905,7 +17905,7 @@ _0201A228:
ldr r0, _0201A3F8 ; =_022A4E58
mov r1, #0
ldr r0, [r0]
bl sub_0206DA9C
bl DseBgm_Stop
b _0201A268
_0201A250:
mov r0, r8
@ -17926,7 +17926,7 @@ _0201A270:
ldr r0, _0201A3F8 ; =_022A4E58
mov r1, #0
ldr r0, [r0, #8]
bl sub_0206DA9C
bl DseBgm_Stop
b _0201A304
_0201A298:
mov r0, r8
@ -17955,7 +17955,7 @@ _0201A2DC:
bl sub_02002CB4
_0201A2F0:
ldr r0, [r7, #0x10]
bl sub_0206D9A4
bl DseBgm_IsPlaying
cmp r0, #0
bne _0201A2DC
bl sub_02019508
@ -17986,11 +17986,11 @@ _0201A304:
mov r1, #0
ldr r0, [r0, #0x6c]
mov r2, r1
bl sub_0206D108
bl DseSwd_LoadBank
ldr r1, _0201A3F8 ; =_022A4E58
str r0, [r1, #0x14]
ldr r0, [r1, #0x74]
bl sub_0206D808
bl DseBgm_Load
ldr r1, _0201A3F8 ; =_022A4E58
mov r2, #4
str r0, [r1, #0x10]
@ -18053,7 +18053,7 @@ StopME: ; 0x0201A40C
ldr r2, _0201A47C ; =_022A4E58
mov r1, r1, lsr #0x10
ldr r0, [r2, #0x10]
bl sub_0206DA9C
bl DseBgm_Stop
_0201A468:
ldr r0, _0201A474 ; =_020AFB28
bl sub_02002E98
@ -18083,7 +18083,7 @@ sub_0201A480: ; 0x0201A480
mov r1, r5, lsl #0x10
ldr r0, [r0, #0x88]
mov r1, r1, lsr #0x10
bl sub_0206ED30
bl DseSe_HasPlayingInstances
cmp r0, #0
movgt r6, #1
b _0201A4E4
@ -18133,7 +18133,7 @@ PlaySe: ; 0x0201A4FC
mov r1, #0
add r0, r0, r4, lsl #16
str r0, [r3, #0x84]
bl sub_0206EDFC
bl DseSe_Play
b _0201A650
_0201A578:
cmp r6, #1
@ -18144,7 +18144,7 @@ _0201A578:
mov r1, #0
add r0, r0, r4, lsl #16
str r0, [r3, #0x90]
bl sub_0206EDFC
bl DseSe_Play
b _0201A650
_0201A5A0:
ldr r0, _0201A668 ; =_022A4E58
@ -18159,7 +18159,7 @@ _0201A5A0:
mov r1, #0
ldr r0, [r0, #0xdc]
mov r2, r1
bl sub_0206F38C
bl DseSe_Stop
ldr r8, _0201A660 ; =_020AFB28
mov r7, #0
ldr r6, _0201A668 ; =_022A4E58
@ -18173,7 +18173,7 @@ _0201A5E4:
_0201A5F8:
ldr r0, [r6, #0xdc]
mov r1, r7
bl sub_0206ED30
bl DseSe_HasPlayingInstances
cmp r0, #0
bgt _0201A5E4
_0201A60C:
@ -18193,7 +18193,7 @@ _0201A60C:
add r2, sp, #0
add r0, r0, r4, lsl #16
str r0, [r3, #0xdc]
bl sub_0206EDFC
bl DseSe_Play
_0201A650:
ldr r0, _0201A660 ; =_020AFB28
bl sub_02002E98
@ -18255,7 +18255,7 @@ PlaySeFullSpec: ; 0x0201A66C
mov r1, #0
add r0, r0, r5, lsl #16
str r0, [r3, #0x84]
bl sub_0206EDFC
bl DseSe_Play
b _0201A80C
_0201A734:
cmp r4, #1
@ -18266,7 +18266,7 @@ _0201A734:
mov r1, #0
add r0, r0, r5, lsl #16
str r0, [r3, #0x90]
bl sub_0206EDFC
bl DseSe_Play
b _0201A80C
_0201A75C:
ldr r0, _0201A824 ; =_022A4E58
@ -18281,7 +18281,7 @@ _0201A75C:
mov r1, #0
ldr r0, [r0, #0xdc]
mov r2, r1
bl sub_0206F38C
bl DseSe_Stop
ldr r7, _0201A81C ; =_020AFB28
mov r6, #0
ldr r4, _0201A824 ; =_022A4E58
@ -18295,7 +18295,7 @@ _0201A7A0:
_0201A7B4:
ldr r0, [r4, #0xdc]
mov r1, r6
bl sub_0206ED30
bl DseSe_HasPlayingInstances
cmp r0, #0
bgt _0201A7A0
_0201A7C8:
@ -18315,7 +18315,7 @@ _0201A7C8:
add r2, sp, #8
add r0, r0, r5, lsl #16
str r0, [r3, #0xdc]
bl sub_0206EDFC
bl DseSe_Play
_0201A80C:
ldr r0, _0201A81C ; =_020AFB28
bl sub_02002E98
@ -18470,7 +18470,7 @@ StopSe: ; 0x0201A9E4
cmp r7, #0x3f00
bne _0201AA2C
mov r0, #0
bl sub_0206F4E0
bl DseSe_StopAll
b _0201AA88
_0201AA2C:
cmp r4, #0
@ -18496,7 +18496,7 @@ _0201AA64:
mov r2, r1, lsr #0x10
mov r0, r4
mov r1, #0
bl sub_0206F38C
bl DseSe_Stop
_0201AA88:
ldr r0, _0201AA94 ; =_020AFB28
bl sub_02002E98

1558
asm/main_02054C24.s
View File

File diff suppressed because it is too large Load Diff

230
asm/main_02075600.s
View File

@ -25,7 +25,7 @@ sub_02075620: ; 0x02075620
beq _02075648
_02075634:
ldr r4, [r0, #0x500]
bl sub_0206CC14
bl DseMem_Free
mov r0, r4
cmp r4, #0
bne _02075634
@ -36,7 +36,7 @@ _02075648:
ldr r0, [r0, #0xec]
cmp r0, #0
beq _02075664
bl sub_0206CC14
bl DseMem_Free
_02075664:
ldr r0, _020756E4 ; =_022B9208
mov r1, #0
@ -44,7 +44,7 @@ _02075664:
ldr r0, [r0, #0x1b8]
cmp r0, #0
beq _02075680
bl sub_0206CC14
bl DseMem_Free
_02075680:
ldr r0, _020756E4 ; =_022B9208
mov r1, #0
@ -53618,118 +53618,118 @@ _020B0B7C:
.byte 0x10, 0x0C, 0x09, 0x08, 0x06, 0x04, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00
.global SMD_EVENTS_FUN_TABLE
SMD_EVENTS_FUN_TABLE:
.word sub_02071928
.word sub_02071934
.word sub_0207194C
.word sub_0207195C
.word sub_02071978
.word sub_0207199C
.word sub_0207191C
.word sub_0207191C
.word sub_020719C8
.word sub_02071A14
.word sub_0207191C
.word sub_0207191C
.word sub_02071A1C
.word sub_02071A5C
.word sub_02071A98
.word sub_0207191C
.word sub_02071AC0
.word sub_02071ACC
.word sub_0207191C
.word sub_0207191C
.word sub_02071AE0
.word sub_02071B20
.word sub_0207191C
.word sub_0207191C
.word sub_02071B60
.word sub_02071B8C
.word sub_02071BBC
.word sub_02071BEC
.word sub_02071BF4
.word sub_0207191C
.word sub_0207191C
.word sub_02071C3C
.word sub_02071CC8
.word sub_02071CE0
.word sub_02071D00
.word sub_02071D20
.word sub_02071D40
.word sub_02071D70
.word sub_02071D90
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_02071DB0
.word sub_0207191C
.word sub_02071DBC
.word sub_02071DD8
.word sub_02071E10
.word sub_0207191C
.word sub_0207191C
.word sub_02071E20
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_02071E2C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_02071E34
.word sub_02071EB4
.word sub_02071F3C
.word sub_02071FC4
.word sub_02072054
.word sub_02072144
.word sub_0207216C
.word sub_02072184
.word sub_020721B0
.word sub_0207191C
.word sub_0207191C
.word sub_020721C8
.word sub_020721D4
.word sub_0207222C
.word sub_0207191C
.word sub_02072254
.word sub_0207227C
.word sub_02072310
.word sub_020723C0
.word sub_0207241C
.word sub_020724A8
.word sub_02072504
.word sub_0207191C
.word sub_0207252C
.word sub_02072554
.word sub_020725D4
.word sub_02072668
.word sub_0207191C
.word sub_020726C4
.word sub_02072720
.word sub_0207191C
.word sub_02072748
.word sub_02072770
.word sub_020727C8
.word sub_020727FC
.word sub_02072938
.word sub_0207191C
.word sub_0207191C
.word sub_0207296C
.word sub_0207191C
.word sub_0207299C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word sub_0207191C
.word DseTrackEvent_WaitSame
.word DseTrackEvent_WaitDelta
.word DseTrackEvent_Wait8
.word DseTrackEvent_Wait16
.word DseTrackEvent_Wait24
.word DseTrackEvent_WaitUntilFadeout
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_EndTrack
.word DseTrackEvent_MainLoopBegin
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SubLoopBegin
.word DseTrackEvent_SubLoopEnd
.word DseTrackEvent_SubLoopBreakOnLastIteration
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetOctave
.word DseTrackEvent_OctaveDelta
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetBpm
.word DseTrackEvent_SetBpm2
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetBank
.word DseTrackEvent_SetBankMsb
.word DseTrackEvent_SetBankLsb
.word DseTrackEvent_Dummy1Byte
.word DseTrackEvent_SetInstrument
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SongVolumeFade
.word DseTrackEvent_RestoreEnvelopeDefaults
.word DseTrackEvent_SetEnvelopeAttackBegin
.word DseTrackEvent_SetEnvelopeAttackTime
.word DseTrackEvent_SetEnvelopeHoldTime
.word DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel
.word DseTrackEvent_SetEnvelopeSustainTime
.word DseTrackEvent_SetEnvelopeReleaseTime
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetNoteDurationMultiplier
.word DseTrackEvent_Invalid
.word DseTrackEvent_ForceLfoEnvelopeLevel
.word DseTrackEvent_SetHoldNotes
.word DseTrackEvent_SetFlagBit1Unknown
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetOptionalVolume
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Dummy2Bytes
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetTuning
.word DseTrackEvent_TuningDeltaCoarse
.word DseTrackEvent_TuningDeltaFine
.word DseTrackEvent_TuningDeltaFull
.word DseTrackEvent_TuningFade
.word DseTrackEvent_SetNoteRandomRegion
.word DseTrackEvent_SetTuningJitterAmplitude
.word DseTrackEvent_SetKeyBend
.word DseTrackEvent_SetUnknown2
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetKeyBendRange
.word DseTrackEvent_SetupKeyBendLfo
.word DseTrackEvent_SetupKeyBendLfoEnvelope
.word DseTrackEvent_Invalid
.word DseTrackEvent_UseKeyBendLfo
.word DseTrackEvent_SetVolume
.word DseTrackEvent_VolumeDelta
.word DseTrackEvent_VolumeFade
.word DseTrackEvent_SetExpression
.word DseTrackEvent_SetupVolumeLfo
.word DseTrackEvent_SetupVolumeLfoEnvelope
.word DseTrackEvent_Invalid
.word DseTrackEvent_UseVolumeLfo
.word DseTrackEvent_SetPan
.word DseTrackEvent_PanDelta
.word DseTrackEvent_PanFade
.word DseTrackEvent_Invalid
.word DseTrackEvent_SetupPanLfo
.word DseTrackEvent_SetupPanLfoEnvelope
.word DseTrackEvent_Invalid
.word DseTrackEvent_UsePanLfo
.word DseTrackEvent_SetupLfo
.word DseTrackEvent_SetupLfoEnvelope
.word DseTrackEvent_SetLfoParameter
.word DseTrackEvent_UseLfo
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Signal
.word DseTrackEvent_Invalid
.word DseTrackEvent_Dummy2Bytes2
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.word DseTrackEvent_Invalid
.global _020B0D50
_020B0D50:
.word sub_02072D9C

6
lib/DSE/src/dc_lfo_2.c
View File

@ -1,6 +1,6 @@
#include "dc_lfo_2.h"
extern s32 SoundUtil_GetRandomNumber();
extern s32 DseUtil_GetRandomNumber();
void SoundLfoBank_SetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level)
{
@ -222,7 +222,7 @@ s32 SoundLfoWave_HalfNoiseFunc(struct dse_lfo *lfo)
if (lfo->ticks_until_phase_change == 0)
{
lfo->ticks_until_phase_change = lfo->ticks_per_phase_change;
random = SoundUtil_GetRandomNumber();
random = DseUtil_GetRandomNumber();
lfo->current_output = (s32)((lfo->amplitude >> 0x10) * random);
}
lfo->ticks_until_phase_change--;
@ -238,7 +238,7 @@ s32 SoundLfoWave_FullNoiseFunc(struct dse_lfo *lfo)
{
lfo->ticks_until_phase_change = lfo->ticks_per_phase_change;
amplitude = lfo->amplitude;
random = SoundUtil_GetRandomNumber();
random = DseUtil_GetRandomNumber();
lfo->current_output = (s32)((amplitude >> 0xf) * random - (amplitude >> 1));
}
lfo->ticks_until_phase_change--;