Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added more DSE functions #62

Merged
merged 2 commits into from
Feb 10, 2024
Merged

Added more DSE functions #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa1d40
Added more DSE functions
AnonymousRandomPerson Feb 7, 2024
09b1e43
Detected subsymbol dirs in sync to pmdsky-debug
AnonymousRandomPerson Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions asm/include/main_0200C4CC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,11 @@
.public DseSe_Stop
.public DseSe_StopAll
.public DseSe_Unload
.public DseSequence_GetParameter
.public DseSwd_IsBankLoading
.public DseSwd_LoadBank
.public DseSwd_LoadBankWavesFromMainBank
.public DseSwd_LoadMainBank
.public DseSwd_LoadWaves
.public DseSwd_Unload
.public DUNGEON_DATA_LIST
.public DUNGEON_MOVE_TABLES
Expand Down Expand Up @@ -1124,8 +1126,6 @@
.public sub_0206C620
.public sub_0206C6BC
.public sub_0206C754
.public sub_0206D30C
.public sub_0206E064
.public sub_0206F5C8
.public sub_02079094
.public sub_0207A2DC
Expand Down
14 changes: 7 additions & 7 deletions asm/main_0200C4CC.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -17323,10 +17323,10 @@ _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
bl DseSwd_IsBankLoading
cmp r0, #0
bne _02019A5C
bl FileRom_StopDataTransfer
Expand Down Expand Up @@ -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
Expand All @@ -17669,10 +17669,10 @@ _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
bl DseSwd_IsBankLoading
cmp r0, #0
bne _02019F1C
bl FileRom_StopDataTransfer
Expand Down
Loading
Loading