diff options
| author | zelda2774 <69368340+zelda2774@users.noreply.github.com> | 2021-08-12 21:37:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 15:37:37 -0400 |
| commit | a0d2cceeca7e655010b0ec0589c09803104e8192 (patch) | |
| tree | 4174eb8bf1d9c12b7010f1d2de1eb9cb3831b920 /data | |
| parent | 1b1487a50466340c8b75ec21a31d4ce71055f034 (diff) | |
Match some audio functions (#896)
* cleanups
* Improve Audio_SequencePlayerProcessSequence
* cleanup
* labeling
* progress on func_800E5000
* func_800F6268
* func_800ECDF8
* Improve func_800F2464
* reorder variables
* labelling
* non-equivalent func_800EEA50
* minor doc
* func_800E6590
* minor doc
* Reformat abi.h
* Very slight improvements
* func_800DC384
* func_800E1618
* formatting
Co-authored-by: zelda2774 <zelda2774@invalid>
Diffstat (limited to 'data')
| -rw-r--r-- | data/code_800EC960.data.s | 42 | ||||
| -rw-r--r-- | data/rsp.rodata.s | 3 |
2 files changed, 11 insertions, 34 deletions
diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index 1013a9eef..8826f96ea 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -52,10 +52,7 @@ glabel D_801305F4 .incbin "baserom.z64", 0xBA7794, 0x4 glabel D_801305F8 - .incbin "baserom.z64", 0xBA7798, 0x7 - -glabel D_801305FF - .incbin "baserom.z64", 0xBA779F, 0x1 + .incbin "baserom.z64", 0xBA7798, 0x8 glabel D_80130600 .incbin "baserom.z64", 0xBA77A0, 0x4 @@ -181,10 +178,7 @@ glabel sPlaybackState .incbin "baserom.z64", 0xBA80D8, 0x4 glabel D_80130F3C - .incbin "baserom.z64", 0xBA80DC, 0x2 - -glabel D_80130F3E - .incbin "baserom.z64", 0xBA80DE, 0x2 + .incbin "baserom.z64", 0xBA80DC, 0x4 glabel sNotePlaybackTimer .incbin "baserom.z64", 0xBA80E0, 0x4 @@ -331,33 +325,18 @@ glabel D_80131CAC .incbin "baserom.z64", 0xBA8E4C, 0x15C glabel D_80131E08 - .incbin "baserom.z64", 0xBA8FA8, 0xC - -glabel D_80131E14 - .incbin "baserom.z64", 0xBA8FB4, 0xC + .incbin "baserom.z64", 0xBA8FA8, 0x18 glabel D_80131E20 - .incbin "baserom.z64", 0xBA8FC0, 0x4 - -glabel D_80131E24 - .incbin "baserom.z64", 0xBA8FC4, 0x14 + .incbin "baserom.z64", 0xBA8FC0, 0x18 glabel D_80131E38 .incbin "baserom.z64", 0xBA8FD8, 0xB - -glabel D_80131E43 - .incbin "baserom.z64", 0xBA8FE3, 0x16 - -glabel D_80131E59 + .incbin "baserom.z64", 0xBA8FE3, 0xB + .incbin "baserom.z64", 0xBA8FEE, 0xB .incbin "baserom.z64", 0xBA8FF9, 0xB - -glabel D_80131E64 .incbin "baserom.z64", 0xBA9004, 0xB - -glabel D_80131E6F .incbin "baserom.z64", 0xBA900F, 0xB - -glabel D_80131E7A .incbin "baserom.z64", 0xBA901A, 0xE glabel D_80131E88 @@ -378,10 +357,10 @@ glabel D_80131EC8 glabel D_80131ED0 .incbin "baserom.z64", 0xBA9070, 0x4 -glabel D_80131ED4 +glabel sAudioScreenPrintInd .incbin "baserom.z64", 0xBA9074, 0x4 -glabel D_80131ED8 +glabel sAudioScreenPrintOverflow .incbin "baserom.z64", 0xBA9078, 0x4 glabel D_80131EDC @@ -391,10 +370,7 @@ glabel D_80131EE0 .incbin "baserom.z64", 0xBA9080, 0x4 glabel D_80131EE4 - .incbin "baserom.z64", 0xBA9084, 0xA - -glabel D_80131EEE - .incbin "baserom.z64", 0xBA908E, 0x2 + .incbin "baserom.z64", 0xBA9084, 0xC glabel D_80131EF0 .incbin "baserom.z64", 0xBA9090, 0xC diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s index 21453d2a5..2dd4535a9 100644 --- a/data/rsp.rodata.s +++ b/data/rsp.rodata.s @@ -21,8 +21,9 @@ glabel gSequenceTable glabel gAudioTable .incbin "baserom.z64", 0xBCCD90, 0x80 -glabel D_80155C70 +glabel rspAspMainDataStart .incbin "baserom.z64", 0xBCCE10, 0x2E0 +glabel rspAspMainDataEnd glabel D_80155F50 .incbin "baserom.z64", 0xBCD0F0, 0x1630 |