From ab5fa28f1c38abdb1eb6c42339af55cb6ddd5d0f Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 7 Apr 2022 01:52:18 -0700 Subject: [PATCH] Split out sinit data from bss.s, continue renaming globals --- Makefile | 2 +- asm/Dolphin/GBA/GBA.s | 12 +- asm/Dolphin/card/CARDBios.s | 2 +- asm/Dolphin/dtk.s | 1 + asm/Dolphin/pad/pad.s | 33 + asm/Dolphin/si/SIBios.s | 1 + asm/Dolphin/vi.s | 2 +- asm/Kyoto_CWD/main.s | 1 + asm/Runtime/FILE_POS.s | 6 + asm/Runtime/abort_exit.s | 15 + asm/Runtime/alloc.s | 5 + asm/Runtime/e_log.s | 6 + asm/Runtime/global_destructor_chain.s | 6 + asm/Runtime/runtime.s | 4 +- asm/Runtime/sbss.s | 29 - asm/Runtime/uart_console_io.s | 6 + asm/bss.s | 469 +------------ asm/bss_sinit.s | 443 ++++++++++++ asm/musyx/hardware.s | 211 +++--- asm/musyx/hw_aramdma.s | 136 ++-- asm/musyx/hw_dolphin.s | 4 +- asm/musyx/hw_dspctrl.s | 925 +++++++++++++------------- asm/musyx/hw_memory.s | 4 +- asm/musyx/reverb.s | 2 +- asm/musyx/s_data.s | 68 +- asm/musyx/sbss.s | 264 -------- asm/musyx/seq.s | 442 ++++++------ asm/musyx/snd3d.s | 181 +++-- asm/musyx/snd_init.s | 8 +- asm/musyx/snd_midictrl.s | 50 +- asm/musyx/snd_synthapi.s | 42 +- asm/musyx/stream.s | 53 +- asm/musyx/synth.s | 293 ++++---- asm/musyx/synth_vsamples.s | 54 +- asm/musyx/synthdata.s | 204 +++--- asm/musyx/synthmacros.s | 300 +++++---- asm/musyx/synthvoice.s | 313 +++++---- asm/rodata.s | 8 - asm/sbss.s | 30 - obj_files.mk | 5 +- 40 files changed, 2320 insertions(+), 2320 deletions(-) delete mode 100644 asm/Runtime/sbss.s create mode 100644 asm/bss_sinit.s delete mode 100644 asm/musyx/sbss.s diff --git a/Makefile b/Makefile index 62208eae..ed2e8e79 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(KYOTO_CWD) \ $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) $(OS_FILES) \ $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \ $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \ - $(GBA_FILES) + $(GBA_FILES) $(BSS_SINIT_O_FILES) ifeq ($(EPILOGUE_PROCESS),1) E_FILES := $(EPILOGUE_UNSCHEDULED) diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s index 82e3eac2..c79bb39f 100644 --- a/asm/Dolphin/GBA/GBA.s +++ b/asm/Dolphin/GBA/GBA.s @@ -1,7 +1,17 @@ .include "macros.inc" -.section .sbss, "wa" +.section .bss +.balign 4 +.global lbl_8056A0A0 +lbl_8056A0A0: + .skip 0x100 +.global __GBA +__GBA: + .skip 0x400 + +.section .sbss, "wa" +.balign 4 .global __GBAReset __GBAReset: .skip 0x4 diff --git a/asm/Dolphin/card/CARDBios.s b/asm/Dolphin/card/CARDBios.s index 3e231a6c..166422b7 100644 --- a/asm/Dolphin/card/CARDBios.s +++ b/asm/Dolphin/card/CARDBios.s @@ -20,7 +20,7 @@ lbl_805A8BF0: .skip 4 .section .sbss, "wa" - +.balign 4 .global lbl_805A9BC8 lbl_805A9BC8: .skip 0x8 diff --git a/asm/Dolphin/dtk.s b/asm/Dolphin/dtk.s index e5084b0e..ca780512 100644 --- a/asm/Dolphin/dtk.s +++ b/asm/Dolphin/dtk.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 4 .global lbl_805A9B98 lbl_805A9B98: .skip 0x4 diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s index 0ff04efe..9434af60 100644 --- a/asm/Dolphin/pad/pad.s +++ b/asm/Dolphin/pad/pad.s @@ -1,5 +1,38 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A9930 +lbl_805A9930: + .skip 0x4 +.global lbl_805A9934 +lbl_805A9934: + .skip 0x4 +.global lbl_805A9938 +lbl_805A9938: + .skip 0x4 +.global lbl_805A993C +lbl_805A993C: + .skip 0x4 +.global lbl_805A9940 +lbl_805A9940: + .skip 0x4 +.global lbl_805A9944 +lbl_805A9944: + .skip 0x4 +.global lbl_805A9948 +lbl_805A9948: + .skip 0x4 +.global lbl_805A994C +lbl_805A994C: + .skip 0x4 +.global lbl_805A9950 +lbl_805A9950: + .skip 0x4 +.global lbl_805A9954 +lbl_805A9954: + .skip 0x4 + .section .data, "wa" PAD_VERSION_STR: .asciz "<< Dolphin SDK - PAD\trelease build: Sep 5 2002 05:34:02 (0x2301) >>" diff --git a/asm/Dolphin/si/SIBios.s b/asm/Dolphin/si/SIBios.s index e7610f45..41dd4632 100644 --- a/asm/Dolphin/si/SIBios.s +++ b/asm/Dolphin/si/SIBios.s @@ -23,6 +23,7 @@ __SIVersion: .skip 4 .section .sbss, "wa" +.balign 4 .global lbl_805A9BD0 lbl_805A9BD0: .skip 0x4 diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index cdc92ec7..87c73f48 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -12,7 +12,7 @@ lbl_803F275C: .incbin "baserom.dol", 0x3EF75C, 0x1C .section .sbss, "wa" - +.balign 4 lbl_805A9958: .skip 0x4 lbl_805A995C: diff --git a/asm/Kyoto_CWD/main.s b/asm/Kyoto_CWD/main.s index 19d8d3e7..fb073265 100644 --- a/asm/Kyoto_CWD/main.s +++ b/asm/Kyoto_CWD/main.s @@ -804,6 +804,7 @@ lbl_805A6BCC: .section .sbss, "wa" +.balign 4 .global gpResourceFactory gpResourceFactory: .skip 0x4 diff --git a/asm/Runtime/FILE_POS.s b/asm/Runtime/FILE_POS.s index 727c6093..ddc0312f 100644 --- a/asm/Runtime/FILE_POS.s +++ b/asm/Runtime/FILE_POS.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A99D0 +lbl_805A99D0: + .skip 0x8 + .section .text, "ax" .global fseek diff --git a/asm/Runtime/abort_exit.s b/asm/Runtime/abort_exit.s index fec1705d..6ad1fb26 100644 --- a/asm/Runtime/abort_exit.s +++ b/asm/Runtime/abort_exit.s @@ -1,5 +1,20 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A99B8 +lbl_805A99B8: + .skip 0x4 +.global lbl_805A99BC +lbl_805A99BC: + .skip 0x4 +.global lbl_805A99C0 +lbl_805A99C0: + .skip 0x4 +.global lbl_805A99C4 +lbl_805A99C4: + .skip 0x4 + .section .text, "ax" .global exit diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 8889215f..35a9f1d9 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -5,6 +5,11 @@ lbl_803D85C0: .incbin "baserom.dol", 0x3D55C0, 0x18 +.section .sbss +.balign 4 +.global lbl_805A99C8 +lbl_805A99C8: + .skip 0x8 .section .text, "ax" diff --git a/asm/Runtime/e_log.s b/asm/Runtime/e_log.s index 8797fc37..261e1904 100644 --- a/asm/Runtime/e_log.s +++ b/asm/Runtime/e_log.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A99E0 +lbl_805A99E0: + .skip 0x8 + .section .text, "ax" .global __ieee754_log diff --git a/asm/Runtime/global_destructor_chain.s b/asm/Runtime/global_destructor_chain.s index e050b04b..129e4aaa 100644 --- a/asm/Runtime/global_destructor_chain.s +++ b/asm/Runtime/global_destructor_chain.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A99B0 +lbl_805A99B0: + .skip 0x8 + .section .text, "ax" .global __destroy_global_chain diff --git a/asm/Runtime/runtime.s b/asm/Runtime/runtime.s index 5293833f..da20ec45 100644 --- a/asm/Runtime/runtime.s +++ b/asm/Runtime/runtime.s @@ -161,8 +161,8 @@ _savegpr_25: _savegpr_26: /* 80389A78 003869D8 93 4B FF E8 */ stw r26, -0x18(r11) -.global sub_80389a7c -sub_80389a7c: +.global _savegpr_27 +_savegpr_27: /* 80389A7C 003869DC 93 6B FF EC */ stw r27, -0x14(r11) /* 80389A80 003869E0 93 8B FF F0 */ stw r28, -0x10(r11) /* 80389A84 003869E4 93 AB FF F4 */ stw r29, -0xc(r11) diff --git a/asm/Runtime/sbss.s b/asm/Runtime/sbss.s deleted file mode 100644 index 64cc5bdb..00000000 --- a/asm/Runtime/sbss.s +++ /dev/null @@ -1,29 +0,0 @@ -.section .sbss, "wa" - -.global lbl_805A99B0 -lbl_805A99B0: - .skip 0x8 -.global lbl_805A99B8 -lbl_805A99B8: - .skip 0x4 -.global lbl_805A99BC -lbl_805A99BC: - .skip 0x4 -.global lbl_805A99C0 -lbl_805A99C0: - .skip 0x4 -.global lbl_805A99C4 -lbl_805A99C4: - .skip 0x4 -.global lbl_805A99C8 -lbl_805A99C8: - .skip 0x8 -.global lbl_805A99D0 -lbl_805A99D0: - .skip 0x8 -.global lbl_805A99D8 -lbl_805A99D8: - .skip 0x8 -.global lbl_805A99E0 -lbl_805A99E0: - .skip 0x8 diff --git a/asm/Runtime/uart_console_io.s b/asm/Runtime/uart_console_io.s index 041975c4..b46da915 100644 --- a/asm/Runtime/uart_console_io.s +++ b/asm/Runtime/uart_console_io.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global lbl_805A99D8 +lbl_805A99D8: + .skip 0x8 + .section .text, "ax" .global __close_console diff --git a/asm/bss.s b/asm/bss.s index fe98c02a..efc80ec5 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -574,26 +574,26 @@ lbl_8055D324: .global lbl_8055D330 lbl_8055D330: .skip 0x20 -.global lbl_8055D350 -lbl_8055D350: +.global vidList +vidList: .skip 0xF00 -.global lbl_8055E250 -lbl_8055E250: +.global synth_last_fxstarted +synth_last_fxstarted: .skip 0x40 .global lbl_8055E290 lbl_8055E290: .skip 0x80 -.global lbl_8055E310 -lbl_8055E310: +.global vs +vs: .skip 0x950 .global lbl_8055EC60 lbl_8055EC60: .skip 0x600 -.global lbl_8055F260 -lbl_8055F260: +.global dspStudio +dspStudio: .skip 0x5E0 -.global lbl_8055F840 -lbl_8055F840: +.global "voices$217" +"voices$217": .skip 0x100 .global lbl_8055F940 lbl_8055F940: @@ -619,8 +619,8 @@ lbl_80564C90: .global lbl_80564D10 lbl_80564D10: .skip 0x2180 -.global lbl_80566E90 -lbl_80566E90: +.global inpFXChannelDefaults +inpFXChannelDefaults: .skip 0x40 .global lbl_80566ED0 lbl_80566ED0: @@ -697,447 +697,4 @@ lbl_80569F60: .global __THPMCUBuffer __THPMCUBuffer: .skip 0x28 -.global lbl_8056A0A0 -lbl_8056A0A0: - .skip 0x100 -.global __GBA -__GBA: - .skip 0x400 -.global lbl_8056A5A0 -lbl_8056A5A0: - .skip 0x48 -.global lbl_8056A5E8 -lbl_8056A5E8: - .skip 0xC -.global lbl_8056A5F4 -lbl_8056A5F4: - .skip 0xC -.global lbl_8056A600 -lbl_8056A600: - .skip 0x17F4 -.global lbl_8056BDF4 -lbl_8056BDF4: - .skip 0x4C4 -.global lbl_8056C2B8 -lbl_8056C2B8: - .skip 0x734 -.global lbl_8056C9EC -lbl_8056C9EC: - .skip 0x554 -.global lbl_8056CF40 -lbl_8056CF40: - .skip 0x4C4 -.global lbl_8056D404 -lbl_8056D404: - .skip 0xC -.global lbl_8056D410 -lbl_8056D410: - .skip 0x10 -.global lbl_8056D420 -lbl_8056D420: - .skip 0xD4 -.global lbl_8056D4F4 -lbl_8056D4F4: - .skip 0x84 -.global lbl_8056D578 -lbl_8056D578: - .skip 0x1A0 -.global lbl_8056D718 -lbl_8056D718: - .skip 0x68 -.global lbl_8056D780 -lbl_8056D780: - .skip 0x68 -.global lbl_8056D7E8 -lbl_8056D7E8: - .skip 0x68 -.global lbl_8056D850 -lbl_8056D850: - .skip 0x1F08 -.global lbl_8056F758 -lbl_8056F758: - .skip 0x104 -.global lbl_8056F85C -lbl_8056F85C: - .skip 0x38 -.global lbl_8056F894 -lbl_8056F894: - .skip 0x10 -.global lbl_8056F8A4 -lbl_8056F8A4: - .skip 0x10 -.global lbl_8056F8B4 -lbl_8056F8B4: - .skip 0x750 -.global lbl_80570004 -lbl_80570004: - .skip 0x948 -.global lbl_8057094C -lbl_8057094C: - .skip 0x1000 -.global lbl_8057194C -lbl_8057194C: - .skip 0x40 -.global lbl_8057198C -lbl_8057198C: - .skip 0x40 -.global lbl_805719CC -lbl_805719CC: - .skip 0x10 -.global lbl_805719DC -lbl_805719DC: - .skip 0xC -.global lbl_805719E8 -lbl_805719E8: - .skip 0x1A8 -.global lbl_80571B90 -lbl_80571B90: - .skip 0xD4 -.global lbl_80571C64 -lbl_80571C64: - .skip 0x208 -.global lbl_80571E6C -lbl_80571E6C: - .skip 0x68 -.global lbl_80571ED4 -lbl_80571ED4: - .skip 0x68 -.global lbl_80571F3C -lbl_80571F3C: - .skip 0x68 -.global lbl_80571FA4 -lbl_80571FA4: - .skip 0x68 -.global lbl_8057200C -lbl_8057200C: - .skip 0xC -.global lbl_80572018 -lbl_80572018: - .skip 0xC -.global lbl_80572024 -lbl_80572024: - .skip 0x18 -.global lbl_8057203C -lbl_8057203C: - .skip 0xC -.global lbl_80572048 -lbl_80572048: - .skip 0x18 -.global lbl_80572060 -lbl_80572060: - .skip 0xC -.global lbl_8057206C -lbl_8057206C: - .skip 0xC -.global lbl_80572078 -lbl_80572078: - .skip 0x60 -.global lbl_805720D8 -lbl_805720D8: - .skip 0x10 -.global lbl_805720E8 -lbl_805720E8: - .skip 0x10 -.global lbl_805720F8 -lbl_805720F8: - .skip 0x10 -.global lbl_80572108 -lbl_80572108: - .skip 0x10 -.global lbl_80572118 -lbl_80572118: - .skip 0x10 -.global lbl_80572128 -lbl_80572128: - .skip 0xC -.global lbl_80572134 -lbl_80572134: - .skip 0xC -.global lbl_80572140 -lbl_80572140: - .skip 0x2A0 -.global lbl_805723E0 -lbl_805723E0: - .skip 0x18 -.global lbl_805723F8 -lbl_805723F8: - .skip 0xC -.global lbl_80572404 -lbl_80572404: - .skip 0x110 -.global lbl_80572514 -lbl_80572514: - .skip 0x10 -.global lbl_80572524 -lbl_80572524: - .skip 0x10 -.global lbl_80572534 -lbl_80572534: - .skip 0x10 -.global lbl_80572544 -lbl_80572544: - .skip 0x68 -.global lbl_805725AC -lbl_805725AC: - .skip 0x68 -.global lbl_80572614 -lbl_80572614: - .skip 0x74 -.global lbl_80572688 -lbl_80572688: - .skip 0xC -.global lbl_80572694 -lbl_80572694: - .skip 0x68 -.global lbl_805726FC -lbl_805726FC: - .skip 0x4B0 -.global lbl_80572BAC -lbl_80572BAC: - .skip 0x19000 -.global lbl_8058BBAC -lbl_8058BBAC: - .skip 0xC000 -.global lbl_80597BAC -lbl_80597BAC: - .skip 0x8000 -.global lbl_8059FBAC -lbl_8059FBAC: - .skip 0x18 -.global lbl_8059FBC4 -lbl_8059FBC4: - .skip 0xC -.global lbl_8059FBD0 -lbl_8059FBD0: - .skip 0xA8 -.global lbl_8059FC78 -lbl_8059FC78: - .skip 0x18 -.global lbl_8059FC90 -lbl_8059FC90: - .skip 0x18 -.global lbl_8059FCA8 -lbl_8059FCA8: - .skip 0x18 -.global lbl_8059FCC0 -lbl_8059FCC0: - .skip 0x18 -.global lbl_8059FCD8 -lbl_8059FCD8: - .skip 0x18 -.global lbl_8059FCF0 -lbl_8059FCF0: - .skip 0x18 -.global lbl_8059FD08 -lbl_8059FD08: - .skip 0x10 -.global lbl_8059FD18 -lbl_8059FD18: - .skip 0x18 -.global mData__10CStopwatch -mData__10CStopwatch: - .skip 0x18 -.global lbl_8059FD48 -lbl_8059FD48: - .skip 0x2BC -.global lbl_805A0004 -lbl_805A0004: - .skip 0x2B5C -.global lbl_805A2B60 -lbl_805A2B60: - .skip 0x1604 -.global lbl_805A4164 -lbl_805A4164: - .skip 0xA04 -.global lbl_805A4B68 -lbl_805A4B68: - .skip 0x1E0 -.global lbl_805A4D48 -lbl_805A4D48: - .skip 0x9C -.global lbl_805A4DE4 -lbl_805A4DE4: - .skip 0x154 -.global lbl_805A4F38 -lbl_805A4F38: - .skip 0x60 -.global lbl_805A4F98 -lbl_805A4F98: - .skip 0x1E0 -.global lbl_805A5178 -lbl_805A5178: - .skip 0x9C -.global lbl_805A5214 -lbl_805A5214: - .skip 0x154 -.global lbl_805A5368 -lbl_805A5368: - .skip 0x60 -.global lbl_805A53C8 -lbl_805A53C8: - .skip 0x18 -.global lbl_805A53E0 -lbl_805A53E0: - .skip 0xC -.global lbl_805A53EC -lbl_805A53EC: - .skip 0x260 -.global lbl_805A564C -lbl_805A564C: - .skip 0x4C -.global lbl_805A5698 -lbl_805A5698: - .skip 0x7D8 -.global lbl_805A5E70 -lbl_805A5E70: - .skip 0x4C -.global lbl_805A5EBC -lbl_805A5EBC: - .skip 0x4C -.global lbl_805A5F08 -lbl_805A5F08: - .skip 0x4C -.global lbl_805A5F54 -lbl_805A5F54: - .skip 0x4C -.global lbl_805A5FA0 -lbl_805A5FA0: - .skip 0x4C -.global lbl_805A5FEC -lbl_805A5FEC: - .skip 0x4C -.global lbl_805A6038 -lbl_805A6038: - .skip 0x4C -.global lbl_805A6084 -lbl_805A6084: - .skip 0x4C -.global lbl_805A60D0 -lbl_805A60D0: - .skip 0xA0 -.global lbl_805A6170 -lbl_805A6170: - .skip 0x30 -.global lbl_805A61A0 -lbl_805A61A0: - .skip 0xC -.global lbl_805A61AC -lbl_805A61AC: - .skip 0xC -.global lbl_805A61B8 -lbl_805A61B8: - .skip 0x1C -.global lbl_805A61D4 -lbl_805A61D4: - .skip 0x30 -.global lbl_805A6204 -lbl_805A6204: - .skip 0x30 -.global lbl_805A6234 -lbl_805A6234: - .skip 0xC -.global lbl_805A6240 -lbl_805A6240: - .skip 0x200 -.global lbl_805A6440 -lbl_805A6440: - .skip 0x80 -.global lbl_805A64C0 -lbl_805A64C0: - .skip 0x40 -.global lbl_805A6500 -lbl_805A6500: - .skip 0x3C -.global lbl_805A653C -lbl_805A653C: - .skip 0x30 -.global lbl_805A656C -lbl_805A656C: - .skip 0x30 -.global lbl_805A659C -lbl_805A659C: - .skip 0x30 -.global lbl_805A65CC -lbl_805A65CC: - .skip 0x30 -.global lbl_805A65FC -lbl_805A65FC: - .skip 0x24 -.global lbl_805A6620 -lbl_805A6620: - .skip 0x40 -.global lbl_805A6660 -lbl_805A6660: - .skip 0x10 -.global lbl_805A6670 -lbl_805A6670: - .skip 0x30 -.global lbl_805A66A0 -lbl_805A66A0: - .skip 0x54 -.global lbl_805A66F4 -lbl_805A66F4: - .skip 0xC -.global lbl_805A6700 -lbl_805A6700: - .skip 0xC -.global lbl_805A670C -lbl_805A670C: - .skip 0xC -.global lbl_805A6718 -lbl_805A6718: - .skip 0xC -.global lbl_805A6724 -lbl_805A6724: - .skip 0xC -.global lbl_805A6730 -lbl_805A6730: - .skip 0xC -.global lbl_805A673C -lbl_805A673C: - .skip 0x18 -.global lbl_805A6754 -lbl_805A6754: - .skip 0x30 -.global lbl_805A6784 -lbl_805A6784: - .skip 0x18 -.global lbl_805A679C -lbl_805A679C: - .skip 0x18 -.global lbl_805A67B4 -lbl_805A67B4: - .skip 0xC -.global lbl_805A67C0 -lbl_805A67C0: - .skip 0xC -.global lbl_805A67CC -lbl_805A67CC: - .skip 0x10 -.global lbl_805A67DC -lbl_805A67DC: - .skip 0x20 -.global lbl_805A67FC -lbl_805A67FC: - .skip 0x10 -.global lbl_805A680C -lbl_805A680C: - .skip 0x1C -.global lbl_805A6828 -lbl_805A6828: - .skip 0x38 -.global lbl_805A6860 -lbl_805A6860: - .skip 0x300 -.global lbl_805A6B60 -lbl_805A6B60: - .skip 0x30 -.global lbl_805A6B90 -lbl_805A6B90: - .skip 0x10 -.global lbl_805A6BA0 -lbl_805A6BA0: - .skip 0x4 -.global lbl_805A6BA8 -lbl_805A6BA8: - .skip 0xC + diff --git a/asm/bss_sinit.s b/asm/bss_sinit.s new file mode 100644 index 00000000..777473dc --- /dev/null +++ b/asm/bss_sinit.s @@ -0,0 +1,443 @@ +.include "macros.inc" + +# Data used by the __sinit_* functions + +.section .bss, "wa" +.global lbl_8056A5A0 +lbl_8056A5A0: + .skip 0x48 +.global lbl_8056A5E8 +lbl_8056A5E8: + .skip 0xC +.global lbl_8056A5F4 +lbl_8056A5F4: + .skip 0xC +.global lbl_8056A600 +lbl_8056A600: + .skip 0x17F4 +.global lbl_8056BDF4 +lbl_8056BDF4: + .skip 0x4C4 +.global lbl_8056C2B8 +lbl_8056C2B8: + .skip 0x734 +.global lbl_8056C9EC +lbl_8056C9EC: + .skip 0x554 +.global lbl_8056CF40 +lbl_8056CF40: + .skip 0x4C4 +.global lbl_8056D404 +lbl_8056D404: + .skip 0xC +.global lbl_8056D410 +lbl_8056D410: + .skip 0x10 +.global lbl_8056D420 +lbl_8056D420: + .skip 0xD4 +.global lbl_8056D4F4 +lbl_8056D4F4: + .skip 0x84 +.global lbl_8056D578 +lbl_8056D578: + .skip 0x1A0 +.global lbl_8056D718 +lbl_8056D718: + .skip 0x68 +.global lbl_8056D780 +lbl_8056D780: + .skip 0x68 +.global lbl_8056D7E8 +lbl_8056D7E8: + .skip 0x68 +.global lbl_8056D850 +lbl_8056D850: + .skip 0x1F08 +.global lbl_8056F758 +lbl_8056F758: + .skip 0x104 +.global lbl_8056F85C +lbl_8056F85C: + .skip 0x38 +.global lbl_8056F894 +lbl_8056F894: + .skip 0x10 +.global lbl_8056F8A4 +lbl_8056F8A4: + .skip 0x10 +.global lbl_8056F8B4 +lbl_8056F8B4: + .skip 0x750 +.global lbl_80570004 +lbl_80570004: + .skip 0x948 +.global lbl_8057094C +lbl_8057094C: + .skip 0x1000 +.global lbl_8057194C +lbl_8057194C: + .skip 0x40 +.global lbl_8057198C +lbl_8057198C: + .skip 0x40 +.global lbl_805719CC +lbl_805719CC: + .skip 0x10 +.global lbl_805719DC +lbl_805719DC: + .skip 0xC +.global lbl_805719E8 +lbl_805719E8: + .skip 0x1A8 +.global lbl_80571B90 +lbl_80571B90: + .skip 0xD4 +.global lbl_80571C64 +lbl_80571C64: + .skip 0x208 +.global lbl_80571E6C +lbl_80571E6C: + .skip 0x68 +.global lbl_80571ED4 +lbl_80571ED4: + .skip 0x68 +.global lbl_80571F3C +lbl_80571F3C: + .skip 0x68 +.global lbl_80571FA4 +lbl_80571FA4: + .skip 0x68 +.global lbl_8057200C +lbl_8057200C: + .skip 0xC +.global lbl_80572018 +lbl_80572018: + .skip 0xC +.global lbl_80572024 +lbl_80572024: + .skip 0x18 +.global lbl_8057203C +lbl_8057203C: + .skip 0xC +.global lbl_80572048 +lbl_80572048: + .skip 0x18 +.global lbl_80572060 +lbl_80572060: + .skip 0xC +.global lbl_8057206C +lbl_8057206C: + .skip 0xC +.global lbl_80572078 +lbl_80572078: + .skip 0x60 +.global lbl_805720D8 +lbl_805720D8: + .skip 0x10 +.global lbl_805720E8 +lbl_805720E8: + .skip 0x10 +.global lbl_805720F8 +lbl_805720F8: + .skip 0x10 +.global lbl_80572108 +lbl_80572108: + .skip 0x10 +.global lbl_80572118 +lbl_80572118: + .skip 0x10 +.global lbl_80572128 +lbl_80572128: + .skip 0xC +.global lbl_80572134 +lbl_80572134: + .skip 0xC +.global lbl_80572140 +lbl_80572140: + .skip 0x2A0 +.global lbl_805723E0 +lbl_805723E0: + .skip 0x18 +.global lbl_805723F8 +lbl_805723F8: + .skip 0xC +.global lbl_80572404 +lbl_80572404: + .skip 0x110 +.global lbl_80572514 +lbl_80572514: + .skip 0x10 +.global lbl_80572524 +lbl_80572524: + .skip 0x10 +.global lbl_80572534 +lbl_80572534: + .skip 0x10 +.global lbl_80572544 +lbl_80572544: + .skip 0x68 +.global lbl_805725AC +lbl_805725AC: + .skip 0x68 +.global lbl_80572614 +lbl_80572614: + .skip 0x74 +.global lbl_80572688 +lbl_80572688: + .skip 0xC +.global lbl_80572694 +lbl_80572694: + .skip 0x68 +.global lbl_805726FC +lbl_805726FC: + .skip 0x4B0 +.global lbl_80572BAC +lbl_80572BAC: + .skip 0x19000 +.global lbl_8058BBAC +lbl_8058BBAC: + .skip 0xC000 +.global lbl_80597BAC +lbl_80597BAC: + .skip 0x8000 +.global lbl_8059FBAC +lbl_8059FBAC: + .skip 0x18 +.global lbl_8059FBC4 +lbl_8059FBC4: + .skip 0xC +.global lbl_8059FBD0 +lbl_8059FBD0: + .skip 0xA8 +.global lbl_8059FC78 +lbl_8059FC78: + .skip 0x18 +.global lbl_8059FC90 +lbl_8059FC90: + .skip 0x18 +.global lbl_8059FCA8 +lbl_8059FCA8: + .skip 0x18 +.global lbl_8059FCC0 +lbl_8059FCC0: + .skip 0x18 +.global lbl_8059FCD8 +lbl_8059FCD8: + .skip 0x18 +.global lbl_8059FCF0 +lbl_8059FCF0: + .skip 0x18 +.global lbl_8059FD08 +lbl_8059FD08: + .skip 0x10 +.global lbl_8059FD18 +lbl_8059FD18: + .skip 0x18 +.global mData__10CStopwatch +mData__10CStopwatch: + .skip 0x18 +.global lbl_8059FD48 +lbl_8059FD48: + .skip 0x2BC +.global lbl_805A0004 +lbl_805A0004: + .skip 0x2B5C +.global lbl_805A2B60 +lbl_805A2B60: + .skip 0x1604 +.global lbl_805A4164 +lbl_805A4164: + .skip 0xA04 +.global lbl_805A4B68 +lbl_805A4B68: + .skip 0x1E0 +.global lbl_805A4D48 +lbl_805A4D48: + .skip 0x9C +.global lbl_805A4DE4 +lbl_805A4DE4: + .skip 0x154 +.global lbl_805A4F38 +lbl_805A4F38: + .skip 0x60 +.global lbl_805A4F98 +lbl_805A4F98: + .skip 0x1E0 +.global lbl_805A5178 +lbl_805A5178: + .skip 0x9C +.global lbl_805A5214 +lbl_805A5214: + .skip 0x154 +.global lbl_805A5368 +lbl_805A5368: + .skip 0x60 +.global lbl_805A53C8 +lbl_805A53C8: + .skip 0x18 +.global lbl_805A53E0 +lbl_805A53E0: + .skip 0xC +.global lbl_805A53EC +lbl_805A53EC: + .skip 0x260 +.global lbl_805A564C +lbl_805A564C: + .skip 0x4C +.global lbl_805A5698 +lbl_805A5698: + .skip 0x7D8 +.global lbl_805A5E70 +lbl_805A5E70: + .skip 0x4C +.global lbl_805A5EBC +lbl_805A5EBC: + .skip 0x4C +.global lbl_805A5F08 +lbl_805A5F08: + .skip 0x4C +.global lbl_805A5F54 +lbl_805A5F54: + .skip 0x4C +.global lbl_805A5FA0 +lbl_805A5FA0: + .skip 0x4C +.global lbl_805A5FEC +lbl_805A5FEC: + .skip 0x4C +.global lbl_805A6038 +lbl_805A6038: + .skip 0x4C +.global lbl_805A6084 +lbl_805A6084: + .skip 0x4C +.global lbl_805A60D0 +lbl_805A60D0: + .skip 0xA0 +.global lbl_805A6170 +lbl_805A6170: + .skip 0x30 +.global lbl_805A61A0 +lbl_805A61A0: + .skip 0xC +.global lbl_805A61AC +lbl_805A61AC: + .skip 0xC +.global lbl_805A61B8 +lbl_805A61B8: + .skip 0x1C +.global lbl_805A61D4 +lbl_805A61D4: + .skip 0x30 +.global lbl_805A6204 +lbl_805A6204: + .skip 0x30 +.global lbl_805A6234 +lbl_805A6234: + .skip 0xC +.global lbl_805A6240 +lbl_805A6240: + .skip 0x200 +.global lbl_805A6440 +lbl_805A6440: + .skip 0x80 +.global lbl_805A64C0 +lbl_805A64C0: + .skip 0x40 +.global lbl_805A6500 +lbl_805A6500: + .skip 0x3C +.global lbl_805A653C +lbl_805A653C: + .skip 0x30 +.global lbl_805A656C +lbl_805A656C: + .skip 0x30 +.global lbl_805A659C +lbl_805A659C: + .skip 0x30 +.global lbl_805A65CC +lbl_805A65CC: + .skip 0x30 +.global lbl_805A65FC +lbl_805A65FC: + .skip 0x24 +.global lbl_805A6620 +lbl_805A6620: + .skip 0x40 +.global lbl_805A6660 +lbl_805A6660: + .skip 0x10 +.global lbl_805A6670 +lbl_805A6670: + .skip 0x30 +.global lbl_805A66A0 +lbl_805A66A0: + .skip 0x54 +.global lbl_805A66F4 +lbl_805A66F4: + .skip 0xC +.global lbl_805A6700 +lbl_805A6700: + .skip 0xC +.global lbl_805A670C +lbl_805A670C: + .skip 0xC +.global lbl_805A6718 +lbl_805A6718: + .skip 0xC +.global lbl_805A6724 +lbl_805A6724: + .skip 0xC +.global lbl_805A6730 +lbl_805A6730: + .skip 0xC +.global lbl_805A673C +lbl_805A673C: + .skip 0x18 +.global lbl_805A6754 +lbl_805A6754: + .skip 0x30 +.global lbl_805A6784 +lbl_805A6784: + .skip 0x18 +.global lbl_805A679C +lbl_805A679C: + .skip 0x18 +.global lbl_805A67B4 +lbl_805A67B4: + .skip 0xC +.global lbl_805A67C0 +lbl_805A67C0: + .skip 0xC +.global lbl_805A67CC +lbl_805A67CC: + .skip 0x10 +.global lbl_805A67DC +lbl_805A67DC: + .skip 0x20 +.global lbl_805A67FC +lbl_805A67FC: + .skip 0x10 +.global lbl_805A680C +lbl_805A680C: + .skip 0x1C +.global lbl_805A6828 +lbl_805A6828: + .skip 0x38 +.global lbl_805A6860 +lbl_805A6860: + .skip 0x300 +.global lbl_805A6B60 +lbl_805A6B60: + .skip 0x30 +.global lbl_805A6B90 +lbl_805A6B90: + .skip 0x10 +.global lbl_805A6BA0 +lbl_805A6BA0: + .skip 0x4 +.global lbl_805A6BA8 +lbl_805A6BA8: + .skip 0xC diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index cef0735d..97a1dcaa 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -1,5 +1,26 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global salTimeOffset +salTimeOffset: + .skip 0x4 +.global salHooks +salHooks: + .skip 0x8 +.global salMaxStudioNum +salMaxStudioNum: + .skip 0x1 +.global salNumVoices +salNumVoices: + .skip 0x1 +.global salAuxFrame +salAuxFrame: + .skip 0x1 +.global salFrame +salFrame: + .skip 0x1 + .section .sdata, "wa" .global lbl_805A8BD8 lbl_805A8BD8: @@ -28,7 +49,7 @@ snd_handle_irq: /* 803B2F50 003AFEB0 7C 08 02 A6 */ mflr r0 /* 803B2F54 003AFEB4 90 01 00 14 */ stw r0, 0x14(r1) /* 803B2F58 003AFEB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803B2F5C 003AFEBC 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803B2F5C 003AFEBC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803B2F60 003AFEC0 28 00 00 00 */ cmplwi r0, 0 /* 803B2F64 003AFEC4 41 82 01 28 */ beq lbl_803B308C /* 803B2F68 003AFEC8 4B FE A2 F1 */ bl nullsub_60 @@ -40,25 +61,25 @@ snd_handle_irq: /* 803B2F80 003AFEE0 4B FF B0 39 */ bl salHandleAuxProcessing /* 803B2F84 003AFEE4 48 00 21 91 */ bl hwIRQLeaveCritical /* 803B2F88 003AFEE8 48 00 21 6D */ bl hwIRQEnterCritical -/* 803B2F8C 003AFEEC 88 8D AF 8E */ lbz r4, lbl_805A9B4E@sda21(r13) +/* 803B2F8C 003AFEEC 88 8D AF 8E */ lbz r4, salAuxFrame@sda21(r13) /* 803B2F90 003AFEF0 3C 60 55 55 */ lis r3, 0x55555556@ha /* 803B2F94 003AFEF4 38 03 55 56 */ addi r0, r3, 0x55555556@l -/* 803B2F98 003AFEF8 88 AD AF 8F */ lbz r5, lbl_805A9B4F@sda21(r13) +/* 803B2F98 003AFEF8 88 AD AF 8F */ lbz r5, salFrame@sda21(r13) /* 803B2F9C 003AFEFC 38 84 00 01 */ addi r4, r4, 1 /* 803B2FA0 003AFF00 39 20 00 00 */ li r9, 0 /* 803B2FA4 003AFF04 7C 60 20 96 */ mulhw r3, r0, r4 /* 803B2FA8 003AFF08 68 A0 00 01 */ xori r0, r5, 1 -/* 803B2FAC 003AFF0C 98 0D AF 8F */ stb r0, lbl_805A9B4F@sda21(r13) +/* 803B2FAC 003AFF0C 98 0D AF 8F */ stb r0, salFrame@sda21(r13) /* 803B2FB0 003AFF10 39 00 00 00 */ li r8, 0 /* 803B2FB4 003AFF14 54 60 0F FE */ srwi r0, r3, 0x1f /* 803B2FB8 003AFF18 7C 03 02 14 */ add r0, r3, r0 /* 803B2FBC 003AFF1C 1C 00 00 03 */ mulli r0, r0, 3 /* 803B2FC0 003AFF20 7C 00 20 50 */ subf r0, r0, r4 -/* 803B2FC4 003AFF24 98 0D AF 8E */ stb r0, lbl_805A9B4E@sda21(r13) +/* 803B2FC4 003AFF24 98 0D AF 8E */ stb r0, salAuxFrame@sda21(r13) /* 803B2FC8 003AFF28 48 00 00 4C */ b lbl_803B3014 lbl_803B2FCC: /* 803B2FCC 003AFF2C 55 20 06 3E */ clrlwi r0, r9, 0x18 -/* 803B2FD0 003AFF30 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B2FD0 003AFF30 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B2FD4 003AFF34 1C 80 00 F4 */ mulli r4, r0, 0xf4 /* 803B2FD8 003AFF38 39 29 00 01 */ addi r9, r9, 1 /* 803B2FDC 003AFF3C 38 E4 00 24 */ addi r7, r4, 0x24 @@ -66,17 +87,17 @@ lbl_803B2FCC: /* 803B2FE4 003AFF44 38 A7 00 04 */ addi r5, r7, 4 /* 803B2FE8 003AFF48 38 87 00 08 */ addi r4, r7, 8 /* 803B2FEC 003AFF4C 38 67 00 0C */ addi r3, r7, 0xc -/* 803B2FF0 003AFF50 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B2FF0 003AFF50 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B2FF4 003AFF54 38 07 00 10 */ addi r0, r7, 0x10 /* 803B2FF8 003AFF58 7D 06 29 2E */ stwx r8, r6, r5 -/* 803B2FFC 003AFF5C 80 AD AF 54 */ lwz r5, lbl_805A9B14@sda21(r13) +/* 803B2FFC 003AFF5C 80 AD AF 54 */ lwz r5, dspVoice@sda21(r13) /* 803B3000 003AFF60 7D 05 21 2E */ stwx r8, r5, r4 -/* 803B3004 003AFF64 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B3004 003AFF64 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B3008 003AFF68 7D 04 19 2E */ stwx r8, r4, r3 -/* 803B300C 003AFF6C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B300C 003AFF6C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3010 003AFF70 7D 03 01 2E */ stwx r8, r3, r0 lbl_803B3014: -/* 803B3014 003AFF74 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803B3014 003AFF74 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803B3018 003AFF78 55 23 06 3E */ clrlwi r3, r9, 0x18 /* 803B301C 003AFF7C 7C 03 00 40 */ cmplw r3, r0 /* 803B3020 003AFF80 41 80 FF AC */ blt lbl_803B2FCC @@ -131,12 +152,12 @@ sub_803b30a0: /* 803B30CC 003B002C 48 00 1F 89 */ bl hwInitIrq /* 803B30D0 003B0030 38 00 00 00 */ li r0, 0 /* 803B30D4 003B0034 3C 60 80 3B */ lis r3, snd_handle_irq@ha -/* 803B30D8 003B0038 98 0D AF 8F */ stb r0, lbl_805A9B4F@sda21(r13) +/* 803B30D8 003B0038 98 0D AF 8F */ stb r0, salFrame@sda21(r13) /* 803B30DC 003B003C 38 63 2F 4C */ addi r3, r3, snd_handle_irq@l /* 803B30E0 003B0040 7F E4 FB 78 */ mr r4, r31 /* 803B30E4 003B0044 7F 85 E3 78 */ mr r5, r28 -/* 803B30E8 003B0048 98 0D AF 8E */ stb r0, lbl_805A9B4E@sda21(r13) -/* 803B30EC 003B004C 90 0D AF 58 */ stw r0, lbl_805A9B18@sda21(r13) +/* 803B30E8 003B0048 98 0D AF 8E */ stb r0, salAuxFrame@sda21(r13) +/* 803B30EC 003B004C 90 0D AF 58 */ stw r0, salMessageCallback@sda21(r13) /* 803B30F0 003B0050 48 00 1C 69 */ bl salInitAi /* 803B30F4 003B0054 28 03 00 00 */ cmplwi r3, 0 /* 803B30F8 003B0058 41 82 00 3C */ beq lbl_803B3134 @@ -184,18 +205,18 @@ hwExit: .global hwSetTimeOffset hwSetTimeOffset: -/* 803B318C 003B00EC 98 6D AF 80 */ stb r3, lbl_805A9B40@sda21(r13) +/* 803B318C 003B00EC 98 6D AF 80 */ stb r3, salTimeOffset@sda21(r13) /* 803B3190 003B00F0 4E 80 00 20 */ blr .global hwGetTimeOffset hwGetTimeOffset: -/* 803B3194 003B00F4 88 6D AF 80 */ lbz r3, lbl_805A9B40@sda21(r13) +/* 803B3194 003B00F4 88 6D AF 80 */ lbz r3, salTimeOffset@sda21(r13) /* 803B3198 003B00F8 4E 80 00 20 */ blr .global hwIsActive hwIsActive: /* 803B319C 003B00FC 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B31A0 003B0100 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B31A0 003B0100 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B31A4 003B0104 7C 63 02 14 */ add r3, r3, r0 /* 803B31A8 003B0108 88 63 00 EC */ lbz r3, 0xec(r3) /* 803B31AC 003B010C 7C 03 00 D0 */ neg r0, r3 @@ -205,13 +226,13 @@ hwIsActive: .global hwSetMesgCallback hwSetMesgCallback: -/* 803B31BC 003B011C 90 6D AF 58 */ stw r3, lbl_805A9B18@sda21(r13) +/* 803B31BC 003B011C 90 6D AF 58 */ stw r3, salMessageCallback@sda21(r13) /* 803B31C0 003B0120 4E 80 00 20 */ blr .global hwSetPriority hwSetPriority: /* 803B31C4 003B0124 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B31C8 003B0128 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B31C8 003B0128 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B31CC 003B012C 7C 63 02 14 */ add r3, r3, r0 /* 803B31D0 003B0130 90 83 00 1C */ stw r4, 0x1c(r3) /* 803B31D4 003B0134 4E 80 00 20 */ blr @@ -232,7 +253,7 @@ hwInitSamplePlayback: /* 803B3204 003B0164 3B A0 00 00 */ li r29, 0 /* 803B3208 003B0168 48 00 00 28 */ b lbl_803B3230 lbl_803B320C: -/* 803B320C 003B016C 81 4D AF 54 */ lwz r10, lbl_805A9B14@sda21(r13) +/* 803B320C 003B016C 81 4D AF 54 */ lwz r10, dspVoice@sda21(r13) /* 803B3210 003B0170 55 80 15 BA */ rlwinm r0, r12, 2, 0x16, 0x1d /* 803B3214 003B0174 39 8C 00 01 */ addi r12, r12, 1 /* 803B3218 003B0178 7D 4A 02 14 */ add r10, r10, r0 @@ -242,28 +263,28 @@ lbl_803B320C: /* 803B3228 003B0188 7D 63 51 2E */ stwx r11, r3, r10 /* 803B322C 003B018C 7F BD 03 78 */ or r29, r29, r0 lbl_803B3230: -/* 803B3230 003B0190 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B3230 003B0190 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B3234 003B0194 55 8A 06 3E */ clrlwi r10, r12, 0x18 /* 803B3238 003B0198 7C 0A 00 40 */ cmplw r10, r0 /* 803B323C 003B019C 40 81 FF D0 */ ble lbl_803B320C -/* 803B3240 003B01A0 81 4D AF 54 */ lwz r10, lbl_805A9B14@sda21(r13) +/* 803B3240 003B01A0 81 4D AF 54 */ lwz r10, dspVoice@sda21(r13) /* 803B3244 003B01A4 38 00 00 00 */ li r0, 0 /* 803B3248 003B01A8 28 06 00 00 */ cmplwi r6, 0 /* 803B324C 003B01AC 7C CA 1A 14 */ add r6, r10, r3 /* 803B3250 003B01B0 93 A6 00 24 */ stw r29, 0x24(r6) -/* 803B3254 003B01B4 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B3254 003B01B4 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3258 003B01B8 7C C6 1A 14 */ add r6, r6, r3 /* 803B325C 003B01BC 90 E6 00 1C */ stw r7, 0x1c(r6) -/* 803B3260 003B01C0 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B3260 003B01C0 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3264 003B01C4 7C C6 1A 14 */ add r6, r6, r3 /* 803B3268 003B01C8 91 06 00 18 */ stw r8, 0x18(r6) -/* 803B326C 003B01CC 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B326C 003B01CC 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3270 003B01D0 7C C6 1A 14 */ add r6, r6, r3 /* 803B3274 003B01D4 90 06 00 F0 */ stw r0, 0xf0(r6) -/* 803B3278 003B01D8 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B3278 003B01D8 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B327C 003B01DC 7C C6 1A 14 */ add r6, r6, r3 /* 803B3280 003B01E0 B0 86 00 70 */ sth r4, 0x70(r6) -/* 803B3284 003B01E4 80 ED AF 54 */ lwz r7, lbl_805A9B14@sda21(r13) +/* 803B3284 003B01E4 80 ED AF 54 */ lwz r7, dspVoice@sda21(r13) /* 803B3288 003B01E8 80 C5 00 00 */ lwz r6, 0(r5) /* 803B328C 003B01EC 80 85 00 04 */ lwz r4, 4(r5) /* 803B3290 003B01F0 7C E7 1A 14 */ add r7, r7, r3 @@ -282,35 +303,35 @@ lbl_803B3230: /* 803B32C4 003B0224 90 C7 00 8C */ stw r6, 0x8c(r7) /* 803B32C8 003B0228 90 87 00 90 */ stw r4, 0x90(r7) /* 803B32CC 003B022C 41 82 00 44 */ beq lbl_803B3310 -/* 803B32D0 003B0230 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B32D0 003B0230 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B32D4 003B0234 38 A0 7F FF */ li r5, 0x7fff /* 803B32D8 003B0238 7C 84 1A 14 */ add r4, r4, r3 /* 803B32DC 003B023C 98 04 00 A4 */ stb r0, 0xa4(r4) -/* 803B32E0 003B0240 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B32E0 003B0240 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B32E4 003B0244 7C 84 1A 14 */ add r4, r4, r3 /* 803B32E8 003B0248 90 04 00 B8 */ stw r0, 0xb8(r4) -/* 803B32EC 003B024C 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B32EC 003B024C 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B32F0 003B0250 7C 84 1A 14 */ add r4, r4, r3 /* 803B32F4 003B0254 90 04 00 BC */ stw r0, 0xbc(r4) -/* 803B32F8 003B0258 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B32F8 003B0258 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B32FC 003B025C 7C 84 1A 14 */ add r4, r4, r3 /* 803B3300 003B0260 B0 A4 00 C0 */ sth r5, 0xc0(r4) -/* 803B3304 003B0264 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803B3304 003B0264 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803B3308 003B0268 7C 84 1A 14 */ add r4, r4, r3 /* 803B330C 003B026C 90 04 00 C4 */ stw r0, 0xc4(r4) lbl_803B3310: -/* 803B3310 003B0270 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3310 003B0270 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3314 003B0274 38 A0 00 FF */ li r5, 0xff /* 803B3318 003B0278 28 09 00 00 */ cmplwi r9, 0 /* 803B331C 003B027C 7C 80 1A 14 */ add r4, r0, r3 /* 803B3320 003B0280 98 A4 00 E4 */ stb r5, 0xe4(r4) -/* 803B3324 003B0284 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3324 003B0284 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3328 003B0288 7C 80 1A 14 */ add r4, r0, r3 /* 803B332C 003B028C 98 A4 00 E5 */ stb r5, 0xe5(r4) -/* 803B3330 003B0290 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3330 003B0290 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3334 003B0294 7C 80 1A 14 */ add r4, r0, r3 /* 803B3338 003B0298 98 A4 00 E6 */ stb r5, 0xe6(r4) -/* 803B333C 003B029C 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B333C 003B029C 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3340 003B02A0 7C 60 1A 14 */ add r3, r0, r3 /* 803B3344 003B02A4 98 A3 00 E7 */ stb r5, 0xe7(r3) /* 803B3348 003B02A8 41 82 00 1C */ beq lbl_803B3364 @@ -335,19 +356,19 @@ lbl_803B3364: .global hwBreak hwBreak: /* 803B338C 003B02EC 1C 83 00 F4 */ mulli r4, r3, 0xf4 -/* 803B3390 003B02F0 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3390 003B02F0 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3394 003B02F4 7C 60 22 14 */ add r3, r0, r4 /* 803B3398 003B02F8 88 03 00 EC */ lbz r0, 0xec(r3) /* 803B339C 003B02FC 28 00 00 01 */ cmplwi r0, 1 /* 803B33A0 003B0300 40 82 00 18 */ bne lbl_803B33B8 -/* 803B33A4 003B0304 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B33A4 003B0304 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B33A8 003B0308 28 00 00 00 */ cmplwi r0, 0 /* 803B33AC 003B030C 40 82 00 0C */ bne lbl_803B33B8 /* 803B33B0 003B0310 38 00 00 01 */ li r0, 1 /* 803B33B4 003B0314 98 03 00 EE */ stb r0, 0xee(r3) lbl_803B33B8: -/* 803B33B8 003B0318 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) -/* 803B33BC 003B031C 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B33B8 003B0318 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) +/* 803B33BC 003B031C 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B33C0 003B0320 7C 63 22 14 */ add r3, r3, r4 /* 803B33C4 003B0324 54 00 10 3A */ slwi r0, r0, 2 /* 803B33C8 003B0328 7C 63 02 14 */ add r3, r3, r0 @@ -374,15 +395,15 @@ hwSetADSR: /* 803B3410 003B0370 48 00 00 6C */ b lbl_803B347C lbl_803B3414: /* 803B3414 003B0374 1C BD 00 F4 */ mulli r5, r29, 0xf4 -/* 803B3418 003B0378 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3418 003B0378 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B341C 003B037C 38 80 00 00 */ li r4, 0 /* 803B3420 003B0380 7C 60 2A 14 */ add r3, r0, r5 /* 803B3424 003B0384 98 83 00 A4 */ stb r4, 0xa4(r3) -/* 803B3428 003B0388 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3428 003B0388 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B342C 003B038C A0 9E 00 00 */ lhz r4, 0(r30) /* 803B3430 003B0390 7C 60 2A 14 */ add r3, r0, r5 /* 803B3434 003B0394 90 83 00 B8 */ stw r4, 0xb8(r3) -/* 803B3438 003B0398 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3438 003B0398 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B343C 003B039C A0 9E 00 02 */ lhz r4, 2(r30) /* 803B3440 003B03A0 7C 60 2A 14 */ add r3, r0, r5 /* 803B3444 003B03A4 90 83 00 BC */ stw r4, 0xbc(r3) @@ -392,35 +413,35 @@ lbl_803B3414: /* 803B3454 003B03B4 40 81 00 08 */ ble lbl_803B345C /* 803B3458 003B03B8 38 80 7F FF */ li r4, 0x7fff lbl_803B345C: -/* 803B345C 003B03BC 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B345C 003B03BC 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3460 003B03C0 7C 60 2A 14 */ add r3, r0, r5 /* 803B3464 003B03C4 B0 83 00 C0 */ sth r4, 0xc0(r3) -/* 803B3468 003B03C8 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3468 003B03C8 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B346C 003B03CC A0 9E 00 06 */ lhz r4, 6(r30) /* 803B3470 003B03D0 7C 60 2A 14 */ add r3, r0, r5 /* 803B3474 003B03D4 90 83 00 C4 */ stw r4, 0xc4(r3) /* 803B3478 003B03D8 48 00 00 DC */ b lbl_803B3554 lbl_803B347C: /* 803B347C 003B03DC 1F FD 00 F4 */ mulli r31, r29, 0xf4 -/* 803B3480 003B03E0 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3480 003B03E0 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3484 003B03E4 38 A0 00 01 */ li r5, 1 /* 803B3488 003B03E8 28 06 00 01 */ cmplwi r6, 1 /* 803B348C 003B03EC 7C 60 FA 14 */ add r3, r0, r31 /* 803B3490 003B03F0 38 80 00 00 */ li r4, 0 /* 803B3494 003B03F4 98 A3 00 A4 */ stb r5, 0xa4(r3) -/* 803B3498 003B03F8 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3498 003B03F8 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B349C 003B03FC 7C 60 FA 14 */ add r3, r0, r31 /* 803B34A0 003B0400 98 83 00 CA */ stb r4, 0xca(r3) /* 803B34A4 003B0404 40 82 00 68 */ bne lbl_803B350C /* 803B34A8 003B0408 80 7E 00 00 */ lwz r3, 0(r30) /* 803B34AC 003B040C 4B FF 5D 65 */ bl adsrConvertTimeCents -/* 803B34B0 003B0410 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B34B0 003B0410 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B34B4 003B0414 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 803B34B8 003B0418 7C 60 FA 14 */ add r3, r0, r31 /* 803B34BC 003B041C 90 83 00 B8 */ stw r4, 0xb8(r3) /* 803B34C0 003B0420 80 7E 00 04 */ lwz r3, 4(r30) /* 803B34C4 003B0424 4B FF 5D 4D */ bl adsrConvertTimeCents -/* 803B34C8 003B0428 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B34C8 003B0428 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B34CC 003B042C 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 803B34D0 003B0430 7C 60 FA 14 */ add r3, r0, r31 /* 803B34D4 003B0434 90 83 00 BC */ stw r4, 0xbc(r3) @@ -431,7 +452,7 @@ lbl_803B347C: /* 803B34E8 003B0448 38 80 03 FF */ li r4, 0x3ff lbl_803B34EC: /* 803B34EC 003B044C 3C 60 80 3F */ lis r3, lbl_803F39A4@ha -/* 803B34F0 003B0450 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B34F0 003B0450 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B34F4 003B0454 38 63 39 A4 */ addi r3, r3, lbl_803F39A4@l /* 803B34F8 003B0458 7C 83 20 AE */ lbzx r4, r3, r4 /* 803B34FC 003B045C 7C 60 FA 14 */ add r3, r0, r31 @@ -440,27 +461,27 @@ lbl_803B34EC: /* 803B3508 003B0468 48 00 00 3C */ b lbl_803B3544 lbl_803B350C: /* 803B350C 003B046C 80 7E 00 00 */ lwz r3, 0(r30) -/* 803B3510 003B0470 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3510 003B0470 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3514 003B0474 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 803B3518 003B0478 7C 60 FA 14 */ add r3, r0, r31 /* 803B351C 003B047C 90 83 00 B8 */ stw r4, 0xb8(r3) /* 803B3520 003B0480 80 7E 00 04 */ lwz r3, 4(r30) -/* 803B3524 003B0484 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3524 003B0484 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3528 003B0488 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 803B352C 003B048C 7C 60 FA 14 */ add r3, r0, r31 /* 803B3530 003B0490 90 83 00 BC */ stw r4, 0xbc(r3) -/* 803B3534 003B0494 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3534 003B0494 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3538 003B0498 A0 9E 00 08 */ lhz r4, 8(r30) /* 803B353C 003B049C 7C 60 FA 14 */ add r3, r0, r31 /* 803B3540 003B04A0 B0 83 00 C0 */ sth r4, 0xc0(r3) lbl_803B3544: -/* 803B3544 003B04A4 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3544 003B04A4 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3548 003B04A8 A0 9E 00 0A */ lhz r4, 0xa(r30) /* 803B354C 003B04AC 7C 60 FA 14 */ add r3, r0, r31 /* 803B3550 003B04B0 90 83 00 C4 */ stw r4, 0xc4(r3) lbl_803B3554: /* 803B3554 003B04B4 1C 1D 00 F4 */ mulli r0, r29, 0xf4 -/* 803B3558 003B04B8 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3558 003B04B8 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B355C 003B04BC 7C 63 02 14 */ add r3, r3, r0 /* 803B3560 003B04C0 80 03 00 24 */ lwz r0, 0x24(r3) /* 803B3564 003B04C4 60 00 00 10 */ ori r0, r0, 0x10 @@ -476,10 +497,10 @@ lbl_803B3554: .global hwSetVirtualSampleLoopBuffer hwSetVirtualSampleLoopBuffer: /* 803B3588 003B04E8 1C C3 00 F4 */ mulli r6, r3, 0xf4 -/* 803B358C 003B04EC 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B358C 003B04EC 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3590 003B04F0 7C 60 32 14 */ add r3, r0, r6 /* 803B3594 003B04F4 90 83 00 94 */ stw r4, 0x94(r3) -/* 803B3598 003B04F8 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3598 003B04F8 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B359C 003B04FC 7C 60 32 14 */ add r3, r0, r6 /* 803B35A0 003B0500 90 A3 00 98 */ stw r5, 0x98(r3) /* 803B35A4 003B0504 4E 80 00 20 */ blr @@ -487,15 +508,15 @@ hwSetVirtualSampleLoopBuffer: .global hwGetVirtualSampleState hwGetVirtualSampleState: /* 803B35A8 003B0508 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B35AC 003B050C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B35AC 003B050C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B35B0 003B0510 7C 63 02 14 */ add r3, r3, r0 /* 803B35B4 003B0514 88 63 00 9C */ lbz r3, 0x9c(r3) /* 803B35B8 003B0518 4E 80 00 20 */ blr -.global sub_803b35bc -sub_803b35bc: +.global hwGetSampleType +hwGetSampleType: /* 803B35BC 003B051C 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B35C0 003B0520 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B35C0 003B0520 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B35C4 003B0524 7C 63 02 14 */ add r3, r3, r0 /* 803B35C8 003B0528 88 63 00 90 */ lbz r3, 0x90(r3) /* 803B35CC 003B052C 4E 80 00 20 */ blr @@ -503,7 +524,7 @@ sub_803b35bc: .global hwGetSampleID hwGetSampleID: /* 803B35D0 003B0530 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B35D4 003B0534 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B35D4 003B0534 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B35D8 003B0538 7C 63 02 14 */ add r3, r3, r0 /* 803B35DC 003B053C A0 63 00 70 */ lhz r3, 0x70(r3) /* 803B35E0 003B0540 4E 80 00 20 */ blr @@ -511,7 +532,7 @@ hwGetSampleID: .global hwSetStreamLoopPS hwSetStreamLoopPS: /* 803B35E4 003B0544 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B35E8 003B0548 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B35E8 003B0548 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B35EC 003B054C 7C 63 02 14 */ add r3, r3, r0 /* 803B35F0 003B0550 98 83 00 A0 */ stb r4, 0xa0(r3) /* 803B35F4 003B0554 4E 80 00 20 */ blr @@ -522,11 +543,11 @@ hwStart: /* 803B35FC 003B055C 7C 08 02 A6 */ mflr r0 /* 803B3600 003B0560 1C C3 00 F4 */ mulli r6, r3, 0xf4 /* 803B3604 003B0564 90 01 00 14 */ stw r0, 0x14(r1) -/* 803B3608 003B0568 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) -/* 803B360C 003B056C 88 AD AF 80 */ lbz r5, lbl_805A9B40@sda21(r13) +/* 803B3608 003B0568 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) +/* 803B360C 003B056C 88 AD AF 80 */ lbz r5, salTimeOffset@sda21(r13) /* 803B3610 003B0570 7C 60 32 14 */ add r3, r0, r6 /* 803B3614 003B0574 98 A3 00 D4 */ stb r5, 0xd4(r3) -/* 803B3618 003B0578 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3618 003B0578 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B361C 003B057C 7C 60 32 14 */ add r3, r0, r6 /* 803B3620 003B0580 4B FF A6 A5 */ bl salActivateVoice /* 803B3624 003B0584 80 01 00 14 */ lwz r0, 0x14(r1) @@ -537,8 +558,8 @@ hwStart: .global hwKeyOff hwKeyOff: /* 803B3634 003B0594 1C 63 00 F4 */ mulli r3, r3, 0xf4 -/* 803B3638 003B0598 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) -/* 803B363C 003B059C 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B3638 003B0598 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) +/* 803B363C 003B059C 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B3640 003B05A0 7C 64 1A 14 */ add r3, r4, r3 /* 803B3644 003B05A4 54 00 10 3A */ slwi r0, r0, 2 /* 803B3648 003B05A8 7C 63 02 14 */ add r3, r3, r0 @@ -550,7 +571,7 @@ hwKeyOff: .global hwSetPitch hwSetPitch: /* 803B365C 003B05BC 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 803B3660 003B05C0 80 AD AF 54 */ lwz r5, lbl_805A9B14@sda21(r13) +/* 803B3660 003B05C0 80 AD AF 54 */ lwz r5, dspVoice@sda21(r13) /* 803B3664 003B05C4 1C 63 00 F4 */ mulli r3, r3, 0xf4 /* 803B3668 003B05C8 28 00 40 00 */ cmplwi r0, 0x4000 /* 803B366C 003B05CC 7C A5 1A 14 */ add r5, r5, r3 @@ -567,25 +588,25 @@ lbl_803B3678: /* 803B3694 003B05F4 7C 03 00 40 */ cmplw r3, r0 /* 803B3698 003B05F8 4D 82 00 20 */ beqlr lbl_803B369C: -/* 803B369C 003B05FC 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B369C 003B05FC 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B36A0 003B0600 54 84 23 36 */ rlwinm r4, r4, 4, 0xc, 0x1b /* 803B36A4 003B0604 54 00 10 3A */ slwi r0, r0, 2 /* 803B36A8 003B0608 7C 65 02 14 */ add r3, r5, r0 /* 803B36AC 003B060C 90 83 00 38 */ stw r4, 0x38(r3) -/* 803B36B0 003B0610 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B36B0 003B0610 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B36B4 003B0614 54 00 10 3A */ slwi r0, r0, 2 /* 803B36B8 003B0618 7C 65 02 14 */ add r3, r5, r0 /* 803B36BC 003B061C 80 03 00 24 */ lwz r0, 0x24(r3) /* 803B36C0 003B0620 60 00 00 08 */ ori r0, r0, 8 /* 803B36C4 003B0624 90 03 00 24 */ stw r0, 0x24(r3) -/* 803B36C8 003B0628 88 0D AF 80 */ lbz r0, lbl_805A9B40@sda21(r13) +/* 803B36C8 003B0628 88 0D AF 80 */ lbz r0, salTimeOffset@sda21(r13) /* 803B36CC 003B062C 98 05 00 E4 */ stb r0, 0xe4(r5) /* 803B36D0 003B0630 4E 80 00 20 */ blr .global sub_803b36d4 sub_803b36d4: /* 803B36D4 003B0634 1C A3 00 F4 */ mulli r5, r3, 0xf4 -/* 803B36D8 003B0638 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B36D8 003B0638 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B36DC 003B063C 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e /* 803B36E0 003B0640 38 6D A0 18 */ addi r3, r13, lbl_805A8BD8@sda21 /* 803B36E4 003B0644 7C 03 02 2E */ lhzx r0, r3, r0 @@ -599,7 +620,7 @@ sub_803b36d4: .global hwSetSRCType hwSetSRCType: /* 803B3700 003B0660 1C A3 00 F4 */ mulli r5, r3, 0xf4 -/* 803B3704 003B0664 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B3704 003B0664 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3708 003B0668 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e /* 803B370C 003B066C 38 6D A0 20 */ addi r3, r13, lbl_805A8BE0@sda21 /* 803B3710 003B0670 7C 03 02 2E */ lhzx r0, r3, r0 @@ -615,22 +636,22 @@ hwSetITDMode: /* 803B372C 003B068C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 803B3730 003B0690 40 82 00 3C */ bne lbl_803B376C /* 803B3734 003B0694 1C A3 00 F4 */ mulli r5, r3, 0xf4 -/* 803B3738 003B0698 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3738 003B0698 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B373C 003B069C 38 80 00 10 */ li r4, 0x10 /* 803B3740 003B06A0 7C 60 2A 14 */ add r3, r0, r5 /* 803B3744 003B06A4 80 03 00 F0 */ lwz r0, 0xf0(r3) /* 803B3748 003B06A8 64 00 80 00 */ oris r0, r0, 0x8000 /* 803B374C 003B06AC 90 03 00 F0 */ stw r0, 0xf0(r3) -/* 803B3750 003B06B0 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B3750 003B06B0 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3754 003B06B4 7C 60 2A 14 */ add r3, r0, r5 /* 803B3758 003B06B8 B0 83 00 D0 */ sth r4, 0xd0(r3) -/* 803B375C 003B06BC 80 0D AF 54 */ lwz r0, lbl_805A9B14@sda21(r13) +/* 803B375C 003B06BC 80 0D AF 54 */ lwz r0, dspVoice@sda21(r13) /* 803B3760 003B06C0 7C 60 2A 14 */ add r3, r0, r5 /* 803B3764 003B06C4 B0 83 00 D2 */ sth r4, 0xd2(r3) /* 803B3768 003B06C8 4E 80 00 20 */ blr lbl_803B376C: /* 803B376C 003B06CC 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B3770 003B06D0 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3770 003B06D0 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3774 003B06D4 7C 63 02 14 */ add r3, r3, r0 /* 803B3778 003B06D8 80 03 00 F0 */ lwz r0, 0xf0(r3) /* 803B377C 003B06DC 54 00 00 7E */ clrlwi r0, r0, 1 @@ -648,7 +669,7 @@ hwSetVolume: /* 803B37A0 003B0700 93 E1 00 4C */ stw r31, 0x4c(r1) /* 803B37A4 003B0704 93 C1 00 48 */ stw r30, 0x48(r1) /* 803B37A8 003B0708 7C BE 2B 78 */ mr r30, r5 -/* 803B37AC 003B070C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B37AC 003B070C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B37B0 003B0710 7F E3 02 14 */ add r31, r3, r0 /* 803B37B4 003B0714 4C 41 13 82 */ cror 2, 1, 2 /* 803B37B8 003B0718 40 82 00 08 */ bne lbl_803B37C0 @@ -667,8 +688,8 @@ lbl_803B37D4: /* 803B37E4 003B0744 FC 60 00 90 */ fmr f3, f0 lbl_803B37E8: /* 803B37E8 003B0748 88 1F 00 EF */ lbz r0, 0xef(r31) -/* 803B37EC 003B074C 3C 60 80 56 */ lis r3, lbl_8055F260@ha -/* 803B37F0 003B0750 38 E3 F2 60 */ addi r7, r3, lbl_8055F260@l +/* 803B37EC 003B074C 3C 60 80 56 */ lis r3, dspStudio@ha +/* 803B37F0 003B0750 38 E3 F2 60 */ addi r7, r3, dspStudio@l /* 803B37F4 003B0754 81 1F 00 F0 */ lwz r8, 0xf0(r31) /* 803B37F8 003B0758 1C 00 00 BC */ mulli r0, r0, 0xbc /* 803B37FC 003B075C 7C 83 23 78 */ mr r3, r4 @@ -832,7 +853,7 @@ sub_803b3a48: /* 803B3A4C 003B09AC 7C 08 02 A6 */ mflr r0 /* 803B3A50 003B09B0 90 01 00 14 */ stw r0, 0x14(r1) /* 803B3A54 003B09B4 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B3A58 003B09B8 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3A58 003B09B8 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3A5C 003B09BC 7C 63 02 14 */ add r3, r3, r0 /* 803B3A60 003B09C0 4B FF A3 05 */ bl salDeactivateVoice /* 803B3A64 003B09C4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -843,9 +864,9 @@ sub_803b3a48: .global hwSetAUXProcessingCallbacks hwSetAUXProcessingCallbacks: /* 803B3A74 003B09D4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803B3A78 003B09D8 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803B3A78 003B09D8 3C 60 80 56 */ lis r3, dspStudio@ha /* 803B3A7C 003B09DC 1D 00 00 BC */ mulli r8, r0, 0xbc -/* 803B3A80 003B09E0 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803B3A80 003B09E0 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803B3A84 003B09E4 7C 60 42 14 */ add r3, r0, r8 /* 803B3A88 003B09E8 90 83 00 AC */ stw r4, 0xac(r3) /* 803B3A8C 003B09EC 90 A3 00 B4 */ stw r5, 0xb4(r3) @@ -882,8 +903,8 @@ sub_803b3adc: /* 803B3AE4 003B0A44 90 01 00 14 */ stw r0, 0x14(r1) /* 803B3AE8 003B0A48 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803B3AEC 003B0A4C 1C A0 00 BC */ mulli r5, r0, 0xbc -/* 803B3AF0 003B0A50 3C 60 80 56 */ lis r3, lbl_8055F260@ha -/* 803B3AF4 003B0A54 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803B3AF0 003B0A50 3C 60 80 56 */ lis r3, dspStudio@ha +/* 803B3AF4 003B0A54 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803B3AF8 003B0A58 7C 60 2A 14 */ add r3, r0, r5 /* 803B3AFC 003B0A5C 4B FF A3 91 */ bl sub_803ade8c /* 803B3B00 003B0A60 80 01 00 14 */ lwz r0, 0x14(r1) @@ -898,8 +919,8 @@ sub_803b3b10: /* 803B3B18 003B0A78 90 01 00 14 */ stw r0, 0x14(r1) /* 803B3B1C 003B0A7C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803B3B20 003B0A80 1C A0 00 BC */ mulli r5, r0, 0xbc -/* 803B3B24 003B0A84 3C 60 80 56 */ lis r3, lbl_8055F260@ha -/* 803B3B28 003B0A88 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803B3B24 003B0A84 3C 60 80 56 */ lis r3, dspStudio@ha +/* 803B3B28 003B0A88 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803B3B2C 003B0A8C 7C 60 2A 14 */ add r3, r0, r5 /* 803B3B30 003B0A90 4B FF A4 05 */ bl sub_803adf34 /* 803B3B34 003B0A94 80 01 00 14 */ lwz r0, 0x14(r1) @@ -913,7 +934,7 @@ sub_803b3b44: /* 803B3B48 003B0AA8 7C 08 02 A6 */ mflr r0 /* 803B3B4C 003B0AAC 90 01 00 14 */ stw r0, 0x14(r1) /* 803B3B50 003B0AB0 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B3B54 003B0AB4 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3B54 003B0AB4 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3B58 003B0AB8 7C 63 02 14 */ add r3, r3, r0 /* 803B3B5C 003B0ABC 4B FF A2 69 */ bl sub_803addc4 /* 803B3B60 003B0AC0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -924,7 +945,7 @@ sub_803b3b44: .global sub_803b3b70 sub_803b3b70: /* 803B3B70 003B0AD0 1C A3 00 F4 */ mulli r5, r3, 0xf4 -/* 803B3B74 003B0AD4 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803B3B74 003B0AD4 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3B78 003B0AD8 7C 86 2A 14 */ add r4, r6, r5 /* 803B3B7C 003B0ADC 88 04 00 EC */ lbz r0, 0xec(r4) /* 803B3B80 003B0AE0 28 00 00 02 */ cmplwi r0, 2 @@ -1213,20 +1234,20 @@ nullsub_59: sndSetHooks: /* 803B3F08 003B0E68 80 83 00 00 */ lwz r4, 0(r3) /* 803B3F0C 003B0E6C 80 03 00 04 */ lwz r0, 4(r3) -/* 803B3F10 003B0E70 90 8D AF 84 */ stw r4, lbl_805A9B44@sda21(r13) -/* 803B3F14 003B0E74 90 0D AF 88 */ stw r0, lbl_805A9B48@sda21(r13) +/* 803B3F10 003B0E70 90 8D AF 84 */ stw r4, salHooks@sda21(r13) +/* 803B3F14 003B0E74 90 0D AF 88 */ stw r0, salHooks+4@sda21(r13) /* 803B3F18 003B0E78 4E 80 00 20 */ blr .global sub_803b3f1c sub_803b3f1c: /* 803B3F1C 003B0E7C 38 00 00 00 */ li r0, 0 -/* 803B3F20 003B0E80 90 0D AF 44 */ stw r0, lbl_805A9B04@sda21(r13) +/* 803B3F20 003B0E80 90 0D AF 44 */ stw r0, dspHRTFOn@sda21(r13) /* 803B3F24 003B0E84 4E 80 00 20 */ blr .global hwGetVirtualSampleID hwGetVirtualSampleID: /* 803B3F28 003B0E88 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B3F2C 003B0E8C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3F2C 003B0E8C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3F30 003B0E90 7C 63 02 14 */ add r3, r3, r0 /* 803B3F34 003B0E94 88 03 00 EC */ lbz r0, 0xec(r3) /* 803B3F38 003B0E98 28 00 00 00 */ cmplwi r0, 0 @@ -1240,7 +1261,7 @@ lbl_803B3F48: .global hwVoiceInStartup hwVoiceInStartup: /* 803B3F50 003B0EB0 1C 03 00 F4 */ mulli r0, r3, 0xf4 -/* 803B3F54 003B0EB4 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803B3F54 003B0EB4 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3F58 003B0EB8 7C 63 02 14 */ add r3, r3, r0 /* 803B3F5C 003B0EBC 88 03 00 EC */ lbz r0, 0xec(r3) /* 803B3F60 003B0EC0 20 00 00 01 */ subfic r0, r0, 1 diff --git a/asm/musyx/hw_aramdma.s b/asm/musyx/hw_aramdma.s index 3ec64c1b..eb1c939d 100644 --- a/asm/musyx/hw_aramdma.s +++ b/asm/musyx/hw_aramdma.s @@ -1,29 +1,29 @@ .include "macros.inc" .section .sbss, "wa" - -.global lbl_805A9B50 -lbl_805A9B50: +.balign 4 +.global aramIdleStreamBuffers +aramIdleStreamBuffers: .skip 0x4 -.global lbl_805A9B54 -lbl_805A9B54: +.global aramFreeStreamBuffers +aramFreeStreamBuffers: .skip 0x4 -.global lbl_805A9B58 -lbl_805A9B58: +.global aramUsedStreamBuffers +aramUsedStreamBuffers: .skip 0x4 -.global lbl_805A9B5C -lbl_805A9B5C: +.global aramUploadChunkSize +aramUploadChunkSize: .skip 0x4 -.global lbl_805A9B60 -lbl_805A9B60: +.global aramUploadCallback +aramUploadCallback: .skip 0x4 -.global lbl_805A9B64 -lbl_805A9B64: +.global aramStream +aramStream: .skip 0x4 -.global lbl_805A9B68 -lbl_805A9B68: +.global aramWrite +aramWrite: .skip 0x4 -.global lbl_805A9B6C -lbl_805A9B6C: +.global aramTop +aramTop: .skip 0x4 .section .text, "ax" @@ -218,7 +218,7 @@ aramInit: /* 803B4208 003B1168 7C 08 02 A6 */ mflr r0 /* 803B420C 003B116C 90 01 00 24 */ stw r0, 0x24(r1) /* 803B4210 003B1170 39 61 00 20 */ addi r11, r1, 0x20 -/* 803B4214 003B1174 4B FD 58 69 */ bl sub_80389a7c +/* 803B4214 003B1174 4B FD 58 69 */ bl _savegpr_27 /* 803B4218 003B1178 7C 7B 1B 78 */ mr r27, r3 /* 803B421C 003B117C 4B FB 99 99 */ bl ARGetBaseAddress /* 803B4220 003B1180 7C 7E 1B 78 */ mr r30, r3 @@ -387,18 +387,18 @@ lbl_803B4490: /* 803B449C 003B13FC 7F 83 E3 78 */ mr r3, r28 /* 803B44A0 003B1400 48 00 0C BD */ bl salFree /* 803B44A4 003B1404 7C 1E DA 14 */ add r0, r30, r27 -/* 803B44A8 003B1408 90 0D AF AC */ stw r0, lbl_805A9B6C@sda21(r13) +/* 803B44A8 003B1408 90 0D AF AC */ stw r0, aramTop@sda21(r13) /* 803B44AC 003B140C 4B FB 97 11 */ bl ARGetSize -/* 803B44B0 003B1410 80 0D AF AC */ lwz r0, lbl_805A9B6C@sda21(r13) +/* 803B44B0 003B1410 80 0D AF AC */ lwz r0, aramTop@sda21(r13) /* 803B44B4 003B1414 7C 00 18 40 */ cmplw r0, r3 /* 803B44B8 003B1418 40 81 00 0C */ ble lbl_803B44C4 /* 803B44BC 003B141C 4B FB 97 01 */ bl ARGetSize -/* 803B44C0 003B1420 90 6D AF AC */ stw r3, lbl_805A9B6C@sda21(r13) +/* 803B44C0 003B1420 90 6D AF AC */ stw r3, aramTop@sda21(r13) lbl_803B44C4: /* 803B44C4 003B1424 38 7E 05 00 */ addi r3, r30, 0x500 /* 803B44C8 003B1428 38 00 00 00 */ li r0, 0 -/* 803B44CC 003B142C 90 6D AF A8 */ stw r3, lbl_805A9B68@sda21(r13) -/* 803B44D0 003B1430 90 0D AF A0 */ stw r0, lbl_805A9B60@sda21(r13) +/* 803B44CC 003B142C 90 6D AF A8 */ stw r3, aramWrite@sda21(r13) +/* 803B44D0 003B1430 90 0D AF A0 */ stw r0, aramUploadCallback@sda21(r13) /* 803B44D4 003B1434 48 00 04 6D */ bl InitStreamBuffers /* 803B44D8 003B1438 39 61 00 20 */ addi r11, r1, 0x20 /* 803B44DC 003B143C 4B FD 55 ED */ bl _restgpr_27 @@ -439,9 +439,9 @@ aramSetUploadCallback: /* 803B4544 003B14A4 40 80 00 08 */ bge lbl_803B454C /* 803B4548 003B14A8 7C 60 1B 78 */ mr r0, r3 lbl_803B454C: -/* 803B454C 003B14AC 90 0D AF 9C */ stw r0, lbl_805A9B5C@sda21(r13) +/* 803B454C 003B14AC 90 0D AF 9C */ stw r0, aramUploadChunkSize@sda21(r13) lbl_803B4550: -/* 803B4550 003B14B0 93 CD AF A0 */ stw r30, lbl_805A9B60@sda21(r13) +/* 803B4550 003B14B0 93 CD AF A0 */ stw r30, aramUploadCallback@sda21(r13) /* 803B4554 003B14B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B4558 003B14B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B455C 003B14BC 83 C1 00 08 */ lwz r30, 8(r1) @@ -456,9 +456,9 @@ sub_803b456c: /* 803B4574 003B14D4 90 01 00 34 */ stw r0, 0x34(r1) /* 803B4578 003B14D8 39 61 00 30 */ addi r11, r1, 0x30 /* 803B457C 003B14DC 4B FD 54 F1 */ bl func_80389A6C -/* 803B4580 003B14E0 80 0D AF A0 */ lwz r0, lbl_805A9B60@sda21(r13) +/* 803B4580 003B14E0 80 0D AF A0 */ lwz r0, aramUploadCallback@sda21(r13) /* 803B4584 003B14E4 38 84 00 1F */ addi r4, r4, 0x1f -/* 803B4588 003B14E8 83 0D AF A8 */ lwz r24, lbl_805A9B68@sda21(r13) +/* 803B4588 003B14E8 83 0D AF A8 */ lwz r24, aramWrite@sda21(r13) /* 803B458C 003B14EC 7C 79 1B 78 */ mr r25, r3 /* 803B4590 003B14F0 28 00 00 00 */ cmplwi r0, 0 /* 803B4594 003B14F4 54 97 00 34 */ rlwinm r23, r4, 0, 0, 0x1a @@ -466,7 +466,7 @@ sub_803b456c: /* 803B459C 003B14FC 7E E4 BB 78 */ mr r4, r23 /* 803B45A0 003B1500 4B FC A5 11 */ bl DCFlushRange /* 803B45A4 003B1504 3C 60 80 56 */ lis r3, lbl_80566F90@ha -/* 803B45A8 003B1508 83 CD AF A8 */ lwz r30, lbl_805A9B68@sda21(r13) +/* 803B45A8 003B1508 83 CD AF A8 */ lwz r30, aramWrite@sda21(r13) /* 803B45AC 003B150C 3B 83 6F 90 */ addi r28, r3, lbl_80566F90@l lbl_803B45B0: /* 803B45B0 003B1510 4B FC D0 B1 */ bl OSDisableInterrupts @@ -564,10 +564,10 @@ lbl_803B471C: /* 803B471C 003B167C 4B FC CF 6D */ bl OSRestoreInterrupts /* 803B4720 003B1680 4B FF FE 90 */ b lbl_803B45B0 lbl_803B4724: -/* 803B4724 003B1684 80 0D AF A8 */ lwz r0, lbl_805A9B68@sda21(r13) +/* 803B4724 003B1684 80 0D AF A8 */ lwz r0, aramWrite@sda21(r13) /* 803B4728 003B1688 7F 03 C3 78 */ mr r3, r24 /* 803B472C 003B168C 7C 00 BA 14 */ add r0, r0, r23 -/* 803B4730 003B1690 90 0D AF A8 */ stw r0, lbl_805A9B68@sda21(r13) +/* 803B4730 003B1690 90 0D AF A8 */ stw r0, aramWrite@sda21(r13) /* 803B4734 003B1694 48 00 01 DC */ b lbl_803B4910 lbl_803B4738: /* 803B4738 003B1698 3C 80 80 56 */ lis r4, lbl_80566F90@ha @@ -576,13 +576,13 @@ lbl_803B4738: /* 803B4744 003B16A4 3B E3 3F 70 */ addi r31, r3, aramQueueCallback@l /* 803B4748 003B16A8 48 00 01 BC */ b lbl_803B4904 lbl_803B474C: -/* 803B474C 003B16AC 80 0D AF 9C */ lwz r0, lbl_805A9B5C@sda21(r13) +/* 803B474C 003B16AC 80 0D AF 9C */ lwz r0, aramUploadChunkSize@sda21(r13) /* 803B4750 003B16B0 7E FC BB 78 */ mr r28, r23 /* 803B4754 003B16B4 7C 17 00 40 */ cmplw r23, r0 /* 803B4758 003B16B8 41 80 00 08 */ blt lbl_803B4760 /* 803B475C 003B16BC 7C 1C 03 78 */ mr r28, r0 lbl_803B4760: -/* 803B4760 003B16C0 81 8D AF A0 */ lwz r12, lbl_805A9B60@sda21(r13) +/* 803B4760 003B16C0 81 8D AF A0 */ lwz r12, aramUploadCallback@sda21(r13) /* 803B4764 003B16C4 7F 23 CB 78 */ mr r3, r25 /* 803B4768 003B16C8 7F 84 E3 78 */ mr r4, r28 /* 803B476C 003B16CC 7D 89 03 A6 */ mtctr r12 @@ -590,7 +590,7 @@ lbl_803B4760: /* 803B4774 003B16D4 7C 7D 1B 78 */ mr r29, r3 /* 803B4778 003B16D8 7F 84 E3 78 */ mr r4, r28 /* 803B477C 003B16DC 4B FC A3 35 */ bl DCFlushRange -/* 803B4780 003B16E0 83 4D AF A8 */ lwz r26, lbl_805A9B68@sda21(r13) +/* 803B4780 003B16E0 83 4D AF A8 */ lwz r26, aramWrite@sda21(r13) lbl_803B4784: /* 803B4784 003B16E4 4B FC CE DD */ bl OSDisableInterrupts /* 803B4788 003B16E8 88 1E 02 81 */ lbz r0, 0x281(r30) @@ -685,11 +685,11 @@ lbl_803B48E8: /* 803B48E8 003B1848 4B FC CD A1 */ bl OSRestoreInterrupts /* 803B48EC 003B184C 4B FF FE 98 */ b lbl_803B4784 lbl_803B48F0: -/* 803B48F0 003B1850 80 0D AF A8 */ lwz r0, lbl_805A9B68@sda21(r13) +/* 803B48F0 003B1850 80 0D AF A8 */ lwz r0, aramWrite@sda21(r13) /* 803B48F4 003B1854 7E FC B8 50 */ subf r23, r28, r23 /* 803B48F8 003B1858 7F 39 E2 14 */ add r25, r25, r28 /* 803B48FC 003B185C 7C 00 E2 14 */ add r0, r0, r28 -/* 803B4900 003B1860 90 0D AF A8 */ stw r0, lbl_805A9B68@sda21(r13) +/* 803B4900 003B1860 90 0D AF A8 */ stw r0, aramWrite@sda21(r13) lbl_803B4904: /* 803B4904 003B1864 28 17 00 00 */ cmplwi r23, 0 /* 803B4908 003B1868 40 82 FE 44 */ bne lbl_803B474C @@ -705,10 +705,10 @@ lbl_803B4910: .global sub_803b4928 sub_803b4928: /* 803B4928 003B1888 38 64 00 1F */ addi r3, r4, 0x1f -/* 803B492C 003B188C 80 0D AF A8 */ lwz r0, lbl_805A9B68@sda21(r13) +/* 803B492C 003B188C 80 0D AF A8 */ lwz r0, aramWrite@sda21(r13) /* 803B4930 003B1890 54 63 00 34 */ rlwinm r3, r3, 0, 0, 0x1a /* 803B4934 003B1894 7C 03 00 50 */ subf r0, r3, r0 -/* 803B4938 003B1898 90 0D AF A8 */ stw r0, lbl_805A9B68@sda21(r13) +/* 803B4938 003B1898 90 0D AF A8 */ stw r0, aramWrite@sda21(r13) /* 803B493C 003B189C 4E 80 00 20 */ blr .global InitStreamBuffers @@ -717,11 +717,11 @@ InitStreamBuffers: /* 803B4944 003B18A4 38 80 00 00 */ li r4, 0 /* 803B4948 003B18A8 38 63 74 98 */ addi r3, r3, lbl_80567498@l /* 803B494C 003B18AC 38 00 00 07 */ li r0, 7 -/* 803B4950 003B18B0 90 8D AF 98 */ stw r4, lbl_805A9B58@sda21(r13) +/* 803B4950 003B18B0 90 8D AF 98 */ stw r4, aramUsedStreamBuffers@sda21(r13) /* 803B4954 003B18B4 38 E3 00 10 */ addi r7, r3, 0x10 /* 803B4958 003B18B8 39 00 00 01 */ li r8, 1 -/* 803B495C 003B18BC 90 8D AF 94 */ stw r4, lbl_805A9B54@sda21(r13) -/* 803B4960 003B18C0 90 6D AF 90 */ stw r3, lbl_805A9B50@sda21(r13) +/* 803B495C 003B18BC 90 8D AF 94 */ stw r4, aramFreeStreamBuffers@sda21(r13) +/* 803B4960 003B18C0 90 6D AF 90 */ stw r3, aramIdleStreamBuffers@sda21(r13) /* 803B4964 003B18C4 7C 09 03 A6 */ mtctr r0 lbl_803B4968: /* 803B4968 003B18C8 90 E7 FF F0 */ stw r7, -0x10(r7) @@ -757,19 +757,19 @@ lbl_803B49D0: /* 803B49DC 003B193C 42 00 FF F4 */ bdnz lbl_803B49D0 lbl_803B49E0: /* 803B49E0 003B1940 3C 60 80 56 */ lis r3, lbl_80567498@ha -/* 803B49E4 003B1944 80 0D AF AC */ lwz r0, lbl_805A9B6C@sda21(r13) +/* 803B49E4 003B1944 80 0D AF AC */ lwz r0, aramTop@sda21(r13) /* 803B49E8 003B1948 38 83 74 98 */ addi r4, r3, lbl_80567498@l /* 803B49EC 003B194C 55 03 20 36 */ slwi r3, r8, 4 /* 803B49F0 003B1950 7C 64 1A 14 */ add r3, r4, r3 /* 803B49F4 003B1954 38 80 00 00 */ li r4, 0 /* 803B49F8 003B1958 90 83 FF F0 */ stw r4, -0x10(r3) -/* 803B49FC 003B195C 90 0D AF A4 */ stw r0, lbl_805A9B64@sda21(r13) +/* 803B49FC 003B195C 90 0D AF A4 */ stw r0, aramStream@sda21(r13) /* 803B4A00 003B1960 4E 80 00 20 */ blr .global sub_803b4a04 sub_803b4a04: /* 803B4A04 003B1964 38 03 00 1F */ addi r0, r3, 0x1f -/* 803B4A08 003B1968 80 6D AF 94 */ lwz r3, lbl_805A9B54@sda21(r13) +/* 803B4A08 003B1968 80 6D AF 94 */ lwz r3, aramFreeStreamBuffers@sda21(r13) /* 803B4A0C 003B196C 54 07 00 34 */ rlwinm r7, r0, 0, 0, 0x1a /* 803B4A10 003B1970 38 A0 00 00 */ li r5, 0 /* 803B4A14 003B1974 38 80 00 00 */ li r4, 0 @@ -796,26 +796,26 @@ lbl_803B4A50: lbl_803B4A58: /* 803B4A58 003B19B8 28 05 00 00 */ cmplwi r5, 0 /* 803B4A5C 003B19BC 40 82 00 58 */ bne lbl_803B4AB4 -/* 803B4A60 003B19C0 80 8D AF 90 */ lwz r4, lbl_805A9B50@sda21(r13) +/* 803B4A60 003B19C0 80 8D AF 90 */ lwz r4, aramIdleStreamBuffers@sda21(r13) /* 803B4A64 003B19C4 28 04 00 00 */ cmplwi r4, 0 /* 803B4A68 003B19C8 41 82 00 78 */ beq lbl_803B4AE0 -/* 803B4A6C 003B19CC 80 6D AF A4 */ lwz r3, lbl_805A9B64@sda21(r13) -/* 803B4A70 003B19D0 80 0D AF A8 */ lwz r0, lbl_805A9B68@sda21(r13) +/* 803B4A6C 003B19CC 80 6D AF A4 */ lwz r3, aramStream@sda21(r13) +/* 803B4A70 003B19D0 80 0D AF A8 */ lwz r0, aramWrite@sda21(r13) /* 803B4A74 003B19D4 7C 67 18 50 */ subf r3, r7, r3 /* 803B4A78 003B19D8 7C 03 00 40 */ cmplw r3, r0 /* 803B4A7C 003B19DC 41 80 00 64 */ blt lbl_803B4AE0 /* 803B4A80 003B19E0 80 04 00 00 */ lwz r0, 0(r4) /* 803B4A84 003B19E4 7C 85 23 78 */ mr r5, r4 -/* 803B4A88 003B19E8 90 0D AF 90 */ stw r0, lbl_805A9B50@sda21(r13) +/* 803B4A88 003B19E8 90 0D AF 90 */ stw r0, aramIdleStreamBuffers@sda21(r13) /* 803B4A8C 003B19EC 90 E4 00 0C */ stw r7, 0xc(r4) /* 803B4A90 003B19F0 90 E4 00 08 */ stw r7, 8(r4) -/* 803B4A94 003B19F4 80 0D AF A4 */ lwz r0, lbl_805A9B64@sda21(r13) +/* 803B4A94 003B19F4 80 0D AF A4 */ lwz r0, aramStream@sda21(r13) /* 803B4A98 003B19F8 7C 07 00 50 */ subf r0, r7, r0 -/* 803B4A9C 003B19FC 90 0D AF A4 */ stw r0, lbl_805A9B64@sda21(r13) +/* 803B4A9C 003B19FC 90 0D AF A4 */ stw r0, aramStream@sda21(r13) /* 803B4AA0 003B1A00 90 04 00 04 */ stw r0, 4(r4) -/* 803B4AA4 003B1A04 80 0D AF 98 */ lwz r0, lbl_805A9B58@sda21(r13) +/* 803B4AA4 003B1A04 80 0D AF 98 */ lwz r0, aramUsedStreamBuffers@sda21(r13) /* 803B4AA8 003B1A08 90 04 00 00 */ stw r0, 0(r4) -/* 803B4AAC 003B1A0C 90 8D AF 98 */ stw r4, lbl_805A9B58@sda21(r13) +/* 803B4AAC 003B1A0C 90 8D AF 98 */ stw r4, aramUsedStreamBuffers@sda21(r13) /* 803B4AB0 003B1A10 48 00 00 30 */ b lbl_803B4AE0 lbl_803B4AB4: /* 803B4AB4 003B1A14 28 04 00 00 */ cmplwi r4, 0 @@ -825,12 +825,12 @@ lbl_803B4AB4: /* 803B4AC4 003B1A24 48 00 00 0C */ b lbl_803B4AD0 lbl_803B4AC8: /* 803B4AC8 003B1A28 80 05 00 00 */ lwz r0, 0(r5) -/* 803B4ACC 003B1A2C 90 0D AF 94 */ stw r0, lbl_805A9B54@sda21(r13) +/* 803B4ACC 003B1A2C 90 0D AF 94 */ stw r0, aramFreeStreamBuffers@sda21(r13) lbl_803B4AD0: /* 803B4AD0 003B1A30 90 E5 00 08 */ stw r7, 8(r5) -/* 803B4AD4 003B1A34 80 0D AF 98 */ lwz r0, lbl_805A9B58@sda21(r13) +/* 803B4AD4 003B1A34 80 0D AF 98 */ lwz r0, aramUsedStreamBuffers@sda21(r13) /* 803B4AD8 003B1A38 90 05 00 00 */ stw r0, 0(r5) -/* 803B4ADC 003B1A3C 90 AD AF 98 */ stw r5, lbl_805A9B58@sda21(r13) +/* 803B4ADC 003B1A3C 90 AD AF 98 */ stw r5, aramUsedStreamBuffers@sda21(r13) lbl_803B4AE0: /* 803B4AE0 003B1A40 28 05 00 00 */ cmplwi r5, 0 /* 803B4AE4 003B1A44 40 82 00 0C */ bne lbl_803B4AF0 @@ -868,7 +868,7 @@ aramFreeStreamBuffer: /* 803B4B44 003B1AA4 3C 80 80 56 */ lis r4, lbl_80567498@ha /* 803B4B48 003B1AA8 54 63 25 36 */ rlwinm r3, r3, 4, 0x14, 0x1b /* 803B4B4C 003B1AAC 38 04 74 98 */ addi r0, r4, lbl_80567498@l -/* 803B4B50 003B1AB0 80 AD AF 98 */ lwz r5, lbl_805A9B58@sda21(r13) +/* 803B4B50 003B1AB0 80 AD AF 98 */ lwz r5, aramUsedStreamBuffers@sda21(r13) /* 803B4B54 003B1AB4 38 C0 00 00 */ li r6, 0 /* 803B4B58 003B1AB8 7C 80 1A 14 */ add r4, r0, r3 /* 803B4B5C 003B1ABC 48 00 00 34 */ b lbl_803B4B90 @@ -882,7 +882,7 @@ lbl_803B4B60: /* 803B4B78 003B1AD8 48 00 00 20 */ b lbl_803B4B98 lbl_803B4B7C: /* 803B4B7C 003B1ADC 80 04 00 00 */ lwz r0, 0(r4) -/* 803B4B80 003B1AE0 90 0D AF 98 */ stw r0, lbl_805A9B58@sda21(r13) +/* 803B4B80 003B1AE0 90 0D AF 98 */ stw r0, aramUsedStreamBuffers@sda21(r13) /* 803B4B84 003B1AE4 48 00 00 14 */ b lbl_803B4B98 lbl_803B4B88: /* 803B4B88 003B1AE8 7C A6 2B 78 */ mr r6, r5 @@ -892,14 +892,14 @@ lbl_803B4B90: /* 803B4B94 003B1AF4 40 82 FF CC */ bne lbl_803B4B60 lbl_803B4B98: /* 803B4B98 003B1AF8 80 64 00 04 */ lwz r3, 4(r4) -/* 803B4B9C 003B1AFC 80 0D AF A4 */ lwz r0, lbl_805A9B64@sda21(r13) +/* 803B4B9C 003B1AFC 80 0D AF A4 */ lwz r0, aramStream@sda21(r13) /* 803B4BA0 003B1B00 7C 03 00 40 */ cmplw r3, r0 /* 803B4BA4 003B1B04 40 82 00 88 */ bne lbl_803B4C2C -/* 803B4BA8 003B1B08 80 0D AF 90 */ lwz r0, lbl_805A9B50@sda21(r13) +/* 803B4BA8 003B1B08 80 0D AF 90 */ lwz r0, aramIdleStreamBuffers@sda21(r13) /* 803B4BAC 003B1B0C 38 A0 FF FF */ li r5, -1 -/* 803B4BB0 003B1B10 80 6D AF 98 */ lwz r3, lbl_805A9B58@sda21(r13) +/* 803B4BB0 003B1B10 80 6D AF 98 */ lwz r3, aramUsedStreamBuffers@sda21(r13) /* 803B4BB4 003B1B14 90 04 00 00 */ stw r0, 0(r4) -/* 803B4BB8 003B1B18 90 8D AF 90 */ stw r4, lbl_805A9B50@sda21(r13) +/* 803B4BB8 003B1B18 90 8D AF 90 */ stw r4, aramIdleStreamBuffers@sda21(r13) /* 803B4BBC 003B1B1C 48 00 00 18 */ b lbl_803B4BD4 lbl_803B4BC0: /* 803B4BC0 003B1B20 80 03 00 04 */ lwz r0, 4(r3) @@ -911,32 +911,32 @@ lbl_803B4BD0: lbl_803B4BD4: /* 803B4BD4 003B1B34 28 03 00 00 */ cmplwi r3, 0 /* 803B4BD8 003B1B38 40 82 FF E8 */ bne lbl_803B4BC0 -/* 803B4BDC 003B1B3C 80 8D AF 94 */ lwz r4, lbl_805A9B54@sda21(r13) +/* 803B4BDC 003B1B3C 80 8D AF 94 */ lwz r4, aramFreeStreamBuffers@sda21(r13) /* 803B4BE0 003B1B40 48 00 00 28 */ b lbl_803B4C08 lbl_803B4BE4: /* 803B4BE4 003B1B44 80 04 00 04 */ lwz r0, 4(r4) /* 803B4BE8 003B1B48 80 64 00 00 */ lwz r3, 0(r4) /* 803B4BEC 003B1B4C 7C 00 28 40 */ cmplw r0, r5 /* 803B4BF0 003B1B50 40 80 00 14 */ bge lbl_803B4C04 -/* 803B4BF4 003B1B54 90 6D AF 94 */ stw r3, lbl_805A9B54@sda21(r13) -/* 803B4BF8 003B1B58 80 0D AF 90 */ lwz r0, lbl_805A9B50@sda21(r13) +/* 803B4BF4 003B1B54 90 6D AF 94 */ stw r3, aramFreeStreamBuffers@sda21(r13) +/* 803B4BF8 003B1B58 80 0D AF 90 */ lwz r0, aramIdleStreamBuffers@sda21(r13) /* 803B4BFC 003B1B5C 90 04 00 00 */ stw r0, 0(r4) -/* 803B4C00 003B1B60 90 8D AF 90 */ stw r4, lbl_805A9B50@sda21(r13) +/* 803B4C00 003B1B60 90 8D AF 90 */ stw r4, aramIdleStreamBuffers@sda21(r13) lbl_803B4C04: /* 803B4C04 003B1B64 7C 64 1B 78 */ mr r4, r3 lbl_803B4C08: /* 803B4C08 003B1B68 28 04 00 00 */ cmplwi r4, 0 /* 803B4C0C 003B1B6C 40 82 FF D8 */ bne lbl_803B4BE4 /* 803B4C10 003B1B70 3C 05 00 01 */ addis r0, r5, 1 -/* 803B4C14 003B1B74 80 6D AF AC */ lwz r3, lbl_805A9B6C@sda21(r13) +/* 803B4C14 003B1B74 80 6D AF AC */ lwz r3, aramTop@sda21(r13) /* 803B4C18 003B1B78 28 00 FF FF */ cmplwi r0, 0xffff /* 803B4C1C 003B1B7C 41 82 00 08 */ beq lbl_803B4C24 /* 803B4C20 003B1B80 7C A3 2B 78 */ mr r3, r5 lbl_803B4C24: -/* 803B4C24 003B1B84 90 6D AF A4 */ stw r3, lbl_805A9B64@sda21(r13) +/* 803B4C24 003B1B84 90 6D AF A4 */ stw r3, aramStream@sda21(r13) /* 803B4C28 003B1B88 4E 80 00 20 */ blr lbl_803B4C2C: -/* 803B4C2C 003B1B8C 80 0D AF 94 */ lwz r0, lbl_805A9B54@sda21(r13) +/* 803B4C2C 003B1B8C 80 0D AF 94 */ lwz r0, aramFreeStreamBuffers@sda21(r13) /* 803B4C30 003B1B90 90 04 00 00 */ stw r0, 0(r4) -/* 803B4C34 003B1B94 90 8D AF 94 */ stw r4, lbl_805A9B54@sda21(r13) +/* 803B4C34 003B1B94 90 8D AF 94 */ stw r4, aramFreeStreamBuffers@sda21(r13) /* 803B4C38 003B1B98 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_dolphin.s b/asm/musyx/hw_dolphin.s index 2d085a60..47ec2bf6 100644 --- a/asm/musyx/hw_dolphin.s +++ b/asm/musyx/hw_dolphin.s @@ -1,7 +1,7 @@ .include "macros.inc" .section .sbss, "wa" - +.balign 4 .global oldState oldState: .skip 0x4 @@ -298,7 +298,7 @@ salCtrlDsp: /* 803B4FBC 003B1F1C 83 ED AF 40 */ lwz r31, dspCmdList@sda21(r13) /* 803B4FC0 003B1F20 90 0D AF C8 */ stw r0, salDspIsDone@sda21(r13) /* 803B4FC4 003B1F24 4B FB A8 49 */ bl PPCSync -/* 803B4FC8 003B1F28 A0 0D AF 3C */ lhz r0, lbl_805A9AFC@sda21(r13) +/* 803B4FC8 003B1F28 A0 0D AF 3C */ lhz r0, dspCmdFirstSize@sda21(r13) /* 803B4FCC 003B1F2C 64 03 BA BE */ oris r3, r0, 0xbabe /* 803B4FD0 003B1F30 4B FB AA 21 */ bl DSPSendMailToDSP lbl_803B4FD4: diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index 04de9c4b..03256f08 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -1,26 +1,59 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global dspARAMZeroBuffer +dspARAMZeroBuffer: + .skip 0x4 +.global dspCmdLastLoad +dspCmdLastLoad: + .skip 0x4 +.global dspCmdLastBase +dspCmdLastBase: + .skip 0x4 +.global dspCmdLastSize +dspCmdLastSize: + .skip 0x4 +.global dspCmdCurBase +dspCmdCurBase: + .skip 0x4 +.global dspCmdMaxPtr +dspCmdMaxPtr: + .skip 0x4 +.global dspCmdPtr +dspCmdPtr: + .skip 0x4 +.global dspCmdFirstSize +dspCmdFirstSize: + .skip 0x4 +.global dspCmdList +dspCmdList: + .skip 0x4 +.global dspHRTFOn +dspHRTFOn: + .skip 0x4 +.global dspHrtfHistoryBuffer +dspHrtfHistoryBuffer: + .skip 0x4 +.global dspSurround +dspSurround: + .skip 0x4 +.global dspITDBuffer +dspITDBuffer: + .skip 0x4 +.global dspVoice +dspVoice: + .skip 0x4 +.global salMessageCallback +salMessageCallback: + .skip 0x8 + .section .data, "wa" .global lbl_803F3FA8 lbl_803F3FA8: .incbin "baserom.dol", 0x3F0FA8, 0x18 -.section .sbss, "wa" - -.global lbl_805A9B4C -lbl_805A9B4C: - .skip 0x1 -.global lbl_805A9B4D -lbl_805A9B4D: - .skip 0x1 -.global lbl_805A9B4E -lbl_805A9B4E: - .skip 0x1 -.global lbl_805A9B4F -lbl_805A9B4F: - .skip 0x1 - .section .rodata .global lbl_803D8A68 lbl_803D8A68: @@ -41,10 +74,10 @@ salInitDspCtrl: /* 803AAD10 003A7C70 93 A1 00 14 */ stw r29, 0x14(r1) /* 803AAD14 003A7C74 93 81 00 10 */ stw r28, 0x10(r1) /* 803AAD18 003A7C78 7C BC 2B 78 */ mr r28, r5 -/* 803AAD1C 003A7C7C 98 6D AF 8D */ stb r3, lbl_805A9B4D@sda21(r13) -/* 803AAD20 003A7C80 98 8D AF 8C */ stb r4, lbl_805A9B4C@sda21(r13) +/* 803AAD1C 003A7C7C 98 6D AF 8D */ stb r3, salNumVoices@sda21(r13) +/* 803AAD20 003A7C80 98 8D AF 8C */ stb r4, salMaxStudioNum@sda21(r13) /* 803AAD24 003A7C84 48 00 97 D1 */ bl aramGetZeroBuffer -/* 803AAD28 003A7C88 90 6D AF 20 */ stw r3, lbl_805A9AE0@sda21(r13) +/* 803AAD28 003A7C88 90 6D AF 20 */ stw r3, dspARAMZeroBuffer@sda21(r13) /* 803AAD2C 003A7C8C 38 60 08 00 */ li r3, 0x800 /* 803AAD30 003A7C90 48 00 A4 05 */ bl salMalloc /* 803AAD34 003A7C94 28 03 00 00 */ cmplwi r3, 0 @@ -53,35 +86,35 @@ salInitDspCtrl: /* 803AAD40 003A7CA0 38 60 02 80 */ li r3, 0x280 /* 803AAD44 003A7CA4 48 00 A3 F1 */ bl salMalloc /* 803AAD48 003A7CA8 28 03 00 00 */ cmplwi r3, 0 -/* 803AAD4C 003A7CAC 90 6D AF 4C */ stw r3, lbl_805A9B0C@sda21(r13) +/* 803AAD4C 003A7CAC 90 6D AF 4C */ stw r3, dspSurround@sda21(r13) /* 803AAD50 003A7CB0 41 82 03 3C */ beq lbl_803AB08C /* 803AAD54 003A7CB4 38 80 00 00 */ li r4, 0 /* 803AAD58 003A7CB8 38 A0 02 80 */ li r5, 0x280 /* 803AAD5C 003A7CBC 4B C5 86 4D */ bl memset -/* 803AAD60 003A7CC0 80 6D AF 4C */ lwz r3, lbl_805A9B0C@sda21(r13) +/* 803AAD60 003A7CC0 80 6D AF 4C */ lwz r3, dspSurround@sda21(r13) /* 803AAD64 003A7CC4 38 80 02 80 */ li r4, 0x280 /* 803AAD68 003A7CC8 4B FD 3D 49 */ bl DCFlushRange -/* 803AAD6C 003A7CCC 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803AAD6C 003A7CCC 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803AAD70 003A7CD0 1C 60 00 F4 */ mulli r3, r0, 0xf4 /* 803AAD74 003A7CD4 48 00 A3 C1 */ bl salMalloc /* 803AAD78 003A7CD8 28 03 00 00 */ cmplwi r3, 0 -/* 803AAD7C 003A7CDC 90 6D AF 54 */ stw r3, lbl_805A9B14@sda21(r13) +/* 803AAD7C 003A7CDC 90 6D AF 54 */ stw r3, dspVoice@sda21(r13) /* 803AAD80 003A7CE0 41 82 03 0C */ beq lbl_803AB08C -/* 803AAD84 003A7CE4 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803AAD84 003A7CE4 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803AAD88 003A7CE8 54 03 30 32 */ slwi r3, r0, 6 /* 803AAD8C 003A7CEC 48 00 A3 A9 */ bl salMalloc /* 803AAD90 003A7CF0 28 03 00 00 */ cmplwi r3, 0 -/* 803AAD94 003A7CF4 90 6D AF 50 */ stw r3, lbl_805A9B10@sda21(r13) +/* 803AAD94 003A7CF4 90 6D AF 50 */ stw r3, dspITDBuffer@sda21(r13) /* 803AAD98 003A7CF8 41 82 02 F4 */ beq lbl_803AB08C -/* 803AAD9C 003A7CFC 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803AAD9C 003A7CFC 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803AADA0 003A7D00 54 04 30 32 */ slwi r4, r0, 6 /* 803AADA4 003A7D04 4B FD 3C E1 */ bl DCInvalidateRange -/* 803AADA8 003A7D08 83 AD AF 50 */ lwz r29, lbl_805A9B10@sda21(r13) +/* 803AADA8 003A7D08 83 AD AF 50 */ lwz r29, dspITDBuffer@sda21(r13) /* 803AADAC 003A7D0C 3B C0 00 00 */ li r30, 0 /* 803AADB0 003A7D10 3B E0 00 00 */ li r31, 0 /* 803AADB4 003A7D14 48 00 01 74 */ b lbl_803AAF28 lbl_803AADB8: -/* 803AADB8 003A7D18 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803AADB8 003A7D18 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803AADBC 003A7D1C 38 1F 00 EC */ addi r0, r31, 0xec /* 803AADC0 003A7D20 39 40 00 00 */ li r10, 0 /* 803AADC4 003A7D24 38 7F 00 ED */ addi r3, r31, 0xed @@ -89,33 +122,33 @@ lbl_803AADB8: /* 803AADCC 003A7D2C 38 FF 00 EE */ addi r7, r31, 0xee /* 803AADD0 003A7D30 38 DF 00 E4 */ addi r6, r31, 0xe4 /* 803AADD4 003A7D34 39 00 00 FF */ li r8, 0xff -/* 803AADD8 003A7D38 81 2D AF 54 */ lwz r9, lbl_805A9B14@sda21(r13) +/* 803AADD8 003A7D38 81 2D AF 54 */ lwz r9, dspVoice@sda21(r13) /* 803AADDC 003A7D3C 38 BF 00 E5 */ addi r5, r31, 0xe5 /* 803AADE0 003A7D40 38 9F 00 E6 */ addi r4, r31, 0xe6 /* 803AADE4 003A7D44 38 1F 00 E7 */ addi r0, r31, 0xe7 /* 803AADE8 003A7D48 7D 49 19 AE */ stbx r10, r9, r3 /* 803AADEC 003A7D4C 38 60 00 BC */ li r3, 0xbc -/* 803AADF0 003A7D50 81 2D AF 54 */ lwz r9, lbl_805A9B14@sda21(r13) +/* 803AADF0 003A7D50 81 2D AF 54 */ lwz r9, dspVoice@sda21(r13) /* 803AADF4 003A7D54 7D 49 39 AE */ stbx r10, r9, r7 -/* 803AADF8 003A7D58 80 ED AF 54 */ lwz r7, lbl_805A9B14@sda21(r13) +/* 803AADF8 003A7D58 80 ED AF 54 */ lwz r7, dspVoice@sda21(r13) /* 803AADFC 003A7D5C 7D 07 31 AE */ stbx r8, r7, r6 -/* 803AAE00 003A7D60 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803AAE00 003A7D60 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803AAE04 003A7D64 7D 06 29 AE */ stbx r8, r6, r5 -/* 803AAE08 003A7D68 80 AD AF 54 */ lwz r5, lbl_805A9B14@sda21(r13) +/* 803AAE08 003A7D68 80 AD AF 54 */ lwz r5, dspVoice@sda21(r13) /* 803AAE0C 003A7D6C 7D 05 21 AE */ stbx r8, r5, r4 -/* 803AAE10 003A7D70 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803AAE10 003A7D70 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803AAE14 003A7D74 7D 04 01 AE */ stbx r8, r4, r0 /* 803AAE18 003A7D78 48 00 A3 1D */ bl salMalloc -/* 803AAE1C 003A7D7C 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803AAE1C 003A7D7C 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803AAE20 003A7D80 38 80 00 00 */ li r4, 0 /* 803AAE24 003A7D84 38 A0 00 BC */ li r5, 0xbc /* 803AAE28 003A7D88 7C 66 F9 2E */ stwx r3, r6, r31 -/* 803AAE2C 003A7D8C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAE2C 003A7D8C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAE30 003A7D90 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AAE34 003A7D94 4B C5 85 75 */ bl memset /* 803AAE38 003A7D98 38 60 00 80 */ li r3, 0x80 /* 803AAE3C 003A7D9C 48 00 A2 F9 */ bl salMalloc -/* 803AAE40 003A7DA0 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803AAE40 003A7DA0 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803AAE44 003A7DA4 38 1F 00 04 */ addi r0, r31, 4 /* 803AAE48 003A7DA8 57 A7 84 3E */ srwi r7, r29, 0x10 /* 803AAE4C 003A7DAC 38 DF 00 08 */ addi r6, r31, 8 @@ -123,39 +156,39 @@ lbl_803AADB8: /* 803AAE54 003A7DB4 38 1F 00 E8 */ addi r0, r31, 0xe8 /* 803AAE58 003A7DB8 38 A0 FF FF */ li r5, -1 /* 803AAE5C 003A7DBC 38 80 00 BC */ li r4, 0xbc -/* 803AAE60 003A7DC0 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAE60 003A7DC0 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAE64 003A7DC4 7D 03 F8 2E */ lwzx r8, r3, r31 /* 803AAE68 003A7DC8 55 03 84 3E */ srwi r3, r8, 0x10 /* 803AAE6C 003A7DCC B0 68 00 04 */ sth r3, 4(r8) -/* 803AAE70 003A7DD0 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAE70 003A7DD0 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAE74 003A7DD4 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AAE78 003A7DD8 B0 63 00 06 */ sth r3, 6(r3) -/* 803AAE7C 003A7DDC 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAE7C 003A7DDC 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAE80 003A7DE0 7C 63 FA 14 */ add r3, r3, r31 /* 803AAE84 003A7DE4 81 03 00 04 */ lwz r8, 4(r3) /* 803AAE88 003A7DE8 80 63 00 00 */ lwz r3, 0(r3) /* 803AAE8C 003A7DEC 55 08 84 3E */ srwi r8, r8, 0x10 /* 803AAE90 003A7DF0 B1 03 00 4E */ sth r8, 0x4e(r3) -/* 803AAE94 003A7DF4 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAE94 003A7DF4 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAE98 003A7DF8 7C 63 FA 14 */ add r3, r3, r31 /* 803AAE9C 003A7DFC 81 03 00 04 */ lwz r8, 4(r3) /* 803AAEA0 003A7E00 80 63 00 00 */ lwz r3, 0(r3) /* 803AAEA4 003A7E04 B1 03 00 50 */ sth r8, 0x50(r3) -/* 803AAEA8 003A7E08 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAEA8 003A7E08 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAEAC 003A7E0C 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AAEB0 003A7E10 B0 E3 00 38 */ sth r7, 0x38(r3) -/* 803AAEB4 003A7E14 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAEB4 003A7E14 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAEB8 003A7E18 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AAEBC 003A7E1C B3 A3 00 3A */ sth r29, 0x3a(r3) -/* 803AAEC0 003A7E20 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAEC0 003A7E20 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAEC4 003A7E24 7F A3 31 2E */ stwx r29, r3, r6 /* 803AAEC8 003A7E28 3B BD 00 40 */ addi r29, r29, 0x40 -/* 803AAECC 003A7E2C 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAECC 003A7E2C 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAED0 003A7E30 7C A3 01 2E */ stwx r5, r3, r0 -/* 803AAED4 003A7E34 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAED4 003A7E34 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAED8 003A7E38 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AAEDC 003A7E3C 4B FD 3C 61 */ bl DCStoreRangeNoSync -/* 803AAEE0 003A7E40 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAEE0 003A7E40 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAEE4 003A7E44 38 1F 00 24 */ addi r0, r31, 0x24 /* 803AAEE8 003A7E48 38 E0 00 00 */ li r7, 0 /* 803AAEEC 003A7E4C 38 BF 00 28 */ addi r5, r31, 0x28 @@ -163,23 +196,23 @@ lbl_803AADB8: /* 803AAEF4 003A7E54 38 9F 00 2C */ addi r4, r31, 0x2c /* 803AAEF8 003A7E58 38 7F 00 30 */ addi r3, r31, 0x30 /* 803AAEFC 003A7E5C 38 1F 00 34 */ addi r0, r31, 0x34 -/* 803AAF00 003A7E60 80 CD AF 54 */ lwz r6, lbl_805A9B14@sda21(r13) +/* 803AAF00 003A7E60 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803AAF04 003A7E64 3B FF 00 F4 */ addi r31, r31, 0xf4 /* 803AAF08 003A7E68 3B DE 00 01 */ addi r30, r30, 1 /* 803AAF0C 003A7E6C 7C E6 29 2E */ stwx r7, r6, r5 -/* 803AAF10 003A7E70 80 AD AF 54 */ lwz r5, lbl_805A9B14@sda21(r13) +/* 803AAF10 003A7E70 80 AD AF 54 */ lwz r5, dspVoice@sda21(r13) /* 803AAF14 003A7E74 7C E5 21 2E */ stwx r7, r5, r4 -/* 803AAF18 003A7E78 80 8D AF 54 */ lwz r4, lbl_805A9B14@sda21(r13) +/* 803AAF18 003A7E78 80 8D AF 54 */ lwz r4, dspVoice@sda21(r13) /* 803AAF1C 003A7E7C 7C E4 19 2E */ stwx r7, r4, r3 -/* 803AAF20 003A7E80 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AAF20 003A7E80 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AAF24 003A7E84 7C E3 01 2E */ stwx r7, r3, r0 lbl_803AAF28: -/* 803AAF28 003A7E88 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803AAF28 003A7E88 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803AAF2C 003A7E8C 7C 1E 00 40 */ cmplw r30, r0 /* 803AAF30 003A7E90 41 80 FE 88 */ blt lbl_803AADB8 -/* 803AAF34 003A7E94 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AAF34 003A7E94 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AAF38 003A7E98 3B C0 00 00 */ li r30, 0 -/* 803AAF3C 003A7E9C 3B E3 F2 60 */ addi r31, r3, lbl_8055F260@l +/* 803AAF3C 003A7E9C 3B E3 F2 60 */ addi r31, r3, dspStudio@l /* 803AAF40 003A7EA0 48 00 01 00 */ b lbl_803AB040 lbl_803AAF44: /* 803AAF44 003A7EA4 38 00 00 00 */ li r0, 0 @@ -248,7 +281,7 @@ lbl_803AAF84: /* 803AB038 003A7F98 3B FF 00 BC */ addi r31, r31, 0xbc /* 803AB03C 003A7F9C 3B DE 00 01 */ addi r30, r30, 1 lbl_803AB040: -/* 803AB040 003A7FA0 88 0D AF 8C */ lbz r0, lbl_805A9B4C@sda21(r13) +/* 803AB040 003A7FA0 88 0D AF 8C */ lbz r0, salMaxStudioNum@sda21(r13) /* 803AB044 003A7FA4 7C 1E 00 40 */ cmplw r30, r0 /* 803AB048 003A7FA8 41 80 FE FC */ blt lbl_803AAF44 /* 803AB04C 003A7FAC 7C 1C 00 D0 */ neg r0, r28 @@ -260,7 +293,7 @@ lbl_803AB040: /* 803AB064 003A7FC4 38 60 01 00 */ li r3, 0x100 /* 803AB068 003A7FC8 48 00 A0 CD */ bl salMalloc /* 803AB06C 003A7FCC 28 03 00 00 */ cmplwi r3, 0 -/* 803AB070 003A7FD0 90 6D AF 48 */ stw r3, lbl_805A9B08@sda21(r13) +/* 803AB070 003A7FD0 90 6D AF 48 */ stw r3, dspHrtfHistoryBuffer@sda21(r13) /* 803AB074 003A7FD4 40 82 00 0C */ bne lbl_803AB080 /* 803AB078 003A7FD8 38 60 00 00 */ li r3, 0 /* 803AB07C 003A7FDC 48 00 00 14 */ b lbl_803AB090 @@ -287,9 +320,9 @@ salInitHRTFBuffer: /* 803AB0B8 003A8018 38 80 00 00 */ li r4, 0 /* 803AB0BC 003A801C 38 A0 01 00 */ li r5, 0x100 /* 803AB0C0 003A8020 90 01 00 14 */ stw r0, 0x14(r1) -/* 803AB0C4 003A8024 80 6D AF 48 */ lwz r3, lbl_805A9B08@sda21(r13) +/* 803AB0C4 003A8024 80 6D AF 48 */ lwz r3, dspHrtfHistoryBuffer@sda21(r13) /* 803AB0C8 003A8028 4B C5 82 E1 */ bl memset -/* 803AB0CC 003A802C 80 6D AF 48 */ lwz r3, lbl_805A9B08@sda21(r13) +/* 803AB0CC 003A802C 80 6D AF 48 */ lwz r3, dspHrtfHistoryBuffer@sda21(r13) /* 803AB0D0 003A8030 38 80 01 00 */ li r4, 0x100 /* 803AB0D4 003A8034 4B FD 3A 3D */ bl DCFlushRangeNoSync /* 803AB0D8 003A8038 80 01 00 14 */ lwz r0, 0x14(r1) @@ -305,29 +338,29 @@ salExitDspCtrl: /* 803AB0F4 003A8054 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803AB0F8 003A8058 93 C1 00 18 */ stw r30, 0x18(r1) /* 803AB0FC 003A805C 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803AB100 003A8060 80 6D AF 48 */ lwz r3, lbl_805A9B08@sda21(r13) +/* 803AB100 003A8060 80 6D AF 48 */ lwz r3, dspHrtfHistoryBuffer@sda21(r13) /* 803AB104 003A8064 48 00 A0 59 */ bl salFree /* 803AB108 003A8068 3B A0 00 00 */ li r29, 0 /* 803AB10C 003A806C 48 00 00 2C */ b lbl_803AB138 lbl_803AB110: /* 803AB110 003A8070 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 803AB114 003A8074 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AB114 003A8074 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AB118 003A8078 1F E0 00 F4 */ mulli r31, r0, 0xf4 /* 803AB11C 003A807C 7C 63 F8 2E */ lwzx r3, r3, r31 /* 803AB120 003A8080 48 00 A0 3D */ bl salFree -/* 803AB124 003A8084 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AB124 003A8084 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AB128 003A8088 38 1F 00 04 */ addi r0, r31, 4 /* 803AB12C 003A808C 7C 63 00 2E */ lwzx r3, r3, r0 /* 803AB130 003A8090 48 00 A0 2D */ bl salFree /* 803AB134 003A8094 3B BD 00 01 */ addi r29, r29, 1 lbl_803AB138: -/* 803AB138 003A8098 88 0D AF 8D */ lbz r0, lbl_805A9B4D@sda21(r13) +/* 803AB138 003A8098 88 0D AF 8D */ lbz r0, salNumVoices@sda21(r13) /* 803AB13C 003A809C 57 A3 06 3E */ clrlwi r3, r29, 0x18 /* 803AB140 003A80A0 7C 03 00 40 */ cmplw r3, r0 /* 803AB144 003A80A4 41 80 FF CC */ blt lbl_803AB110 -/* 803AB148 003A80A8 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB148 003A80A8 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB14C 003A80AC 3B A0 00 00 */ li r29, 0 -/* 803AB150 003A80B0 3B E3 F2 60 */ addi r31, r3, lbl_8055F260@l +/* 803AB150 003A80B0 3B E3 F2 60 */ addi r31, r3, dspStudio@l /* 803AB154 003A80B4 48 00 00 24 */ b lbl_803AB178 lbl_803AB158: /* 803AB158 003A80B8 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -339,15 +372,15 @@ lbl_803AB158: /* 803AB170 003A80D0 48 00 9F ED */ bl salFree /* 803AB174 003A80D4 3B BD 00 01 */ addi r29, r29, 1 lbl_803AB178: -/* 803AB178 003A80D8 88 0D AF 8C */ lbz r0, lbl_805A9B4C@sda21(r13) +/* 803AB178 003A80D8 88 0D AF 8C */ lbz r0, salMaxStudioNum@sda21(r13) /* 803AB17C 003A80DC 57 A3 06 3E */ clrlwi r3, r29, 0x18 /* 803AB180 003A80E0 7C 03 00 40 */ cmplw r3, r0 /* 803AB184 003A80E4 41 80 FF D4 */ blt lbl_803AB158 -/* 803AB188 003A80E8 80 6D AF 50 */ lwz r3, lbl_805A9B10@sda21(r13) +/* 803AB188 003A80E8 80 6D AF 50 */ lwz r3, dspITDBuffer@sda21(r13) /* 803AB18C 003A80EC 48 00 9F D1 */ bl salFree -/* 803AB190 003A80F0 80 6D AF 54 */ lwz r3, lbl_805A9B14@sda21(r13) +/* 803AB190 003A80F0 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803AB194 003A80F4 48 00 9F C9 */ bl salFree -/* 803AB198 003A80F8 80 6D AF 4C */ lwz r3, lbl_805A9B0C@sda21(r13) +/* 803AB198 003A80F8 80 6D AF 4C */ lwz r3, dspSurround@sda21(r13) /* 803AB19C 003A80FC 48 00 9F C1 */ bl salFree /* 803AB1A0 003A8100 80 6D AF 40 */ lwz r3, dspCmdList@sda21(r13) /* 803AB1A4 003A8104 48 00 9F B9 */ bl salFree @@ -366,10 +399,10 @@ salActivateStudio: /* 803AB1CC 003A812C 7C 08 02 A6 */ mflr r0 /* 803AB1D0 003A8130 90 01 00 24 */ stw r0, 0x24(r1) /* 803AB1D4 003A8134 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803AB1D8 003A8138 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB1D8 003A8138 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB1DC 003A813C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803AB1E0 003A8140 1F E0 00 BC */ mulli r31, r0, 0xbc -/* 803AB1E4 003A8144 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803AB1E4 003A8144 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803AB1E8 003A8148 93 C1 00 18 */ stw r30, 0x18(r1) /* 803AB1EC 003A814C 7C BE 2B 78 */ mr r30, r5 /* 803AB1F0 003A8150 38 A0 3C 00 */ li r5, 0x3c00 @@ -383,15 +416,15 @@ salActivateStudio: /* 803AB210 003A8170 80 7C 00 00 */ lwz r3, 0(r28) /* 803AB214 003A8174 38 80 3C 00 */ li r4, 0x3c00 /* 803AB218 003A8178 4B FD 38 F9 */ bl DCFlushRangeNoSync -/* 803AB21C 003A817C 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB21C 003A817C 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB220 003A8180 38 80 00 00 */ li r4, 0 -/* 803AB224 003A8184 3B 83 F2 60 */ addi r28, r3, lbl_8055F260@l +/* 803AB224 003A8184 3B 83 F2 60 */ addi r28, r3, dspStudio@l /* 803AB228 003A8188 38 A0 00 36 */ li r5, 0x36 /* 803AB22C 003A818C 7C 7C F8 2E */ lwzx r3, r28, r31 /* 803AB230 003A8190 4B C5 81 79 */ bl memset -/* 803AB234 003A8194 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB234 003A8194 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB238 003A8198 38 A0 00 00 */ li r5, 0 -/* 803AB23C 003A819C 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803AB23C 003A819C 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803AB240 003A81A0 38 80 00 36 */ li r4, 0x36 /* 803AB244 003A81A4 7C 60 FA 14 */ add r3, r0, r31 /* 803AB248 003A81A8 90 A3 00 0C */ stw r5, 0xc(r3) @@ -405,9 +438,9 @@ salActivateStudio: /* 803AB268 003A81C8 90 A3 00 1C */ stw r5, 0x1c(r3) /* 803AB26C 003A81CC 7C 7C F8 2E */ lwzx r3, r28, r31 /* 803AB270 003A81D0 4B FD 38 A1 */ bl DCFlushRangeNoSync -/* 803AB274 003A81D4 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB274 003A81D4 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB278 003A81D8 38 80 00 00 */ li r4, 0 -/* 803AB27C 003A81DC 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803AB27C 003A81DC 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803AB280 003A81E0 38 A0 07 80 */ li r5, 0x780 /* 803AB284 003A81E4 7F 80 FA 14 */ add r28, r0, r31 /* 803AB288 003A81E8 84 7C 00 30 */ lwzu r3, 0x30(r28) @@ -415,9 +448,9 @@ salActivateStudio: /* 803AB290 003A81F0 80 7C 00 00 */ lwz r3, 0(r28) /* 803AB294 003A81F4 38 80 07 80 */ li r4, 0x780 /* 803AB298 003A81F8 4B FD 38 79 */ bl DCFlushRangeNoSync -/* 803AB29C 003A81FC 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB29C 003A81FC 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB2A0 003A8200 38 80 00 00 */ li r4, 0 -/* 803AB2A4 003A8204 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803AB2A4 003A8204 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803AB2A8 003A8208 38 A0 07 80 */ li r5, 0x780 /* 803AB2AC 003A820C 7F 80 FA 14 */ add r28, r0, r31 /* 803AB2B0 003A8210 84 7C 00 3C */ lwzu r3, 0x3c(r28) @@ -425,9 +458,9 @@ salActivateStudio: /* 803AB2B8 003A8218 80 7C 00 00 */ lwz r3, 0(r28) /* 803AB2BC 003A821C 38 80 07 80 */ li r4, 0x780 /* 803AB2C0 003A8220 4B FD 38 51 */ bl DCFlushRangeNoSync -/* 803AB2C4 003A8224 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB2C4 003A8224 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB2C8 003A8228 38 80 00 00 */ li r4, 0 -/* 803AB2CC 003A822C 38 63 F2 60 */ addi r3, r3, lbl_8055F260@l +/* 803AB2CC 003A822C 38 63 F2 60 */ addi r3, r3, dspStudio@l /* 803AB2D0 003A8230 38 00 00 01 */ li r0, 1 /* 803AB2D4 003A8234 7C 63 FA 14 */ add r3, r3, r31 /* 803AB2D8 003A8238 90 83 00 48 */ stw r4, 0x48(r3) @@ -450,10 +483,10 @@ salActivateStudio: .global sub_803ab318 sub_803ab318: /* 803AB318 003A8278 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803AB31C 003A827C 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AB31C 003A827C 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB320 003A8280 1C 00 00 BC */ mulli r0, r0, 0xbc /* 803AB324 003A8284 38 80 00 00 */ li r4, 0 -/* 803AB328 003A8288 38 63 F2 60 */ addi r3, r3, lbl_8055F260@l +/* 803AB328 003A8288 38 63 F2 60 */ addi r3, r3, dspStudio@l /* 803AB32C 003A828C 7C 63 02 14 */ add r3, r3, r0 /* 803AB330 003A8290 98 83 00 50 */ stb r4, 0x50(r3) /* 803AB334 003A8294 4E 80 00 20 */ blr @@ -1024,13 +1057,13 @@ salBuildCommandList: /* 803ABAD8 003A8A38 4B FD DF 71 */ bl __save_gpr /* 803ABADC 003A8A3C 80 AD AF 40 */ lwz r5, dspCmdList@sda21(r13) /* 803ABAE0 003A8A40 38 00 00 00 */ li r0, 0 -/* 803ABAE4 003A8A44 90 0D AF 24 */ stw r0, lbl_805A9AE4@sda21(r13) +/* 803ABAE4 003A8A44 90 0D AF 24 */ stw r0, dspCmdLastLoad@sda21(r13) /* 803ABAE8 003A8A48 28 04 00 C8 */ cmplwi r4, 0xc8 /* 803ABAEC 003A8A4C 38 05 01 80 */ addi r0, r5, 0x180 /* 803ABAF0 003A8A50 90 61 00 08 */ stw r3, 8(r1) -/* 803ABAF4 003A8A54 90 AD AF 38 */ stw r5, lbl_805A9AF8@sda21(r13) -/* 803ABAF8 003A8A58 90 AD AF 30 */ stw r5, lbl_805A9AF0@sda21(r13) -/* 803ABAFC 003A8A5C 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803ABAF4 003A8A54 90 AD AF 38 */ stw r5, dspCmdPtr@sda21(r13) +/* 803ABAF8 003A8A58 90 AD AF 30 */ stw r5, dspCmdCurBase@sda21(r13) +/* 803ABAFC 003A8A5C 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) /* 803ABB00 003A8A60 40 80 00 0C */ bge lbl_803ABB0C /* 803ABB04 003A8A64 3A E0 28 BE */ li r23, 0x28be /* 803ABB08 003A8A68 48 00 00 38 */ b lbl_803ABB40 @@ -1049,16 +1082,16 @@ lbl_803ABB0C: /* 803ABB38 003A8A98 7C 64 01 D6 */ mullw r3, r4, r0 /* 803ABB3C 003A8A9C 3A E3 28 BE */ addi r23, r3, 0x28be lbl_803ABB40: -/* 803ABB40 003A8AA0 80 0D AF 44 */ lwz r0, lbl_805A9B04@sda21(r13) +/* 803ABB40 003A8AA0 80 0D AF 44 */ lwz r0, dspHRTFOn@sda21(r13) /* 803ABB44 003A8AA4 28 00 00 00 */ cmplwi r0, 0 /* 803ABB48 003A8AA8 41 82 00 0C */ beq lbl_803ABB54 /* 803ABB4C 003A8AAC 3E F7 00 01 */ addis r23, r23, 1 /* 803ABB50 003A8AB0 3A F7 AF C8 */ addi r23, r23, -20536 lbl_803ABB54: /* 803ABB54 003A8AB4 38 00 00 00 */ li r0, 0 -/* 803ABB58 003A8AB8 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803ABB58 003A8AB8 3C 60 80 56 */ lis r3, dspStudio@ha /* 803ABB5C 003A8ABC B0 01 00 10 */ sth r0, 0x10(r1) -/* 803ABB60 003A8AC0 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803ABB60 003A8AC0 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803ABB64 003A8AC4 90 01 00 28 */ stw r0, 0x28(r1) /* 803ABB68 003A8AC8 38 00 00 00 */ li r0, 0 /* 803ABB6C 003A8ACC 98 01 00 24 */ stb r0, 0x24(r1) @@ -1119,9 +1152,9 @@ lbl_803ABC18: lbl_803ABC28: /* 803ABC28 003A8B88 28 0E 00 00 */ cmplwi r14, 0 /* 803ABC2C 003A8B8C 40 82 FF EC */ bne lbl_803ABC18 -/* 803ABC30 003A8B90 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) +/* 803ABC30 003A8B90 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) /* 803ABC34 003A8B94 38 00 00 00 */ li r0, 0 -/* 803ABC38 003A8B98 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803ABC38 003A8B98 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803ABC3C 003A8B9C 38 85 00 06 */ addi r4, r5, 6 /* 803ABC40 003A8BA0 90 10 00 4C */ stw r0, 0x4c(r16) /* 803ABC44 003A8BA4 38 03 FF F8 */ addi r0, r3, -8 @@ -1129,16 +1162,16 @@ lbl_803ABC28: /* 803ABC4C 003A8BAC 40 81 00 8C */ ble lbl_803ABCD8 /* 803ABC50 003A8BB0 38 00 00 0D */ li r0, 0xd /* 803ABC54 003A8BB4 B0 05 00 00 */ sth r0, 0(r5) -/* 803ABC58 003A8BB8 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ABC5C 003A8BBC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABC58 003A8BB8 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ABC5C 003A8BBC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABC60 003A8BC0 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ABC64 003A8BC4 B0 03 00 02 */ sth r0, 2(r3) -/* 803ABC68 003A8BC8 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ABC6C 003A8BCC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABC68 003A8BC8 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ABC6C 003A8BCC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABC70 003A8BD0 B0 03 00 04 */ sth r0, 4(r3) -/* 803ABC74 003A8BD4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803ABC78 003A8BD8 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803ABC7C 003A8BDC 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ABC74 003A8BD4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803ABC78 003A8BD8 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803ABC7C 003A8BDC 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ABC80 003A8BE0 38 03 00 08 */ addi r0, r3, 8 /* 803ABC84 003A8BE4 28 05 00 00 */ cmplwi r5, 0 /* 803ABC88 003A8BE8 7C 64 00 50 */ subf r3, r4, r0 @@ -1146,62 +1179,62 @@ lbl_803ABC28: /* 803ABC90 003A8BF0 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803ABC94 003A8BF4 41 82 00 18 */ beq lbl_803ABCAC /* 803ABC98 003A8BF8 B1 C5 00 06 */ sth r14, 6(r5) -/* 803ABC9C 003A8BFC 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803ABCA0 003A8C00 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803ABC9C 003A8BFC 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803ABCA0 003A8C00 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803ABCA4 003A8C04 4B FD 2E 99 */ bl DCStoreRangeNoSync /* 803ABCA8 003A8C08 48 00 00 08 */ b lbl_803ABCB0 lbl_803ABCAC: -/* 803ABCAC 003A8C0C B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803ABCAC 003A8C0C B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803ABCB0: -/* 803ABCB0 003A8C10 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803ABCB4 003A8C14 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ABCB8 003A8C18 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ABCB0 003A8C10 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803ABCB4 003A8C14 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ABCB8 003A8C18 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ABCBC 003A8C1C 38 03 01 80 */ addi r0, r3, 0x180 -/* 803ABCC0 003A8C20 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803ABCC4 003A8C24 B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803ABCC8 003A8C28 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803ABCCC 003A8C2C 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803ABCD0 003A8C30 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803ABCD4 003A8C34 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803ABCC0 003A8C20 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803ABCC4 003A8C24 B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803ABCC8 003A8C28 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803ABCCC 003A8C2C 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803ABCD0 003A8C30 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803ABCD4 003A8C34 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803ABCD8: -/* 803ABCD8 003A8C38 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ABCD8 003A8C38 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ABCDC 003A8C3C 38 00 00 00 */ li r0, 0 -/* 803ABCE0 003A8C40 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803ABCE0 003A8C40 3C 60 80 56 */ lis r3, dspStudio@ha /* 803ABCE4 003A8C44 7E 11 83 78 */ mr r17, r16 /* 803ABCE8 003A8C48 B0 04 00 00 */ sth r0, 0(r4) -/* 803ABCEC 003A8C4C 39 C3 F2 60 */ addi r14, r3, lbl_8055F260@l +/* 803ABCEC 003A8C4C 39 C3 F2 60 */ addi r14, r3, dspStudio@l /* 803ABCF0 003A8C50 3A 40 00 00 */ li r18, 0 /* 803ABCF4 003A8C54 3A F7 2C 62 */ addi r23, r23, 0x2c62 /* 803ABCF8 003A8C58 80 10 00 00 */ lwz r0, 0(r16) -/* 803ABCFC 003A8C5C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABCFC 003A8C5C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABD00 003A8C60 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ABD04 003A8C64 B0 03 00 02 */ sth r0, 2(r3) /* 803ABD08 003A8C68 80 10 00 00 */ lwz r0, 0(r16) -/* 803ABD0C 003A8C6C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABD0C 003A8C6C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABD10 003A8C70 B0 03 00 04 */ sth r0, 4(r3) -/* 803ABD14 003A8C74 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABD14 003A8C74 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABD18 003A8C78 38 03 00 06 */ addi r0, r3, 6 -/* 803ABD1C 003A8C7C 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803ABD1C 003A8C7C 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803ABD20 003A8C80 48 00 01 40 */ b lbl_803ABE60 lbl_803ABD24: -/* 803ABD24 003A8C84 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ABD28 003A8C88 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803ABD24 003A8C84 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ABD28 003A8C88 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803ABD2C 003A8C8C 38 85 00 0C */ addi r4, r5, 0xc /* 803ABD30 003A8C90 38 03 FF F8 */ addi r0, r3, -8 /* 803ABD34 003A8C94 7C 04 00 40 */ cmplw r4, r0 /* 803ABD38 003A8C98 40 81 00 8C */ ble lbl_803ABDC4 /* 803ABD3C 003A8C9C 38 00 00 0D */ li r0, 0xd /* 803ABD40 003A8CA0 B0 05 00 00 */ sth r0, 0(r5) -/* 803ABD44 003A8CA4 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ABD48 003A8CA8 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABD44 003A8CA4 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ABD48 003A8CA8 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABD4C 003A8CAC 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ABD50 003A8CB0 B0 03 00 02 */ sth r0, 2(r3) -/* 803ABD54 003A8CB4 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ABD58 003A8CB8 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABD54 003A8CB4 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ABD58 003A8CB8 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABD5C 003A8CBC B0 03 00 04 */ sth r0, 4(r3) -/* 803ABD60 003A8CC0 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803ABD64 003A8CC4 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803ABD68 003A8CC8 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ABD60 003A8CC0 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803ABD64 003A8CC4 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803ABD68 003A8CC8 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ABD6C 003A8CCC 38 03 00 08 */ addi r0, r3, 8 /* 803ABD70 003A8CD0 28 05 00 00 */ cmplwi r5, 0 /* 803ABD74 003A8CD4 7C 64 00 50 */ subf r3, r4, r0 @@ -1209,33 +1242,33 @@ lbl_803ABD24: /* 803ABD7C 003A8CDC 54 13 04 3A */ rlwinm r19, r0, 0, 0x10, 0x1d /* 803ABD80 003A8CE0 41 82 00 18 */ beq lbl_803ABD98 /* 803ABD84 003A8CE4 B2 65 00 06 */ sth r19, 6(r5) -/* 803ABD88 003A8CE8 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803ABD8C 003A8CEC A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803ABD88 003A8CE8 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803ABD8C 003A8CEC A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803ABD90 003A8CF0 4B FD 2D AD */ bl DCStoreRangeNoSync /* 803ABD94 003A8CF4 48 00 00 08 */ b lbl_803ABD9C lbl_803ABD98: -/* 803ABD98 003A8CF8 B2 6D AF 3C */ sth r19, lbl_805A9AFC@sda21(r13) +/* 803ABD98 003A8CF8 B2 6D AF 3C */ sth r19, dspCmdFirstSize@sda21(r13) lbl_803ABD9C: -/* 803ABD9C 003A8CFC 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803ABDA0 003A8D00 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ABDA4 003A8D04 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ABD9C 003A8CFC 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803ABDA0 003A8D00 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ABDA4 003A8D04 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ABDA8 003A8D08 38 03 01 80 */ addi r0, r3, 0x180 -/* 803ABDAC 003A8D0C 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803ABDB0 003A8D10 B2 6D AF 2C */ sth r19, lbl_805A9AEC@sda21(r13) -/* 803ABDB4 003A8D14 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803ABDB8 003A8D18 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803ABDBC 003A8D1C 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803ABDC0 003A8D20 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803ABDAC 003A8D0C 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803ABDB0 003A8D10 B2 6D AF 2C */ sth r19, dspCmdLastSize@sda21(r13) +/* 803ABDB4 003A8D14 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803ABDB8 003A8D18 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803ABDBC 003A8D1C 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803ABDC0 003A8D20 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803ABDC4: -/* 803ABDC4 003A8D24 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABDC4 003A8D24 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABDC8 003A8D28 38 00 00 01 */ li r0, 1 /* 803ABDCC 003A8D2C 3A F7 29 4D */ addi r23, r23, 0x294d /* 803ABDD0 003A8D30 3A 52 00 01 */ addi r18, r18, 1 /* 803ABDD4 003A8D34 B0 03 00 00 */ sth r0, 0(r3) /* 803ABDD8 003A8D38 88 71 00 58 */ lbz r3, 0x58(r17) -/* 803ABDDC 003A8D3C 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) +/* 803ABDDC 003A8D3C 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) /* 803ABDE0 003A8D40 1C 83 00 BC */ mulli r4, r3, 0xbc -/* 803ABDE4 003A8D44 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABDE4 003A8D44 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABDE8 003A8D48 68 00 00 01 */ xori r0, r0, 1 /* 803ABDEC 003A8D4C 7C 8E 22 14 */ add r4, r14, r4 /* 803ABDF0 003A8D50 54 00 10 3A */ slwi r0, r0, 2 @@ -1244,9 +1277,9 @@ lbl_803ABDC4: /* 803ABDFC 003A8D5C 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ABE00 003A8D60 B0 03 00 02 */ sth r0, 2(r3) /* 803ABE04 003A8D64 88 71 00 58 */ lbz r3, 0x58(r17) -/* 803ABE08 003A8D68 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) +/* 803ABE08 003A8D68 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) /* 803ABE0C 003A8D6C 1C 83 00 BC */ mulli r4, r3, 0xbc -/* 803ABE10 003A8D70 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABE10 003A8D70 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABE14 003A8D74 68 00 00 01 */ xori r0, r0, 1 /* 803ABE18 003A8D78 7C 8E 22 14 */ add r4, r14, r4 /* 803ABE1C 003A8D7C 54 00 10 3A */ slwi r0, r0, 2 @@ -1254,25 +1287,25 @@ lbl_803ABDC4: /* 803ABE24 003A8D84 80 04 00 28 */ lwz r0, 0x28(r4) /* 803ABE28 003A8D88 B0 03 00 04 */ sth r0, 4(r3) /* 803ABE2C 003A8D8C A0 11 00 5A */ lhz r0, 0x5a(r17) -/* 803ABE30 003A8D90 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABE30 003A8D90 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABE34 003A8D94 B0 03 00 06 */ sth r0, 6(r3) /* 803ABE38 003A8D98 A0 11 00 5C */ lhz r0, 0x5c(r17) -/* 803ABE3C 003A8D9C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABE3C 003A8D9C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABE40 003A8DA0 B0 03 00 08 */ sth r0, 8(r3) /* 803ABE44 003A8DA4 A0 11 00 5E */ lhz r0, 0x5e(r17) /* 803ABE48 003A8DA8 3A 31 00 0C */ addi r17, r17, 0xc -/* 803ABE4C 003A8DAC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABE4C 003A8DAC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABE50 003A8DB0 B0 03 00 0A */ sth r0, 0xa(r3) -/* 803ABE54 003A8DB4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ABE54 003A8DB4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ABE58 003A8DB8 38 03 00 0C */ addi r0, r3, 0xc -/* 803ABE5C 003A8DBC 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803ABE5C 003A8DBC 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) lbl_803ABE60: /* 803ABE60 003A8DC0 88 10 00 52 */ lbz r0, 0x52(r16) /* 803ABE64 003A8DC4 7C 12 00 40 */ cmplw r18, r0 /* 803ABE68 003A8DC8 41 80 FE BC */ blt lbl_803ABD24 -/* 803ABE6C 003A8DCC 3C 60 80 56 */ lis r3, lbl_8055F840@ha +/* 803ABE6C 003A8DCC 3C 60 80 56 */ lis r3, "voices$217"@ha /* 803ABE70 003A8DD0 80 90 00 48 */ lwz r4, 0x48(r16) -/* 803ABE74 003A8DD4 38 63 F8 40 */ addi r3, r3, lbl_8055F840@l +/* 803ABE74 003A8DD4 38 63 F8 40 */ addi r3, r3, "voices$217"@l /* 803ABE78 003A8DD8 3A 40 00 00 */ li r18, 0 /* 803ABE7C 003A8DDC 39 C0 00 00 */ li r14, 0 /* 803ABE80 003A8DE0 48 00 00 14 */ b lbl_803ABE94 @@ -1284,14 +1317,14 @@ lbl_803ABE84: lbl_803ABE94: /* 803ABE94 003A8DF4 28 04 00 00 */ cmplwi r4, 0 /* 803ABE98 003A8DF8 40 82 FF EC */ bne lbl_803ABE84 -/* 803ABE9C 003A8DFC 3C 60 80 56 */ lis r3, lbl_8055F840@ha +/* 803ABE9C 003A8DFC 3C 60 80 56 */ lis r3, "voices$217"@ha /* 803ABEA0 003A8E00 38 AE FF FF */ addi r5, r14, -1 -/* 803ABEA4 003A8E04 38 63 F8 40 */ addi r3, r3, lbl_8055F840@l +/* 803ABEA4 003A8E04 38 63 F8 40 */ addi r3, r3, "voices$217"@l /* 803ABEA8 003A8E08 38 80 00 00 */ li r4, 0 /* 803ABEAC 003A8E0C 4B FF F9 C5 */ bl SortVoices -/* 803ABEB0 003A8E10 3C 60 80 56 */ lis r3, lbl_8055F840@ha +/* 803ABEB0 003A8E10 3C 60 80 56 */ lis r3, "voices$217"@ha /* 803ABEB4 003A8E14 55 C4 10 3A */ slwi r4, r14, 2 -/* 803ABEB8 003A8E18 38 03 F8 40 */ addi r0, r3, lbl_8055F840@l +/* 803ABEB8 003A8E18 38 03 F8 40 */ addi r0, r3, "voices$217"@l /* 803ABEBC 003A8E1C 7D DC 73 78 */ mr r28, r14 /* 803ABEC0 003A8E20 7D C0 22 14 */ add r14, r0, r4 /* 803ABEC4 003A8E24 38 00 00 00 */ li r0, 0 @@ -1696,7 +1729,7 @@ lbl_803AC4A8: /* 803AC4A8 003A9408 3C 60 24 92 */ lis r3, 0x24924925@ha /* 803AC4AC 003A940C 80 BD 00 84 */ lwz r5, 0x84(r29) /* 803AC4B0 003A9410 38 63 49 25 */ addi r3, r3, 0x24924925@l -/* 803AC4B4 003A9414 80 0D AF 20 */ lwz r0, lbl_805A9AE0@sda21(r13) +/* 803AC4B4 003A9414 80 0D AF 20 */ lwz r0, dspARAMZeroBuffer@sda21(r13) /* 803AC4B8 003A9418 7C 83 28 16 */ mulhwu r4, r3, r5 /* 803AC4BC 003A941C 54 03 08 3C */ slwi r3, r0, 1 /* 803AC4C0 003A9420 39 E3 00 02 */ addi r15, r3, 2 @@ -1713,12 +1746,12 @@ lbl_803AC4A8: /* 803AC4EC 003A944C 48 00 00 24 */ b lbl_803AC510 lbl_803AC4F0: /* 803AC4F0 003A9450 80 1D 00 84 */ lwz r0, 0x84(r29) -/* 803AC4F4 003A9454 81 ED AF 20 */ lwz r15, lbl_805A9AE0@sda21(r13) +/* 803AC4F4 003A9454 81 ED AF 20 */ lwz r15, dspARAMZeroBuffer@sda21(r13) /* 803AC4F8 003A9458 7F 58 02 14 */ add r26, r24, r0 /* 803AC4FC 003A945C 48 00 00 14 */ b lbl_803AC510 lbl_803AC500: /* 803AC500 003A9460 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 803AC504 003A9464 80 0D AF 20 */ lwz r0, lbl_805A9AE0@sda21(r13) +/* 803AC504 003A9464 80 0D AF 20 */ lwz r0, dspARAMZeroBuffer@sda21(r13) /* 803AC508 003A9468 7F 58 1A 14 */ add r26, r24, r3 /* 803AC50C 003A946C 54 0F F8 7E */ srwi r15, r0, 1 lbl_803AC510: @@ -2546,10 +2579,10 @@ lbl_803AD0F0: /* 803AD0F8 003AA058 7F A3 EB 78 */ mr r3, r29 /* 803AD0FC 003AA05C 38 80 00 01 */ li r4, 1 /* 803AD100 003AA060 48 00 0B 81 */ bl salSynthSendMessage -/* 803AD104 003AA064 3C 60 80 56 */ lis r3, lbl_8055F840@ha +/* 803AD104 003AA064 3C 60 80 56 */ lis r3, "voices$217"@ha /* 803AD108 003AA068 3B 9C FF FF */ addi r28, r28, -1 /* 803AD10C 003AA06C 57 84 10 3A */ slwi r4, r28, 2 -/* 803AD110 003AA070 38 03 F8 40 */ addi r0, r3, lbl_8055F840@l +/* 803AD110 003AA070 38 03 F8 40 */ addi r0, r3, "voices$217"@l /* 803AD114 003AA074 7D C0 22 14 */ add r14, r0, r4 /* 803AD118 003AA078 48 00 00 38 */ b lbl_803AD150 lbl_803AD11C: @@ -2572,9 +2605,9 @@ lbl_803AD150: /* 803AD154 003AA0B4 41 81 FF C8 */ bgt lbl_803AD11C /* 803AD158 003AA0B8 88 61 00 24 */ lbz r3, 0x24(r1) /* 803AD15C 003AA0BC 38 03 00 01 */ addi r0, r3, 1 -/* 803AD160 003AA0C0 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AD160 003AA0C0 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AD164 003AA0C4 54 0E 06 3E */ clrlwi r14, r0, 0x18 -/* 803AD168 003AA0C8 3A 23 F2 60 */ addi r17, r3, lbl_8055F260@l +/* 803AD168 003AA0C8 3A 23 F2 60 */ addi r17, r3, dspStudio@l /* 803AD16C 003AA0CC 48 00 00 64 */ b lbl_803AD1D0 lbl_803AD170: /* 803AD170 003AA0D0 55 C0 06 3E */ clrlwi r0, r14, 0x18 @@ -2606,7 +2639,7 @@ lbl_803AD1C4: lbl_803AD1CC: /* 803AD1CC 003AA12C 39 CE 00 01 */ addi r14, r14, 1 lbl_803AD1D0: -/* 803AD1D0 003AA130 88 0D AF 8C */ lbz r0, lbl_805A9B4C@sda21(r13) +/* 803AD1D0 003AA130 88 0D AF 8C */ lbz r0, salMaxStudioNum@sda21(r13) /* 803AD1D4 003AA134 55 C3 06 3E */ clrlwi r3, r14, 0x18 /* 803AD1D8 003AA138 7C 03 00 40 */ cmplw r3, r0 /* 803AD1DC 003AA13C 41 80 FF 94 */ blt lbl_803AD170 @@ -2614,24 +2647,24 @@ lbl_803AD1D0: lbl_803AD1E4: /* 803AD1E4 003AA144 28 12 00 00 */ cmplwi r18, 0 /* 803AD1E8 003AA148 40 82 00 DC */ bne lbl_803AD2C4 -/* 803AD1EC 003AA14C 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD1F0 003AA150 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD1EC 003AA14C 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD1F0 003AA150 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD1F4 003AA154 38 85 00 06 */ addi r4, r5, 6 /* 803AD1F8 003AA158 38 03 FF F8 */ addi r0, r3, -8 /* 803AD1FC 003AA15C 7C 04 00 40 */ cmplw r4, r0 /* 803AD200 003AA160 40 81 00 8C */ ble lbl_803AD28C /* 803AD204 003AA164 38 00 00 0D */ li r0, 0xd /* 803AD208 003AA168 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD20C 003AA16C 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD210 003AA170 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD20C 003AA16C 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD210 003AA170 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD214 003AA174 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD218 003AA178 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD21C 003AA17C 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD220 003AA180 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD21C 003AA17C 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD220 003AA180 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD224 003AA184 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD228 003AA188 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD22C 003AA18C 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD230 003AA190 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD228 003AA188 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD22C 003AA18C 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD230 003AA190 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD234 003AA194 38 03 00 08 */ addi r0, r3, 8 /* 803AD238 003AA198 28 05 00 00 */ cmplwi r5, 0 /* 803AD23C 003AA19C 7C 64 00 50 */ subf r3, r4, r0 @@ -2639,37 +2672,37 @@ lbl_803AD1E4: /* 803AD244 003AA1A4 54 11 04 3A */ rlwinm r17, r0, 0, 0x10, 0x1d /* 803AD248 003AA1A8 41 82 00 18 */ beq lbl_803AD260 /* 803AD24C 003AA1AC B2 25 00 06 */ sth r17, 6(r5) -/* 803AD250 003AA1B0 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD254 003AA1B4 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD250 003AA1B0 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD254 003AA1B4 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD258 003AA1B8 4B FD 18 E5 */ bl DCStoreRangeNoSync /* 803AD25C 003AA1BC 48 00 00 08 */ b lbl_803AD264 lbl_803AD260: -/* 803AD260 003AA1C0 B2 2D AF 3C */ sth r17, lbl_805A9AFC@sda21(r13) +/* 803AD260 003AA1C0 B2 2D AF 3C */ sth r17, dspCmdFirstSize@sda21(r13) lbl_803AD264: -/* 803AD264 003AA1C4 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD268 003AA1C8 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD26C 003AA1CC 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD264 003AA1C4 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD268 003AA1C8 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD26C 003AA1CC 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD270 003AA1D0 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD274 003AA1D4 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD278 003AA1D8 B2 2D AF 2C */ sth r17, lbl_805A9AEC@sda21(r13) -/* 803AD27C 003AA1DC 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD280 003AA1E0 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD284 003AA1E4 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD288 003AA1E8 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD274 003AA1D4 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD278 003AA1D8 B2 2D AF 2C */ sth r17, dspCmdLastSize@sda21(r13) +/* 803AD27C 003AA1DC 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD280 003AA1E0 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD284 003AA1E4 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD288 003AA1E8 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD28C: -/* 803AD28C 003AA1EC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD28C 003AA1EC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD290 003AA1F0 38 00 00 02 */ li r0, 2 /* 803AD294 003AA1F4 56 64 84 3E */ srwi r4, r19, 0x10 /* 803AD298 003AA1F8 B0 03 00 00 */ sth r0, 0(r3) /* 803AD29C 003AA1FC 38 00 00 01 */ li r0, 1 -/* 803AD2A0 003AA200 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD2A0 003AA200 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD2A4 003AA204 90 01 00 1C */ stw r0, 0x1c(r1) /* 803AD2A8 003AA208 B0 83 00 02 */ sth r4, 2(r3) -/* 803AD2AC 003AA20C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD2AC 003AA20C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD2B0 003AA210 B2 63 00 04 */ sth r19, 4(r3) -/* 803AD2B4 003AA214 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD2B4 003AA214 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD2B8 003AA218 38 03 00 06 */ addi r0, r3, 6 -/* 803AD2BC 003AA21C 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD2BC 003AA21C 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803AD2C0 003AA220 48 00 00 24 */ b lbl_803AD2E4 lbl_803AD2C4: /* 803AD2C4 003AA224 56 60 84 3E */ srwi r0, r19, 0x10 @@ -2692,24 +2725,24 @@ lbl_803AD2F8: /* 803AD2F8 003AA258 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803AD2FC 003AA25C 28 00 00 00 */ cmplwi r0, 0 /* 803AD300 003AA260 41 82 00 B8 */ beq lbl_803AD3B8 -/* 803AD304 003AA264 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD308 003AA268 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD304 003AA264 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD308 003AA268 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD30C 003AA26C 38 85 00 02 */ addi r4, r5, 2 /* 803AD310 003AA270 38 03 FF F8 */ addi r0, r3, -8 /* 803AD314 003AA274 7C 04 00 40 */ cmplw r4, r0 /* 803AD318 003AA278 40 81 00 8C */ ble lbl_803AD3A4 /* 803AD31C 003AA27C 38 00 00 0D */ li r0, 0xd /* 803AD320 003AA280 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD324 003AA284 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD328 003AA288 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD324 003AA284 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD328 003AA288 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD32C 003AA28C 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD330 003AA290 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD334 003AA294 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD338 003AA298 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD334 003AA294 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD338 003AA298 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD33C 003AA29C B0 03 00 04 */ sth r0, 4(r3) -/* 803AD340 003AA2A0 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD344 003AA2A4 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD348 003AA2A8 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD340 003AA2A0 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD344 003AA2A4 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD348 003AA2A8 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD34C 003AA2AC 38 03 00 08 */ addi r0, r3, 8 /* 803AD350 003AA2B0 28 05 00 00 */ cmplwi r5, 0 /* 803AD354 003AA2B4 7C 64 00 50 */ subf r3, r4, r0 @@ -2717,28 +2750,28 @@ lbl_803AD2F8: /* 803AD35C 003AA2BC 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803AD360 003AA2C0 41 82 00 18 */ beq lbl_803AD378 /* 803AD364 003AA2C4 B1 C5 00 06 */ sth r14, 6(r5) -/* 803AD368 003AA2C8 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD36C 003AA2CC A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD368 003AA2C8 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD36C 003AA2CC A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD370 003AA2D0 4B FD 17 CD */ bl DCStoreRangeNoSync /* 803AD374 003AA2D4 48 00 00 08 */ b lbl_803AD37C lbl_803AD378: -/* 803AD378 003AA2D8 B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803AD378 003AA2D8 B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803AD37C: -/* 803AD37C 003AA2DC 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD380 003AA2E0 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD384 003AA2E4 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD37C 003AA2DC 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD380 003AA2E0 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD384 003AA2E4 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD388 003AA2E8 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD38C 003AA2EC 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD390 003AA2F0 B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803AD394 003AA2F4 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD398 003AA2F8 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD39C 003AA2FC 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD3A0 003AA300 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD38C 003AA2EC 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD390 003AA2F0 B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803AD394 003AA2F4 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD398 003AA2F8 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD39C 003AA2FC 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD3A0 003AA300 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD3A4: -/* 803AD3A4 003AA304 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD3A4 003AA304 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD3A8 003AA308 38 80 00 03 */ li r4, 3 /* 803AD3AC 003AA30C 38 03 00 02 */ addi r0, r3, 2 -/* 803AD3B0 003AA310 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD3B0 003AA310 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803AD3B4 003AA314 B0 83 00 00 */ sth r4, 0(r3) lbl_803AD3B8: /* 803AD3B8 003AA318 28 12 00 00 */ cmplwi r18, 0 @@ -2750,7 +2783,7 @@ lbl_803AD3B8: /* 803AD3D0 003AA330 B0 12 00 02 */ sth r0, 2(r18) /* 803AD3D4 003AA334 4B FD 17 3D */ bl DCFlushRangeNoSync lbl_803AD3D8: -/* 803AD3D8 003AA338 88 8D AF 8E */ lbz r4, lbl_805A9B4E@sda21(r13) +/* 803AD3D8 003AA338 88 8D AF 8E */ lbz r4, salAuxFrame@sda21(r13) /* 803AD3DC 003AA33C 3C 60 55 55 */ lis r3, 0x55555556@ha /* 803AD3E0 003AA340 80 10 00 AC */ lwz r0, 0xac(r16) /* 803AD3E4 003AA344 38 63 55 56 */ addi r3, r3, 0x55555556@l @@ -2763,24 +2796,24 @@ lbl_803AD3D8: /* 803AD400 003AA360 7C 00 20 50 */ subf r0, r0, r4 /* 803AD404 003AA364 54 0E 06 3E */ clrlwi r14, r0, 0x18 /* 803AD408 003AA368 41 82 01 14 */ beq lbl_803AD51C -/* 803AD40C 003AA36C 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD410 003AA370 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD40C 003AA36C 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD410 003AA370 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD414 003AA374 38 85 00 0A */ addi r4, r5, 0xa /* 803AD418 003AA378 38 03 FF F8 */ addi r0, r3, -8 /* 803AD41C 003AA37C 7C 04 00 40 */ cmplw r4, r0 /* 803AD420 003AA380 40 81 00 8C */ ble lbl_803AD4AC /* 803AD424 003AA384 38 00 00 0D */ li r0, 0xd /* 803AD428 003AA388 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD42C 003AA38C 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD430 003AA390 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD42C 003AA38C 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD430 003AA390 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD434 003AA394 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD438 003AA398 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD43C 003AA39C 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD440 003AA3A0 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD43C 003AA39C 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD440 003AA3A0 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD444 003AA3A4 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD448 003AA3A8 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD44C 003AA3AC 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD450 003AA3B0 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD448 003AA3A8 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD44C 003AA3AC 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD450 003AA3B0 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD454 003AA3B4 38 03 00 08 */ addi r0, r3, 8 /* 803AD458 003AA3B8 28 05 00 00 */ cmplwi r5, 0 /* 803AD45C 003AA3BC 7C 64 00 50 */ subf r3, r4, r0 @@ -2788,52 +2821,52 @@ lbl_803AD3D8: /* 803AD464 003AA3C4 54 11 04 3A */ rlwinm r17, r0, 0, 0x10, 0x1d /* 803AD468 003AA3C8 41 82 00 18 */ beq lbl_803AD480 /* 803AD46C 003AA3CC B2 25 00 06 */ sth r17, 6(r5) -/* 803AD470 003AA3D0 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD474 003AA3D4 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD470 003AA3D0 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD474 003AA3D4 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD478 003AA3D8 4B FD 16 C5 */ bl DCStoreRangeNoSync /* 803AD47C 003AA3DC 48 00 00 08 */ b lbl_803AD484 lbl_803AD480: -/* 803AD480 003AA3E0 B2 2D AF 3C */ sth r17, lbl_805A9AFC@sda21(r13) +/* 803AD480 003AA3E0 B2 2D AF 3C */ sth r17, dspCmdFirstSize@sda21(r13) lbl_803AD484: -/* 803AD484 003AA3E4 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD488 003AA3E8 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD48C 003AA3EC 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD484 003AA3E4 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD488 003AA3E8 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD48C 003AA3EC 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD490 003AA3F0 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD494 003AA3F4 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD498 003AA3F8 B2 2D AF 2C */ sth r17, lbl_805A9AEC@sda21(r13) -/* 803AD49C 003AA3FC 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD4A0 003AA400 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD4A4 003AA404 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD4A8 003AA408 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD494 003AA3F4 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD498 003AA3F8 B2 2D AF 2C */ sth r17, dspCmdLastSize@sda21(r13) +/* 803AD49C 003AA3FC 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD4A0 003AA400 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD4A4 003AA404 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD4A8 003AA408 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD4AC: -/* 803AD4AC 003AA40C 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803AD4AC 003AA40C 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803AD4B0 003AA410 38 00 00 04 */ li r0, 4 /* 803AD4B4 003AA414 55 C3 15 BA */ rlwinm r3, r14, 2, 0x16, 0x1d /* 803AD4B8 003AA418 B0 04 00 00 */ sth r0, 0(r4) /* 803AD4BC 003AA41C 38 A3 00 30 */ addi r5, r3, 0x30 -/* 803AD4C0 003AA420 88 0D AF 8E */ lbz r0, lbl_805A9B4E@sda21(r13) -/* 803AD4C4 003AA424 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD4C0 003AA420 88 0D AF 8E */ lbz r0, salAuxFrame@sda21(r13) +/* 803AD4C4 003AA424 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD4C8 003AA428 54 04 10 3A */ slwi r4, r0, 2 /* 803AD4CC 003AA42C 38 04 00 30 */ addi r0, r4, 0x30 /* 803AD4D0 003AA430 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD4D4 003AA434 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD4D8 003AA438 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD4DC 003AA43C 88 0D AF 8E */ lbz r0, lbl_805A9B4E@sda21(r13) -/* 803AD4E0 003AA440 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD4DC 003AA43C 88 0D AF 8E */ lbz r0, salAuxFrame@sda21(r13) +/* 803AD4E0 003AA440 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD4E4 003AA444 54 04 10 3A */ slwi r4, r0, 2 /* 803AD4E8 003AA448 38 04 00 30 */ addi r0, r4, 0x30 /* 803AD4EC 003AA44C 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD4F0 003AA450 B0 03 00 04 */ sth r0, 4(r3) /* 803AD4F4 003AA454 7C 10 28 2E */ lwzx r0, r16, r5 -/* 803AD4F8 003AA458 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD4F8 003AA458 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD4FC 003AA45C 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD500 003AA460 B0 03 00 06 */ sth r0, 6(r3) /* 803AD504 003AA464 7C 10 28 2E */ lwzx r0, r16, r5 -/* 803AD508 003AA468 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD508 003AA468 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD50C 003AA46C B0 03 00 08 */ sth r0, 8(r3) -/* 803AD510 003AA470 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD510 003AA470 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD514 003AA474 38 03 00 0A */ addi r0, r3, 0xa -/* 803AD518 003AA478 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD518 003AA478 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) lbl_803AD51C: /* 803AD51C 003AA47C 80 10 00 54 */ lwz r0, 0x54(r16) /* 803AD520 003AA480 2C 00 00 00 */ cmpwi r0, 0 @@ -2841,24 +2874,24 @@ lbl_803AD51C: /* 803AD528 003AA488 80 10 00 B0 */ lwz r0, 0xb0(r16) /* 803AD52C 003AA48C 28 00 00 00 */ cmplwi r0, 0 /* 803AD530 003AA490 41 82 02 40 */ beq lbl_803AD770 -/* 803AD534 003AA494 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD538 003AA498 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD534 003AA494 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD538 003AA498 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD53C 003AA49C 38 85 00 0A */ addi r4, r5, 0xa /* 803AD540 003AA4A0 38 03 FF F8 */ addi r0, r3, -8 /* 803AD544 003AA4A4 7C 04 00 40 */ cmplw r4, r0 /* 803AD548 003AA4A8 40 81 00 8C */ ble lbl_803AD5D4 /* 803AD54C 003AA4AC 38 00 00 0D */ li r0, 0xd /* 803AD550 003AA4B0 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD554 003AA4B4 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD558 003AA4B8 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD554 003AA4B4 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD558 003AA4B8 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD55C 003AA4BC 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD560 003AA4C0 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD564 003AA4C4 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD568 003AA4C8 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD564 003AA4C4 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD568 003AA4C8 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD56C 003AA4CC B0 03 00 04 */ sth r0, 4(r3) -/* 803AD570 003AA4D0 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD574 003AA4D4 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD578 003AA4D8 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD570 003AA4D0 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD574 003AA4D4 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD578 003AA4D8 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD57C 003AA4DC 38 03 00 08 */ addi r0, r3, 8 /* 803AD580 003AA4E0 28 05 00 00 */ cmplwi r5, 0 /* 803AD584 003AA4E4 7C 64 00 50 */ subf r3, r4, r0 @@ -2866,72 +2899,72 @@ lbl_803AD51C: /* 803AD58C 003AA4EC 54 11 04 3A */ rlwinm r17, r0, 0, 0x10, 0x1d /* 803AD590 003AA4F0 41 82 00 18 */ beq lbl_803AD5A8 /* 803AD594 003AA4F4 B2 25 00 06 */ sth r17, 6(r5) -/* 803AD598 003AA4F8 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD59C 003AA4FC A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD598 003AA4F8 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD59C 003AA4FC A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD5A0 003AA500 4B FD 15 9D */ bl DCStoreRangeNoSync /* 803AD5A4 003AA504 48 00 00 08 */ b lbl_803AD5AC lbl_803AD5A8: -/* 803AD5A8 003AA508 B2 2D AF 3C */ sth r17, lbl_805A9AFC@sda21(r13) +/* 803AD5A8 003AA508 B2 2D AF 3C */ sth r17, dspCmdFirstSize@sda21(r13) lbl_803AD5AC: -/* 803AD5AC 003AA50C 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD5B0 003AA510 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD5B4 003AA514 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD5AC 003AA50C 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD5B0 003AA510 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD5B4 003AA514 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD5B8 003AA518 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD5BC 003AA51C 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD5C0 003AA520 B2 2D AF 2C */ sth r17, lbl_805A9AEC@sda21(r13) -/* 803AD5C4 003AA524 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD5C8 003AA528 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD5CC 003AA52C 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD5D0 003AA530 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD5BC 003AA51C 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD5C0 003AA520 B2 2D AF 2C */ sth r17, dspCmdLastSize@sda21(r13) +/* 803AD5C4 003AA524 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD5C8 003AA528 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD5CC 003AA52C 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD5D0 003AA530 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD5D4: -/* 803AD5D4 003AA534 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803AD5D4 003AA534 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803AD5D8 003AA538 38 00 00 05 */ li r0, 5 /* 803AD5DC 003AA53C 55 C3 15 BA */ rlwinm r3, r14, 2, 0x16, 0x1d /* 803AD5E0 003AA540 B0 04 00 00 */ sth r0, 0(r4) /* 803AD5E4 003AA544 38 A3 00 3C */ addi r5, r3, 0x3c -/* 803AD5E8 003AA548 88 0D AF 8E */ lbz r0, lbl_805A9B4E@sda21(r13) -/* 803AD5EC 003AA54C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD5E8 003AA548 88 0D AF 8E */ lbz r0, salAuxFrame@sda21(r13) +/* 803AD5EC 003AA54C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD5F0 003AA550 54 04 10 3A */ slwi r4, r0, 2 /* 803AD5F4 003AA554 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD5F8 003AA558 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD5FC 003AA55C 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD600 003AA560 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD604 003AA564 88 0D AF 8E */ lbz r0, lbl_805A9B4E@sda21(r13) -/* 803AD608 003AA568 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD604 003AA564 88 0D AF 8E */ lbz r0, salAuxFrame@sda21(r13) +/* 803AD608 003AA568 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD60C 003AA56C 54 04 10 3A */ slwi r4, r0, 2 /* 803AD610 003AA570 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD614 003AA574 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD618 003AA578 B0 03 00 04 */ sth r0, 4(r3) /* 803AD61C 003AA57C 7C 10 28 2E */ lwzx r0, r16, r5 -/* 803AD620 003AA580 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD620 003AA580 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD624 003AA584 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD628 003AA588 B0 03 00 06 */ sth r0, 6(r3) /* 803AD62C 003AA58C 7C 10 28 2E */ lwzx r0, r16, r5 -/* 803AD630 003AA590 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD630 003AA590 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD634 003AA594 B0 03 00 08 */ sth r0, 8(r3) -/* 803AD638 003AA598 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD638 003AA598 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD63C 003AA59C 38 03 00 0A */ addi r0, r3, 0xa -/* 803AD640 003AA5A0 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD640 003AA5A0 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803AD644 003AA5A4 48 00 01 2C */ b lbl_803AD770 lbl_803AD648: -/* 803AD648 003AA5A8 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD64C 003AA5AC 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD648 003AA5A8 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD64C 003AA5AC 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD650 003AA5B0 38 85 00 0A */ addi r4, r5, 0xa /* 803AD654 003AA5B4 38 03 FF F8 */ addi r0, r3, -8 /* 803AD658 003AA5B8 7C 04 00 40 */ cmplw r4, r0 /* 803AD65C 003AA5BC 40 81 00 8C */ ble lbl_803AD6E8 /* 803AD660 003AA5C0 38 00 00 0D */ li r0, 0xd /* 803AD664 003AA5C4 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD668 003AA5C8 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD66C 003AA5CC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD668 003AA5C8 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD66C 003AA5CC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD670 003AA5D0 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD674 003AA5D4 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD678 003AA5D8 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD67C 003AA5DC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD678 003AA5D8 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD67C 003AA5DC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD680 003AA5E0 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD684 003AA5E4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD688 003AA5E8 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD68C 003AA5EC 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD684 003AA5E4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD688 003AA5E8 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD68C 003AA5EC 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD690 003AA5F0 38 03 00 08 */ addi r0, r3, 8 /* 803AD694 003AA5F4 28 05 00 00 */ cmplwi r5, 0 /* 803AD698 003AA5F8 7C 64 00 50 */ subf r3, r4, r0 @@ -2939,77 +2972,77 @@ lbl_803AD648: /* 803AD6A0 003AA600 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803AD6A4 003AA604 41 82 00 18 */ beq lbl_803AD6BC /* 803AD6A8 003AA608 B1 C5 00 06 */ sth r14, 6(r5) -/* 803AD6AC 003AA60C 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD6B0 003AA610 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD6AC 003AA60C 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD6B0 003AA610 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD6B4 003AA614 4B FD 14 89 */ bl DCStoreRangeNoSync /* 803AD6B8 003AA618 48 00 00 08 */ b lbl_803AD6C0 lbl_803AD6BC: -/* 803AD6BC 003AA61C B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803AD6BC 003AA61C B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803AD6C0: -/* 803AD6C0 003AA620 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD6C4 003AA624 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD6C8 003AA628 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD6C0 003AA620 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD6C4 003AA624 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD6C8 003AA628 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD6CC 003AA62C 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD6D0 003AA630 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD6D4 003AA634 B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803AD6D8 003AA638 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD6DC 003AA63C 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD6E0 003AA640 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD6E4 003AA644 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD6D0 003AA630 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD6D4 003AA634 B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803AD6D8 003AA638 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD6DC 003AA63C 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD6E0 003AA640 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD6E4 003AA644 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD6E8: -/* 803AD6E8 003AA648 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD6E8 003AA648 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD6EC 003AA64C 38 00 00 10 */ li r0, 0x10 /* 803AD6F0 003AA650 B0 03 00 00 */ sth r0, 0(r3) -/* 803AD6F4 003AA654 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD6F8 003AA658 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD6F4 003AA654 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD6F8 003AA658 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD6FC 003AA65C 54 04 10 3A */ slwi r4, r0, 2 /* 803AD700 003AA660 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD704 003AA664 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD708 003AA668 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD70C 003AA66C B0 03 00 02 */ sth r0, 2(r3) -/* 803AD710 003AA670 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD714 003AA674 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD710 003AA670 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD714 003AA674 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD718 003AA678 54 04 10 3A */ slwi r4, r0, 2 /* 803AD71C 003AA67C 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD720 003AA680 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD724 003AA684 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD728 003AA688 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD72C 003AA68C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD728 003AA688 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD72C 003AA68C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD730 003AA690 68 00 00 01 */ xori r0, r0, 1 /* 803AD734 003AA694 54 04 10 3A */ slwi r4, r0, 2 /* 803AD738 003AA698 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD73C 003AA69C 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD740 003AA6A0 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD744 003AA6A4 B0 03 00 06 */ sth r0, 6(r3) -/* 803AD748 003AA6A8 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD74C 003AA6AC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD748 003AA6A8 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD74C 003AA6AC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD750 003AA6B0 68 00 00 01 */ xori r0, r0, 1 /* 803AD754 003AA6B4 54 04 10 3A */ slwi r4, r0, 2 /* 803AD758 003AA6B8 38 04 00 3C */ addi r0, r4, 0x3c /* 803AD75C 003AA6BC 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD760 003AA6C0 B0 03 00 08 */ sth r0, 8(r3) -/* 803AD764 003AA6C4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD764 003AA6C4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD768 003AA6C8 38 03 00 0A */ addi r0, r3, 0xa -/* 803AD76C 003AA6CC 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD76C 003AA6CC 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) lbl_803AD770: -/* 803AD770 003AA6D0 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD774 003AA6D4 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD770 003AA6D0 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD774 003AA6D4 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD778 003AA6D8 38 85 00 06 */ addi r4, r5, 6 /* 803AD77C 003AA6DC 38 03 FF F8 */ addi r0, r3, -8 /* 803AD780 003AA6E0 7C 04 00 40 */ cmplw r4, r0 /* 803AD784 003AA6E4 40 81 00 8C */ ble lbl_803AD810 /* 803AD788 003AA6E8 38 00 00 0D */ li r0, 0xd /* 803AD78C 003AA6EC B0 05 00 00 */ sth r0, 0(r5) -/* 803AD790 003AA6F0 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD794 003AA6F4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD790 003AA6F0 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD794 003AA6F4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD798 003AA6F8 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD79C 003AA6FC B0 03 00 02 */ sth r0, 2(r3) -/* 803AD7A0 003AA700 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD7A4 003AA704 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD7A0 003AA700 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD7A4 003AA704 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD7A8 003AA708 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD7AC 003AA70C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD7B0 003AA710 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD7B4 003AA714 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD7AC 003AA70C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD7B0 003AA710 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD7B4 003AA714 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD7B8 003AA718 38 03 00 08 */ addi r0, r3, 8 /* 803AD7BC 003AA71C 28 05 00 00 */ cmplwi r5, 0 /* 803AD7C0 003AA720 7C 64 00 50 */ subf r3, r4, r0 @@ -3017,45 +3050,45 @@ lbl_803AD770: /* 803AD7C8 003AA728 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803AD7CC 003AA72C 41 82 00 18 */ beq lbl_803AD7E4 /* 803AD7D0 003AA730 B1 C5 00 06 */ sth r14, 6(r5) -/* 803AD7D4 003AA734 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD7D8 003AA738 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD7D4 003AA734 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD7D8 003AA738 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD7DC 003AA73C 4B FD 13 61 */ bl DCStoreRangeNoSync /* 803AD7E0 003AA740 48 00 00 08 */ b lbl_803AD7E8 lbl_803AD7E4: -/* 803AD7E4 003AA744 B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803AD7E4 003AA744 B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803AD7E8: -/* 803AD7E8 003AA748 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD7EC 003AA74C 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD7F0 003AA750 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD7E8 003AA748 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD7EC 003AA74C 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD7F0 003AA750 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD7F4 003AA754 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD7F8 003AA758 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD7FC 003AA75C B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803AD800 003AA760 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD804 003AA764 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD808 003AA768 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD80C 003AA76C 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD7F8 003AA758 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD7FC 003AA75C B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803AD800 003AA760 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD804 003AA764 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD808 003AA768 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD80C 003AA76C 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD810: -/* 803AD810 003AA770 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD810 003AA770 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD814 003AA774 38 00 00 06 */ li r0, 6 /* 803AD818 003AA778 38 B0 00 04 */ addi r5, r16, 4 /* 803AD81C 003AA77C B0 03 00 00 */ sth r0, 0(r3) -/* 803AD820 003AA780 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD824 003AA784 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD820 003AA780 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD824 003AA784 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD828 003AA788 54 04 10 3A */ slwi r4, r0, 2 /* 803AD82C 003AA78C 38 04 00 28 */ addi r0, r4, 0x28 /* 803AD830 003AA790 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD834 003AA794 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD838 003AA798 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD83C 003AA79C 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803AD840 003AA7A0 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD83C 003AA79C 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803AD840 003AA7A0 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD844 003AA7A4 54 04 10 3A */ slwi r4, r0, 2 /* 803AD848 003AA7A8 38 04 00 28 */ addi r0, r4, 0x28 /* 803AD84C 003AA7AC 7C 10 00 2E */ lwzx r0, r16, r0 /* 803AD850 003AA7B0 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD854 003AA7B4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD854 003AA7B4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD858 003AA7B8 81 D0 00 00 */ lwz r14, 0(r16) /* 803AD85C 003AA7BC 38 03 00 06 */ addi r0, r3, 6 -/* 803AD860 003AA7C0 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD860 003AA7C0 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803AD864 003AA7C4 7D C3 73 78 */ mr r3, r14 /* 803AD868 003AA7C8 38 8E 00 04 */ addi r4, r14, 4 /* 803AD86C 003AA7CC 4B FF DC 7D */ bl DoDepopFade @@ -3099,28 +3132,28 @@ lbl_803AD8FC: /* 803AD900 003AA860 38 63 00 01 */ addi r3, r3, 1 /* 803AD904 003AA864 98 61 00 24 */ stb r3, 0x24(r1) lbl_803AD908: -/* 803AD908 003AA868 88 6D AF 8C */ lbz r3, lbl_805A9B4C@sda21(r13) +/* 803AD908 003AA868 88 6D AF 8C */ lbz r3, salMaxStudioNum@sda21(r13) /* 803AD90C 003AA86C 88 01 00 24 */ lbz r0, 0x24(r1) /* 803AD910 003AA870 7C 00 18 40 */ cmplw r0, r3 /* 803AD914 003AA874 41 80 E2 60 */ blt lbl_803ABB74 -/* 803AD918 003AA878 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD91C 003AA87C 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803AD918 003AA878 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD91C 003AA87C 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803AD920 003AA880 38 85 00 06 */ addi r4, r5, 6 /* 803AD924 003AA884 38 03 FF F8 */ addi r0, r3, -8 /* 803AD928 003AA888 7C 04 00 40 */ cmplw r4, r0 /* 803AD92C 003AA88C 40 81 00 8C */ ble lbl_803AD9B8 /* 803AD930 003AA890 38 00 00 0D */ li r0, 0xd /* 803AD934 003AA894 B0 05 00 00 */ sth r0, 0(r5) -/* 803AD938 003AA898 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD93C 003AA89C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD938 003AA898 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD93C 003AA89C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD940 003AA8A0 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD944 003AA8A4 B0 03 00 02 */ sth r0, 2(r3) -/* 803AD948 003AA8A8 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803AD94C 003AA8AC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD948 003AA8A8 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803AD94C 003AA8AC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD950 003AA8B0 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD954 003AA8B4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803AD958 003AA8B8 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803AD95C 003AA8BC 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD954 003AA8B4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803AD958 003AA8B8 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803AD95C 003AA8BC 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD960 003AA8C0 38 03 00 08 */ addi r0, r3, 8 /* 803AD964 003AA8C4 28 05 00 00 */ cmplwi r5, 0 /* 803AD968 003AA8C8 7C 64 00 50 */ subf r3, r4, r0 @@ -3128,40 +3161,40 @@ lbl_803AD908: /* 803AD970 003AA8D0 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803AD974 003AA8D4 41 82 00 18 */ beq lbl_803AD98C /* 803AD978 003AA8D8 B1 C5 00 06 */ sth r14, 6(r5) -/* 803AD97C 003AA8DC 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803AD980 003AA8E0 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803AD97C 003AA8DC 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803AD980 003AA8E0 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803AD984 003AA8E4 4B FD 11 B9 */ bl DCStoreRangeNoSync /* 803AD988 003AA8E8 48 00 00 08 */ b lbl_803AD990 lbl_803AD98C: -/* 803AD98C 003AA8EC B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803AD98C 003AA8EC B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803AD990: -/* 803AD990 003AA8F0 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803AD994 003AA8F4 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803AD998 003AA8F8 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803AD990 003AA8F0 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803AD994 003AA8F4 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803AD998 003AA8F8 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803AD99C 003AA8FC 38 03 01 80 */ addi r0, r3, 0x180 -/* 803AD9A0 003AA900 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803AD9A4 003AA904 B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803AD9A8 003AA908 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803AD9AC 003AA90C 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803AD9B0 003AA910 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803AD9B4 003AA914 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803AD9A0 003AA900 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803AD9A4 003AA904 B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803AD9A8 003AA908 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803AD9AC 003AA90C 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803AD9B0 003AA910 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803AD9B4 003AA914 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803AD9B8: -/* 803AD9B8 003AA918 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803AD9B8 003AA918 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803AD9BC 003AA91C 38 00 00 11 */ li r0, 0x11 -/* 803AD9C0 003AA920 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803AD9C0 003AA920 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AD9C4 003AA924 3A 00 00 00 */ li r16, 0 /* 803AD9C8 003AA928 B0 04 00 00 */ sth r0, 0(r4) -/* 803AD9CC 003AA92C 39 C3 F2 60 */ addi r14, r3, lbl_8055F260@l -/* 803AD9D0 003AA930 80 0D AF 4C */ lwz r0, lbl_805A9B0C@sda21(r13) -/* 803AD9D4 003AA934 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD9CC 003AA92C 39 C3 F2 60 */ addi r14, r3, dspStudio@l +/* 803AD9D0 003AA930 80 0D AF 4C */ lwz r0, dspSurround@sda21(r13) +/* 803AD9D4 003AA934 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD9D8 003AA938 54 00 84 3E */ srwi r0, r0, 0x10 /* 803AD9DC 003AA93C B0 03 00 02 */ sth r0, 2(r3) -/* 803AD9E0 003AA940 80 0D AF 4C */ lwz r0, lbl_805A9B0C@sda21(r13) -/* 803AD9E4 003AA944 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD9E0 003AA940 80 0D AF 4C */ lwz r0, dspSurround@sda21(r13) +/* 803AD9E4 003AA944 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD9E8 003AA948 B0 03 00 04 */ sth r0, 4(r3) -/* 803AD9EC 003AA94C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803AD9EC 003AA94C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803AD9F0 003AA950 38 03 00 06 */ addi r0, r3, 6 -/* 803AD9F4 003AA954 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803AD9F4 003AA954 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803AD9F8 003AA958 48 00 01 18 */ b lbl_803ADB10 lbl_803AD9FC: /* 803AD9FC 003AA95C 56 00 06 3E */ clrlwi r0, r16, 0x18 @@ -3173,24 +3206,24 @@ lbl_803AD9FC: /* 803ADA14 003AA974 88 0F 00 51 */ lbz r0, 0x51(r15) /* 803ADA18 003AA978 28 00 00 00 */ cmplwi r0, 0 /* 803ADA1C 003AA97C 41 82 00 F0 */ beq lbl_803ADB0C -/* 803ADA20 003AA980 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ADA24 003AA984 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803ADA20 003AA980 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ADA24 003AA984 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803ADA28 003AA988 38 85 00 06 */ addi r4, r5, 6 /* 803ADA2C 003AA98C 38 03 FF F8 */ addi r0, r3, -8 /* 803ADA30 003AA990 7C 04 00 40 */ cmplw r4, r0 /* 803ADA34 003AA994 40 81 00 8C */ ble lbl_803ADAC0 /* 803ADA38 003AA998 38 00 00 0D */ li r0, 0xd /* 803ADA3C 003AA99C B0 05 00 00 */ sth r0, 0(r5) -/* 803ADA40 003AA9A0 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ADA44 003AA9A4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADA40 003AA9A0 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ADA44 003AA9A4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADA48 003AA9A8 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ADA4C 003AA9AC B0 03 00 02 */ sth r0, 2(r3) -/* 803ADA50 003AA9B0 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ADA54 003AA9B4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADA50 003AA9B0 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ADA54 003AA9B4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADA58 003AA9B8 B0 03 00 04 */ sth r0, 4(r3) -/* 803ADA5C 003AA9BC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803ADA60 003AA9C0 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803ADA64 003AA9C4 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ADA5C 003AA9BC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803ADA60 003AA9C0 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803ADA64 003AA9C4 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ADA68 003AA9C8 38 03 00 08 */ addi r0, r3, 8 /* 803ADA6C 003AA9CC 28 05 00 00 */ cmplwi r5, 0 /* 803ADA70 003AA9D0 7C 64 00 50 */ subf r3, r4, r0 @@ -3198,68 +3231,68 @@ lbl_803AD9FC: /* 803ADA78 003AA9D8 54 11 04 3A */ rlwinm r17, r0, 0, 0x10, 0x1d /* 803ADA7C 003AA9DC 41 82 00 18 */ beq lbl_803ADA94 /* 803ADA80 003AA9E0 B2 25 00 06 */ sth r17, 6(r5) -/* 803ADA84 003AA9E4 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803ADA88 003AA9E8 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803ADA84 003AA9E4 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803ADA88 003AA9E8 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803ADA8C 003AA9EC 4B FD 10 B1 */ bl DCStoreRangeNoSync /* 803ADA90 003AA9F0 48 00 00 08 */ b lbl_803ADA98 lbl_803ADA94: -/* 803ADA94 003AA9F4 B2 2D AF 3C */ sth r17, lbl_805A9AFC@sda21(r13) +/* 803ADA94 003AA9F4 B2 2D AF 3C */ sth r17, dspCmdFirstSize@sda21(r13) lbl_803ADA98: -/* 803ADA98 003AA9F8 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803ADA9C 003AA9FC 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ADAA0 003AAA00 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ADA98 003AA9F8 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803ADA9C 003AA9FC 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ADAA0 003AAA00 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ADAA4 003AAA04 38 03 01 80 */ addi r0, r3, 0x180 -/* 803ADAA8 003AAA08 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803ADAAC 003AAA0C B2 2D AF 2C */ sth r17, lbl_805A9AEC@sda21(r13) -/* 803ADAB0 003AAA10 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803ADAB4 003AAA14 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803ADAB8 003AAA18 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803ADABC 003AAA1C 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803ADAA8 003AAA08 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803ADAAC 003AAA0C B2 2D AF 2C */ sth r17, dspCmdLastSize@sda21(r13) +/* 803ADAB0 003AAA10 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803ADAB4 003AAA14 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803ADAB8 003AAA18 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803ADABC 003AAA1C 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803ADAC0: -/* 803ADAC0 003AAA20 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADAC0 003AAA20 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADAC4 003AAA24 38 00 00 09 */ li r0, 9 /* 803ADAC8 003AAA28 B0 03 00 00 */ sth r0, 0(r3) -/* 803ADACC 003AAA2C 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803ADAD0 003AAA30 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADACC 003AAA2C 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803ADAD0 003AAA30 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADAD4 003AAA34 54 04 10 3A */ slwi r4, r0, 2 /* 803ADAD8 003AAA38 38 04 00 28 */ addi r0, r4, 0x28 /* 803ADADC 003AAA3C 7C 0F 00 2E */ lwzx r0, r15, r0 /* 803ADAE0 003AAA40 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ADAE4 003AAA44 B0 03 00 02 */ sth r0, 2(r3) -/* 803ADAE8 003AAA48 88 0D AF 8F */ lbz r0, lbl_805A9B4F@sda21(r13) -/* 803ADAEC 003AAA4C 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADAE8 003AAA48 88 0D AF 8F */ lbz r0, salFrame@sda21(r13) +/* 803ADAEC 003AAA4C 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADAF0 003AAA50 54 04 10 3A */ slwi r4, r0, 2 /* 803ADAF4 003AAA54 38 04 00 28 */ addi r0, r4, 0x28 /* 803ADAF8 003AAA58 7C 0F 00 2E */ lwzx r0, r15, r0 /* 803ADAFC 003AAA5C B0 03 00 04 */ sth r0, 4(r3) -/* 803ADB00 003AAA60 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADB00 003AAA60 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADB04 003AAA64 38 03 00 06 */ addi r0, r3, 6 -/* 803ADB08 003AAA68 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803ADB08 003AAA68 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) lbl_803ADB0C: /* 803ADB0C 003AAA6C 3A 10 00 01 */ addi r16, r16, 1 lbl_803ADB10: -/* 803ADB10 003AAA70 88 0D AF 8C */ lbz r0, lbl_805A9B4C@sda21(r13) +/* 803ADB10 003AAA70 88 0D AF 8C */ lbz r0, salMaxStudioNum@sda21(r13) /* 803ADB14 003AAA74 56 03 06 3E */ clrlwi r3, r16, 0x18 /* 803ADB18 003AAA78 7C 03 00 40 */ cmplw r3, r0 /* 803ADB1C 003AAA7C 41 80 FE E0 */ blt lbl_803AD9FC -/* 803ADB20 003AAA80 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ADB24 003AAA84 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) +/* 803ADB20 003AAA80 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ADB24 003AAA84 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) /* 803ADB28 003AAA88 38 85 00 0A */ addi r4, r5, 0xa /* 803ADB2C 003AAA8C 38 03 FF F8 */ addi r0, r3, -8 /* 803ADB30 003AAA90 7C 04 00 40 */ cmplw r4, r0 /* 803ADB34 003AAA94 40 81 00 8C */ ble lbl_803ADBC0 /* 803ADB38 003AAA98 38 00 00 0D */ li r0, 0xd /* 803ADB3C 003AAA9C B0 05 00 00 */ sth r0, 0(r5) -/* 803ADB40 003AAAA0 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ADB44 003AAAA4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADB40 003AAAA0 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ADB44 003AAAA4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADB48 003AAAA8 54 00 84 3E */ srwi r0, r0, 0x10 /* 803ADB4C 003AAAAC B0 03 00 02 */ sth r0, 2(r3) -/* 803ADB50 003AAAB0 80 0D AF 34 */ lwz r0, lbl_805A9AF4@sda21(r13) -/* 803ADB54 003AAAB4 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) +/* 803ADB50 003AAAB0 80 0D AF 34 */ lwz r0, dspCmdMaxPtr@sda21(r13) +/* 803ADB54 003AAAB4 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) /* 803ADB58 003AAAB8 B0 03 00 04 */ sth r0, 4(r3) -/* 803ADB5C 003AAABC 80 6D AF 38 */ lwz r3, lbl_805A9AF8@sda21(r13) -/* 803ADB60 003AAAC0 80 AD AF 24 */ lwz r5, lbl_805A9AE4@sda21(r13) -/* 803ADB64 003AAAC4 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ADB5C 003AAABC 80 6D AF 38 */ lwz r3, dspCmdPtr@sda21(r13) +/* 803ADB60 003AAAC0 80 AD AF 24 */ lwz r5, dspCmdLastLoad@sda21(r13) +/* 803ADB64 003AAAC4 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ADB68 003AAAC8 38 03 00 08 */ addi r0, r3, 8 /* 803ADB6C 003AAACC 28 05 00 00 */ cmplwi r5, 0 /* 803ADB70 003AAAD0 7C 64 00 50 */ subf r3, r4, r0 @@ -3267,66 +3300,66 @@ lbl_803ADB10: /* 803ADB78 003AAAD8 54 0E 04 3A */ rlwinm r14, r0, 0, 0x10, 0x1d /* 803ADB7C 003AAADC 41 82 00 18 */ beq lbl_803ADB94 /* 803ADB80 003AAAE0 B1 C5 00 06 */ sth r14, 6(r5) -/* 803ADB84 003AAAE4 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803ADB88 003AAAE8 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803ADB84 003AAAE4 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803ADB88 003AAAE8 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803ADB8C 003AAAEC 4B FD 0F B1 */ bl DCStoreRangeNoSync /* 803ADB90 003AAAF0 48 00 00 08 */ b lbl_803ADB98 lbl_803ADB94: -/* 803ADB94 003AAAF4 B1 CD AF 3C */ sth r14, lbl_805A9AFC@sda21(r13) +/* 803ADB94 003AAAF4 B1 CD AF 3C */ sth r14, dspCmdFirstSize@sda21(r13) lbl_803ADB98: -/* 803ADB98 003AAAF8 80 6D AF 34 */ lwz r3, lbl_805A9AF4@sda21(r13) -/* 803ADB9C 003AAAFC 80 AD AF 38 */ lwz r5, lbl_805A9AF8@sda21(r13) -/* 803ADBA0 003AAB00 80 8D AF 30 */ lwz r4, lbl_805A9AF0@sda21(r13) +/* 803ADB98 003AAAF8 80 6D AF 34 */ lwz r3, dspCmdMaxPtr@sda21(r13) +/* 803ADB9C 003AAAFC 80 AD AF 38 */ lwz r5, dspCmdPtr@sda21(r13) +/* 803ADBA0 003AAB00 80 8D AF 30 */ lwz r4, dspCmdCurBase@sda21(r13) /* 803ADBA4 003AAB04 38 03 01 80 */ addi r0, r3, 0x180 -/* 803ADBA8 003AAB08 90 AD AF 24 */ stw r5, lbl_805A9AE4@sda21(r13) -/* 803ADBAC 003AAB0C B1 CD AF 2C */ sth r14, lbl_805A9AEC@sda21(r13) -/* 803ADBB0 003AAB10 90 8D AF 28 */ stw r4, lbl_805A9AE8@sda21(r13) -/* 803ADBB4 003AAB14 90 6D AF 38 */ stw r3, lbl_805A9AF8@sda21(r13) -/* 803ADBB8 003AAB18 90 6D AF 30 */ stw r3, lbl_805A9AF0@sda21(r13) -/* 803ADBBC 003AAB1C 90 0D AF 34 */ stw r0, lbl_805A9AF4@sda21(r13) +/* 803ADBA8 003AAB08 90 AD AF 24 */ stw r5, dspCmdLastLoad@sda21(r13) +/* 803ADBAC 003AAB0C B1 CD AF 2C */ sth r14, dspCmdLastSize@sda21(r13) +/* 803ADBB0 003AAB10 90 8D AF 28 */ stw r4, dspCmdLastBase@sda21(r13) +/* 803ADBB4 003AAB14 90 6D AF 38 */ stw r3, dspCmdPtr@sda21(r13) +/* 803ADBB8 003AAB18 90 6D AF 30 */ stw r3, dspCmdCurBase@sda21(r13) +/* 803ADBBC 003AAB1C 90 0D AF 34 */ stw r0, dspCmdMaxPtr@sda21(r13) lbl_803ADBC0: -/* 803ADBC0 003AAB20 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADBC0 003AAB20 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADBC4 003AAB24 38 A0 00 0E */ li r5, 0xe /* 803ADBC8 003AAB28 80 01 00 08 */ lwz r0, 8(r1) /* 803ADBCC 003AAB2C 38 60 00 0F */ li r3, 0xf /* 803ADBD0 003AAB30 B0 A4 00 00 */ sth r5, 0(r4) /* 803ADBD4 003AAB34 54 00 84 3E */ srwi r0, r0, 0x10 -/* 803ADBD8 003AAB38 80 AD AF 4C */ lwz r5, lbl_805A9B0C@sda21(r13) -/* 803ADBDC 003AAB3C 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADBD8 003AAB38 80 AD AF 4C */ lwz r5, dspSurround@sda21(r13) +/* 803ADBDC 003AAB3C 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADBE0 003AAB40 54 A5 84 3E */ srwi r5, r5, 0x10 /* 803ADBE4 003AAB44 B0 A4 00 02 */ sth r5, 2(r4) -/* 803ADBE8 003AAB48 80 AD AF 4C */ lwz r5, lbl_805A9B0C@sda21(r13) -/* 803ADBEC 003AAB4C 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADBE8 003AAB48 80 AD AF 4C */ lwz r5, dspSurround@sda21(r13) +/* 803ADBEC 003AAB4C 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADBF0 003AAB50 B0 A4 00 04 */ sth r5, 4(r4) -/* 803ADBF4 003AAB54 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADBF4 003AAB54 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADBF8 003AAB58 B0 04 00 06 */ sth r0, 6(r4) /* 803ADBFC 003AAB5C 80 01 00 08 */ lwz r0, 8(r1) -/* 803ADC00 003AAB60 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADC00 003AAB60 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADC04 003AAB64 B0 04 00 08 */ sth r0, 8(r4) -/* 803ADC08 003AAB68 80 8D AF 38 */ lwz r4, lbl_805A9AF8@sda21(r13) +/* 803ADC08 003AAB68 80 8D AF 38 */ lwz r4, dspCmdPtr@sda21(r13) /* 803ADC0C 003AAB6C 38 84 00 0A */ addi r4, r4, 0xa -/* 803ADC10 003AAB70 90 8D AF 38 */ stw r4, lbl_805A9AF8@sda21(r13) +/* 803ADC10 003AAB70 90 8D AF 38 */ stw r4, dspCmdPtr@sda21(r13) /* 803ADC14 003AAB74 38 04 00 02 */ addi r0, r4, 2 -/* 803ADC18 003AAB78 90 0D AF 38 */ stw r0, lbl_805A9AF8@sda21(r13) +/* 803ADC18 003AAB78 90 0D AF 38 */ stw r0, dspCmdPtr@sda21(r13) /* 803ADC1C 003AAB7C B0 64 00 00 */ sth r3, 0(r4) -/* 803ADC20 003AAB80 80 8D AF 24 */ lwz r4, lbl_805A9AE4@sda21(r13) -/* 803ADC24 003AAB84 80 6D AF 30 */ lwz r3, lbl_805A9AF0@sda21(r13) -/* 803ADC28 003AAB88 80 0D AF 38 */ lwz r0, lbl_805A9AF8@sda21(r13) +/* 803ADC20 003AAB80 80 8D AF 24 */ lwz r4, dspCmdLastLoad@sda21(r13) +/* 803ADC24 003AAB84 80 6D AF 30 */ lwz r3, dspCmdCurBase@sda21(r13) +/* 803ADC28 003AAB88 80 0D AF 38 */ lwz r0, dspCmdPtr@sda21(r13) /* 803ADC2C 003AAB8C 28 04 00 00 */ cmplwi r4, 0 /* 803ADC30 003AAB90 7C 63 00 50 */ subf r3, r3, r0 /* 803ADC34 003AAB94 38 03 00 03 */ addi r0, r3, 3 /* 803ADC38 003AAB98 54 00 04 3A */ rlwinm r0, r0, 0, 0x10, 0x1d /* 803ADC3C 003AAB9C 41 82 00 18 */ beq lbl_803ADC54 /* 803ADC40 003AABA0 B0 04 00 06 */ sth r0, 6(r4) -/* 803ADC44 003AABA4 80 6D AF 28 */ lwz r3, lbl_805A9AE8@sda21(r13) -/* 803ADC48 003AABA8 A0 8D AF 2C */ lhz r4, lbl_805A9AEC@sda21(r13) +/* 803ADC44 003AABA4 80 6D AF 28 */ lwz r3, dspCmdLastBase@sda21(r13) +/* 803ADC48 003AABA8 A0 8D AF 2C */ lhz r4, dspCmdLastSize@sda21(r13) /* 803ADC4C 003AABAC 4B FD 0E F1 */ bl DCStoreRangeNoSync /* 803ADC50 003AABB0 48 00 00 08 */ b lbl_803ADC58 lbl_803ADC54: -/* 803ADC54 003AABB4 B0 0D AF 3C */ sth r0, lbl_805A9AFC@sda21(r13) +/* 803ADC54 003AABB4 B0 0D AF 3C */ sth r0, dspCmdFirstSize@sda21(r13) lbl_803ADC58: -/* 803ADC58 003AABB8 80 6D AF 30 */ lwz r3, lbl_805A9AF0@sda21(r13) -/* 803ADC5C 003AABBC 80 0D AF 38 */ lwz r0, lbl_805A9AF8@sda21(r13) +/* 803ADC58 003AABB8 80 6D AF 30 */ lwz r3, dspCmdCurBase@sda21(r13) +/* 803ADC5C 003AABBC 80 0D AF 38 */ lwz r0, dspCmdPtr@sda21(r13) /* 803ADC60 003AABC0 7C 83 00 50 */ subf r4, r3, r0 /* 803ADC64 003AABC4 4B FD 0E D9 */ bl DCStoreRangeNoSync /* 803ADC68 003AABC8 39 61 00 80 */ addi r11, r1, 0x80 @@ -3342,7 +3375,7 @@ salSynthSendMessage: /* 803ADC84 003AABE4 7C 08 02 A6 */ mflr r0 /* 803ADC88 003AABE8 7C 65 1B 78 */ mr r5, r3 /* 803ADC8C 003AABEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803ADC90 003AABF0 81 8D AF 58 */ lwz r12, lbl_805A9B18@sda21(r13) +/* 803ADC90 003AABF0 81 8D AF 58 */ lwz r12, salMessageCallback@sda21(r13) /* 803ADC94 003AABF4 28 0C 00 00 */ cmplwi r12, 0 /* 803ADC98 003AABF8 40 82 00 0C */ bne lbl_803ADCA4 /* 803ADC9C 003AABFC 38 60 00 00 */ li r3, 0 @@ -3378,9 +3411,9 @@ lbl_803ADCFC: /* 803ADCFC 003AAC5C 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 803ADD00 003AAC60 38 80 00 00 */ li r4, 0 /* 803ADD04 003AAC64 1C 00 00 BC */ mulli r0, r0, 0xbc -/* 803ADD08 003AAC68 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803ADD08 003AAC68 3C 60 80 56 */ lis r3, dspStudio@ha /* 803ADD0C 003AAC6C 98 9E 00 ED */ stb r4, 0xed(r30) -/* 803ADD10 003AAC70 38 63 F2 60 */ addi r3, r3, lbl_8055F260@l +/* 803ADD10 003AAC70 38 63 F2 60 */ addi r3, r3, dspStudio@l /* 803ADD14 003AAC74 7C 83 02 14 */ add r4, r3, r0 /* 803ADD18 003AAC78 84 04 00 48 */ lwzu r0, 0x48(r4) /* 803ADD1C 003AAC7C 28 00 00 00 */ cmplwi r0, 0 @@ -3416,8 +3449,8 @@ salDeactivateVoice: /* 803ADD84 003AACE4 48 00 00 20 */ b lbl_803ADDA4 lbl_803ADD88: /* 803ADD88 003AACE8 88 03 00 EF */ lbz r0, 0xef(r3) -/* 803ADD8C 003AACEC 3C 80 80 56 */ lis r4, lbl_8055F260@ha -/* 803ADD90 003AACF0 38 84 F2 60 */ addi r4, r4, lbl_8055F260@l +/* 803ADD8C 003AACEC 3C 80 80 56 */ lis r4, dspStudio@ha +/* 803ADD90 003AACF0 38 84 F2 60 */ addi r4, r4, dspStudio@l /* 803ADD94 003AACF4 80 A3 00 0C */ lwz r5, 0xc(r3) /* 803ADD98 003AACF8 1C 00 00 BC */ mulli r0, r0, 0xbc /* 803ADD9C 003AACFC 7C 84 02 14 */ add r4, r4, r0 @@ -3446,8 +3479,8 @@ sub_803addc4: /* 803ADDE4 003AAD44 48 00 00 20 */ b lbl_803ADE04 lbl_803ADDE8: /* 803ADDE8 003AAD48 88 03 00 EF */ lbz r0, 0xef(r3) -/* 803ADDEC 003AAD4C 3C A0 80 56 */ lis r5, lbl_8055F260@ha -/* 803ADDF0 003AAD50 38 A5 F2 60 */ addi r5, r5, lbl_8055F260@l +/* 803ADDEC 003AAD4C 3C A0 80 56 */ lis r5, dspStudio@ha +/* 803ADDF0 003AAD50 38 A5 F2 60 */ addi r5, r5, dspStudio@l /* 803ADDF4 003AAD54 80 C3 00 0C */ lwz r6, 0xc(r3) /* 803ADDF8 003AAD58 1C 00 00 BC */ mulli r0, r0, 0xbc /* 803ADDFC 003AAD5C 7C A5 02 14 */ add r5, r5, r0 @@ -3460,9 +3493,9 @@ lbl_803ADE04: /* 803ADE14 003AAD74 90 05 00 10 */ stw r0, 0x10(r5) lbl_803ADE18: /* 803ADE18 003AAD78 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 803ADE1C 003AAD7C 3C A0 80 56 */ lis r5, lbl_8055F260@ha +/* 803ADE1C 003AAD7C 3C A0 80 56 */ lis r5, dspStudio@ha /* 803ADE20 003AAD80 1C 00 00 BC */ mulli r0, r0, 0xbc -/* 803ADE24 003AAD84 38 A5 F2 60 */ addi r5, r5, lbl_8055F260@l +/* 803ADE24 003AAD84 38 A5 F2 60 */ addi r5, r5, dspStudio@l /* 803ADE28 003AAD88 7C C5 02 14 */ add r6, r5, r0 /* 803ADE2C 003AAD8C 84 06 00 48 */ lwzu r0, 0x48(r6) /* 803ADE30 003AAD90 28 00 00 00 */ cmplwi r0, 0 @@ -3478,8 +3511,8 @@ lbl_803ADE44: /* 803ADE54 003AADB4 28 00 00 02 */ cmplwi r0, 2 /* 803ADE58 003AADB8 40 82 00 2C */ bne lbl_803ADE84 /* 803ADE5C 003AADBC 88 03 00 EF */ lbz r0, 0xef(r3) -/* 803ADE60 003AADC0 3C A0 80 56 */ lis r5, lbl_8055F260@ha -/* 803ADE64 003AADC4 38 A5 F2 60 */ addi r5, r5, lbl_8055F260@l +/* 803ADE60 003AADC0 3C A0 80 56 */ lis r5, dspStudio@ha +/* 803ADE64 003AADC4 38 A5 F2 60 */ addi r5, r5, dspStudio@l /* 803ADE68 003AADC8 1C 00 00 BC */ mulli r0, r0, 0xbc /* 803ADE6C 003AADCC 38 A5 00 4C */ addi r5, r5, 0x4c /* 803ADE70 003AADD0 7C 05 00 2E */ lwzx r0, r5, r0 @@ -3582,9 +3615,9 @@ lbl_803ADFB0: salHandleAuxProcessing: /* 803ADFB8 003AAF18 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803ADFBC 003AAF1C 7C 08 02 A6 */ mflr r0 -/* 803ADFC0 003AAF20 3C 60 80 56 */ lis r3, lbl_8055F260@ha +/* 803ADFC0 003AAF20 3C 60 80 56 */ lis r3, dspStudio@ha /* 803ADFC4 003AAF24 90 01 00 34 */ stw r0, 0x34(r1) -/* 803ADFC8 003AAF28 38 03 F2 60 */ addi r0, r3, lbl_8055F260@l +/* 803ADFC8 003AAF28 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803ADFCC 003AAF2C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 803ADFD0 003AAF30 3B E0 00 00 */ li r31, 0 /* 803ADFD4 003AAF34 93 C1 00 28 */ stw r30, 0x28(r1) @@ -3598,7 +3631,7 @@ lbl_803ADFE4: /* 803ADFF0 003AAF50 81 9E 00 AC */ lwz r12, 0xac(r30) /* 803ADFF4 003AAF54 28 0C 00 00 */ cmplwi r12, 0 /* 803ADFF8 003AAF58 41 82 00 68 */ beq lbl_803AE060 -/* 803ADFFC 003AAF5C 88 8D AF 8E */ lbz r4, lbl_805A9B4E@sda21(r13) +/* 803ADFFC 003AAF5C 88 8D AF 8E */ lbz r4, salAuxFrame@sda21(r13) /* 803AE000 003AAF60 3C 60 55 55 */ lis r3, 0x55555556@ha /* 803AE004 003AAF64 38 03 55 56 */ addi r0, r3, 0x55555556@l /* 803AE008 003AAF68 80 BE 00 B4 */ lwz r5, 0xb4(r30) @@ -3630,7 +3663,7 @@ lbl_803AE060: /* 803AE06C 003AAFCC 81 9E 00 B0 */ lwz r12, 0xb0(r30) /* 803AE070 003AAFD0 28 0C 00 00 */ cmplwi r12, 0 /* 803AE074 003AAFD4 41 82 00 68 */ beq lbl_803AE0DC -/* 803AE078 003AAFD8 88 8D AF 8E */ lbz r4, lbl_805A9B4E@sda21(r13) +/* 803AE078 003AAFD8 88 8D AF 8E */ lbz r4, salAuxFrame@sda21(r13) /* 803AE07C 003AAFDC 3C 60 55 55 */ lis r3, 0x55555556@ha /* 803AE080 003AAFE0 38 03 55 56 */ addi r0, r3, 0x55555556@l /* 803AE084 003AAFE4 80 BE 00 B8 */ lwz r5, 0xb8(r30) @@ -3659,7 +3692,7 @@ lbl_803AE0DC: /* 803AE0DC 003AB03C 3B FF 00 01 */ addi r31, r31, 1 /* 803AE0E0 003AB040 3B DE 00 BC */ addi r30, r30, 0xbc lbl_803AE0E4: -/* 803AE0E4 003AB044 88 0D AF 8C */ lbz r0, lbl_805A9B4C@sda21(r13) +/* 803AE0E4 003AB044 88 0D AF 8C */ lbz r0, salMaxStudioNum@sda21(r13) /* 803AE0E8 003AB048 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 803AE0EC 003AB04C 7C 03 00 40 */ cmplw r3, r0 /* 803AE0F0 003AB050 41 80 FE F4 */ blt lbl_803ADFE4 diff --git a/asm/musyx/hw_memory.s b/asm/musyx/hw_memory.s index dd3328ce..895f0b73 100644 --- a/asm/musyx/hw_memory.s +++ b/asm/musyx/hw_memory.s @@ -7,7 +7,7 @@ salMalloc: /* 803B5134 003B2094 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B5138 003B2098 7C 08 02 A6 */ mflr r0 /* 803B513C 003B209C 90 01 00 14 */ stw r0, 0x14(r1) -/* 803B5140 003B20A0 81 8D AF 84 */ lwz r12, lbl_805A9B44@sda21(r13) +/* 803B5140 003B20A0 81 8D AF 84 */ lwz r12, salHooks@sda21(r13) /* 803B5144 003B20A4 7D 89 03 A6 */ mtctr r12 /* 803B5148 003B20A8 4E 80 04 21 */ bctrl /* 803B514C 003B20AC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -19,7 +19,7 @@ salMalloc: salFree: /* 803B515C 003B20BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B5160 003B20C0 7C 08 02 A6 */ mflr r0 -/* 803B5164 003B20C4 38 8D AF 84 */ addi r4, r13, lbl_805A9B44@sda21 +/* 803B5164 003B20C4 38 8D AF 84 */ addi r4, r13, salHooks@sda21 /* 803B5168 003B20C8 90 01 00 14 */ stw r0, 0x14(r1) /* 803B516C 003B20CC 81 84 00 04 */ lwz r12, 4(r4) /* 803B5170 003B20D0 7D 89 03 A6 */ mtctr r12 diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index 80f700b5..53857874 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -830,7 +830,7 @@ ReverbHICallback: /* 803B676C 003B36CC 7C 08 02 A6 */ mflr r0 /* 803B6770 003B36D0 90 01 00 24 */ stw r0, 0x24(r1) /* 803B6774 003B36D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803B6778 003B36D8 4B FD 33 05 */ bl sub_80389a7c +/* 803B6778 003B36D8 4B FD 33 05 */ bl _savegpr_27 /* 803B677C 003B36DC 7C 7B 1B 78 */ mr r27, r3 /* 803B6780 003B36E0 7C 9C 23 78 */ mr r28, r4 /* 803B6784 003B36E4 7C BD 2B 78 */ mr r29, r5 diff --git a/asm/musyx/s_data.s b/asm/musyx/s_data.s index 57c30dc3..af0942a5 100644 --- a/asm/musyx/s_data.s +++ b/asm/musyx/s_data.s @@ -1,9 +1,15 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global sp +sp: + .skip 0x8 + .section .text, "ax" -.global sub_803a9d7c -sub_803a9d7c: +.global vsUpdateBuffer +vsUpdateBuffer: /* 803A9D7C 003A6CDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A9D80 003A6CE0 7C 08 02 A6 */ mflr r0 /* 803A9D84 003A6CE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -22,9 +28,9 @@ lbl_803A9DB4: /* 803A9DB4 003A6D14 3C A0 24 92 */ lis r5, 0x24924925@ha /* 803A9DB8 003A6D18 38 00 00 00 */ li r0, 0 /* 803A9DBC 003A6D1C 38 A5 49 25 */ addi r5, r5, 0x24924925@l -/* 803A9DC0 003A6D20 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9DC0 003A6D20 3C 60 80 56 */ lis r3, vs@ha /* 803A9DC4 003A6D24 7C E5 40 16 */ mulhwu r7, r5, r8 -/* 803A9DC8 003A6D28 38 A3 E3 10 */ addi r5, r3, lbl_8055E310@l +/* 803A9DC8 003A6D28 38 A3 E3 10 */ addi r5, r3, vs@l /* 803A9DCC 003A6D2C 38 60 00 01 */ li r3, 1 /* 803A9DD0 003A6D30 7C C7 40 50 */ subf r6, r7, r8 /* 803A9DD4 003A6D34 54 C6 F8 7E */ srwi r6, r6, 1 @@ -42,9 +48,9 @@ lbl_803A9DB4: /* 803A9E04 003A6D64 4E 80 04 21 */ bctrl /* 803A9E08 003A6D68 28 03 00 00 */ cmplwi r3, 0 /* 803A9E0C 003A6D6C 41 82 01 50 */ beq lbl_803A9F5C -/* 803A9E10 003A6D70 3C 80 80 56 */ lis r4, lbl_8055E310@ha +/* 803A9E10 003A6D70 3C 80 80 56 */ lis r4, vs@ha /* 803A9E14 003A6D74 80 1F 00 04 */ lwz r0, 4(r31) -/* 803A9E18 003A6D78 38 84 E3 10 */ addi r4, r4, lbl_8055E310@l +/* 803A9E18 003A6D78 38 84 E3 10 */ addi r4, r4, vs@l /* 803A9E1C 003A6D7C 80 84 00 04 */ lwz r4, 4(r4) /* 803A9E20 003A6D80 7C 60 1A 14 */ add r3, r0, r3 /* 803A9E24 003A6D84 7C 03 23 96 */ divwu r0, r3, r4 @@ -61,11 +67,11 @@ lbl_803A9E38: /* 803A9E4C 003A6DAC 48 00 01 10 */ b lbl_803A9F5C lbl_803A9E50: /* 803A9E50 003A6DB0 3C 80 24 92 */ lis r4, 0x24924925@ha -/* 803A9E54 003A6DB4 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9E54 003A6DB4 3C 60 80 56 */ lis r3, vs@ha /* 803A9E58 003A6DB8 38 84 49 25 */ addi r4, r4, 0x24924925@l /* 803A9E5C 003A6DBC 38 00 00 00 */ li r0, 0 /* 803A9E60 003A6DC0 7C C4 40 16 */ mulhwu r6, r4, r8 -/* 803A9E64 003A6DC4 3B C3 E3 10 */ addi r30, r3, lbl_8055E310@l +/* 803A9E64 003A6DC4 3B C3 E3 10 */ addi r30, r3, vs@l /* 803A9E68 003A6DC8 38 9F 00 10 */ addi r4, r31, 0x10 /* 803A9E6C 003A6DCC 38 60 00 01 */ li r3, 1 /* 803A9E70 003A6DD0 7C A6 40 50 */ subf r5, r6, r8 @@ -99,11 +105,11 @@ lbl_803A9ED0: /* 803A9EDC 003A6E3C 48 00 00 80 */ b lbl_803A9F5C lbl_803A9EE0: /* 803A9EE0 003A6E40 3C A0 24 92 */ lis r5, 0x24924925@ha -/* 803A9EE4 003A6E44 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9EE4 003A6E44 3C 60 80 56 */ lis r3, vs@ha /* 803A9EE8 003A6E48 38 A5 49 25 */ addi r5, r5, 0x24924925@l /* 803A9EEC 003A6E4C 38 00 00 00 */ li r0, 0 /* 803A9EF0 003A6E50 7C C5 40 16 */ mulhwu r6, r5, r8 -/* 803A9EF4 003A6E54 3B C3 E3 10 */ addi r30, r3, lbl_8055E310@l +/* 803A9EF4 003A6E54 3B C3 E3 10 */ addi r30, r3, vs@l /* 803A9EF8 003A6E58 38 60 00 01 */ li r3, 1 /* 803A9EFC 003A6E5C 7C A6 40 50 */ subf r5, r6, r8 /* 803A9F00 003A6E60 54 A5 F8 7E */ srwi r5, r5, 1 @@ -144,8 +150,8 @@ vsSampleUpdates: /* 803A9F7C 003A6EDC 90 01 00 24 */ stw r0, 0x24(r1) /* 803A9F80 003A6EE0 39 61 00 20 */ addi r11, r1, 0x20 /* 803A9F84 003A6EE4 4B FD FA F5 */ bl _savegpr_26 -/* 803A9F88 003A6EE8 3C 60 80 56 */ lis r3, lbl_8055E310@ha -/* 803A9F8C 003A6EEC 3B E3 E3 10 */ addi r31, r3, lbl_8055E310@l +/* 803A9F88 003A6EE8 3C 60 80 56 */ lis r3, vs@ha +/* 803A9F8C 003A6EEC 3B E3 E3 10 */ addi r31, r3, vs@l /* 803A9F90 003A6EF0 80 1F 09 4C */ lwz r0, 0x94c(r31) /* 803A9F94 003A6EF4 28 00 00 00 */ cmplwi r0, 0 /* 803A9F98 003A6EF8 41 82 01 D4 */ beq lbl_803AA16C @@ -160,8 +166,8 @@ lbl_803A9FA4: /* 803A9FB8 003A6F18 28 03 00 00 */ cmplwi r3, 0 /* 803A9FBC 003A6F1C 41 82 01 A0 */ beq lbl_803AA15C /* 803A9FC0 003A6F20 88 9E 09 08 */ lbz r4, 0x908(r30) -/* 803A9FC4 003A6F24 3C 60 80 56 */ lis r3, lbl_8055E310@ha -/* 803A9FC8 003A6F28 38 03 E3 10 */ addi r0, r3, lbl_8055E310@l +/* 803A9FC4 003A6F24 3C 60 80 56 */ lis r3, vs@ha +/* 803A9FC8 003A6F28 38 03 E3 10 */ addi r0, r3, vs@l /* 803A9FCC 003A6F2C 7F A3 EB 78 */ mr r3, r29 /* 803A9FD0 003A6F30 1C 84 00 24 */ mulli r4, r4, 0x24 /* 803A9FD4 003A6F34 7C 80 22 14 */ add r4, r0, r4 @@ -193,7 +199,7 @@ lbl_803AA018: lbl_803AA034: /* 803AA034 003A6F94 7F 63 DB 78 */ mr r3, r27 /* 803AA038 003A6F98 7F 44 D3 78 */ mr r4, r26 -/* 803AA03C 003A6F9C 4B FF FD 41 */ bl sub_803a9d7c +/* 803AA03C 003A6F9C 4B FF FD 41 */ bl vsUpdateBuffer /* 803AA040 003A6FA0 48 00 01 1C */ b lbl_803AA15C lbl_803AA044: /* 803AA044 003A6FA4 88 7B 00 03 */ lbz r3, 3(r27) @@ -205,7 +211,7 @@ lbl_803AA044: /* 803AA05C 003A6FBC 40 82 00 E0 */ bne lbl_803AA13C /* 803AA060 003A6FC0 7F 63 DB 78 */ mr r3, r27 /* 803AA064 003A6FC4 7F 44 D3 78 */ mr r4, r26 -/* 803AA068 003A6FC8 4B FF FD 15 */ bl sub_803a9d7c +/* 803AA068 003A6FC8 4B FF FD 15 */ bl vsUpdateBuffer /* 803AA06C 003A6FCC 80 9B 00 0C */ lwz r4, 0xc(r27) /* 803AA070 003A6FD0 7C 1C 20 40 */ cmplw r28, r4 /* 803AA074 003A6FD4 41 80 00 18 */ blt lbl_803AA08C @@ -223,7 +229,7 @@ lbl_803AA08C: /* 803AA0A0 003A7000 90 1B 00 08 */ stw r0, 8(r27) lbl_803AA0A4: /* 803AA0A4 003A7004 93 9B 00 0C */ stw r28, 0xc(r27) -/* 803AA0A8 003A7008 80 AD AE 78 */ lwz r5, lbl_805A9A38@sda21(r13) +/* 803AA0A8 003A7008 80 AD AE 78 */ lwz r5, synthVoice@sda21(r13) /* 803AA0AC 003A700C 88 7B 00 03 */ lbz r3, 3(r27) /* 803AA0B0 003A7010 80 1B 00 08 */ lwz r0, 8(r27) /* 803AA0B4 003A7014 1C 83 04 04 */ mulli r4, r3, 0x404 @@ -244,7 +250,7 @@ lbl_803AA0A4: /* 803AA0F0 003A7050 88 7B 00 03 */ lbz r3, 3(r27) /* 803AA0F4 003A7054 48 00 92 99 */ bl hwBreak /* 803AA0F8 003A7058 88 1B 00 03 */ lbz r0, 3(r27) -/* 803AA0FC 003A705C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803AA0FC 003A705C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803AA100 003A7060 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803AA104 003A7064 7C 63 02 14 */ add r3, r3, r0 /* 803AA108 003A7068 4B FF CB 6D */ bl macSampleEndNotify @@ -254,9 +260,9 @@ lbl_803AA110: /* 803AA114 003A7074 4B FF E9 09 */ bl voiceKill lbl_803AA118: /* 803AA118 003A7078 38 00 00 00 */ li r0, 0 -/* 803AA11C 003A707C 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803AA11C 003A707C 3C 60 80 56 */ lis r3, vs@ha /* 803AA120 003A7080 98 1B 00 00 */ stb r0, 0(r27) -/* 803AA124 003A7084 38 03 E3 10 */ addi r0, r3, lbl_8055E310@l +/* 803AA124 003A7084 38 03 E3 10 */ addi r0, r3, vs@l /* 803AA128 003A7088 38 80 00 FF */ li r4, 0xff /* 803AA12C 003A708C 88 7B 00 03 */ lbz r3, 3(r27) /* 803AA130 003A7090 7C 60 1A 14 */ add r3, r0, r3 @@ -264,9 +270,9 @@ lbl_803AA118: /* 803AA138 003A7098 48 00 00 24 */ b lbl_803AA15C lbl_803AA13C: /* 803AA13C 003A709C 38 00 00 00 */ li r0, 0 -/* 803AA140 003A70A0 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803AA140 003A70A0 3C 60 80 56 */ lis r3, vs@ha /* 803AA144 003A70A4 98 1B 00 00 */ stb r0, 0(r27) -/* 803AA148 003A70A8 38 03 E3 10 */ addi r0, r3, lbl_8055E310@l +/* 803AA148 003A70A8 38 03 E3 10 */ addi r0, r3, vs@l /* 803AA14C 003A70AC 38 80 00 FF */ li r4, 0xff /* 803AA150 003A70B0 88 7B 00 03 */ lbz r3, 3(r27) /* 803AA154 003A70B4 7C 60 1A 14 */ add r3, r0, r3 @@ -287,7 +293,7 @@ lbl_803AA16C: .global sub_803aa184 sub_803aa184: /* 803AA184 003A70E4 38 00 00 00 */ li r0, 0 -/* 803AA188 003A70E8 B0 0D AF 18 */ sth r0, lbl_805A9AD8@sda21(r13) +/* 803AA188 003A70E8 B0 0D AF 18 */ sth r0, sp@sda21(r13) /* 803AA18C 003A70EC 4E 80 00 20 */ blr .global ScanIDList @@ -506,14 +512,14 @@ sndPushGroup: /* 803AA434 003A7394 90 01 00 34 */ stw r0, 0x34(r1) /* 803AA438 003A7398 39 61 00 30 */ addi r11, r1, 0x30 /* 803AA43C 003A739C 4B FD F6 39 */ bl _savegpr_25 -/* 803AA440 003A73A0 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AA440 003A73A0 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AA444 003A73A4 7C 7B 1B 78 */ mr r27, r3 /* 803AA448 003A73A8 7C 9C 23 78 */ mr r28, r4 /* 803AA44C 003A73AC 7C DD 33 78 */ mr r29, r6 /* 803AA450 003A73B0 28 00 00 00 */ cmplwi r0, 0 /* 803AA454 003A73B4 7C FE 3B 78 */ mr r30, r7 /* 803AA458 003A73B8 41 82 02 E4 */ beq lbl_803AA73C -/* 803AA45C 003A73BC A8 CD AF 18 */ lha r6, lbl_805A9AD8@sda21(r13) +/* 803AA45C 003A73BC A8 CD AF 18 */ lha r6, sp@sda21(r13) /* 803AA460 003A73C0 2C 06 00 80 */ cmpwi r6, 0x80 /* 803AA464 003A73C4 40 80 02 D8 */ bge lbl_803AA73C /* 803AA468 003A73C8 7F 7F DB 78 */ mr r31, r27 @@ -714,10 +720,10 @@ lbl_803AA6DC: /* 803AA708 003A7668 4B FF 75 E5 */ bl dataInsertFX lbl_803AA70C: /* 803AA70C 003A766C 48 00 97 D9 */ bl hwSyncSampleMem -/* 803AA710 003A7670 A8 8D AF 18 */ lha r4, lbl_805A9AD8@sda21(r13) +/* 803AA710 003A7670 A8 8D AF 18 */ lha r4, sp@sda21(r13) /* 803AA714 003A7674 38 60 00 01 */ li r3, 1 /* 803AA718 003A7678 38 04 00 01 */ addi r0, r4, 1 -/* 803AA71C 003A767C B0 0D AF 18 */ sth r0, lbl_805A9AD8@sda21(r13) +/* 803AA71C 003A767C B0 0D AF 18 */ sth r0, sp@sda21(r13) /* 803AA720 003A7680 48 00 00 20 */ b lbl_803AA740 lbl_803AA724: /* 803AA724 003A7684 80 1F 00 00 */ lwz r0, 0(r31) @@ -744,12 +750,12 @@ sndPopGroup: /* 803AA760 003A76C0 90 01 00 24 */ stw r0, 0x24(r1) /* 803AA764 003A76C4 39 61 00 20 */ addi r11, r1, 0x20 /* 803AA768 003A76C8 4B FD F3 11 */ bl _savegpr_26 -/* 803AA76C 003A76CC A8 AD AF 18 */ lha r5, lbl_805A9AD8@sda21(r13) +/* 803AA76C 003A76CC A8 AD AF 18 */ lha r5, sp@sda21(r13) /* 803AA770 003A76D0 3C 60 80 56 */ lis r3, lbl_8055EC60@ha /* 803AA774 003A76D4 38 83 EC 60 */ addi r4, r3, lbl_8055EC60@l /* 803AA778 003A76D8 38 65 FF FF */ addi r3, r5, -1 /* 803AA77C 003A76DC 7C 60 07 34 */ extsh r0, r3 -/* 803AA780 003A76E0 B0 6D AF 18 */ sth r3, lbl_805A9AD8@sda21(r13) +/* 803AA780 003A76E0 B0 6D AF 18 */ sth r3, sp@sda21(r13) /* 803AA784 003A76E4 1C 00 00 0C */ mulli r0, r0, 0xc /* 803AA788 003A76E8 7C 64 02 14 */ add r3, r4, r0 /* 803AA78C 003A76EC 7F E4 00 2E */ lwzx r31, r4, r0 @@ -986,7 +992,7 @@ sub_803aaa94: /* 803AAA9C 003A79FC 90 01 00 34 */ stw r0, 0x34(r1) /* 803AAAA0 003A7A00 39 61 00 30 */ addi r11, r1, 0x30 /* 803AAAA4 003A7A04 4B FD EF D1 */ bl _savegpr_25 -/* 803AAAA8 003A7A08 A8 0D AF 18 */ lha r0, lbl_805A9AD8@sda21(r13) +/* 803AAAA8 003A7A08 A8 0D AF 18 */ lha r0, sp@sda21(r13) /* 803AAAAC 003A7A0C 3D 20 80 56 */ lis r9, lbl_8055EC60@ha /* 803AAAB0 003A7A10 7C BD 2B 78 */ mr r29, r5 /* 803AAAB4 003A7A14 7C DE 33 78 */ mr r30, r6 @@ -1082,7 +1088,7 @@ sndSeqPlayEx: /* 803AABE8 003A7B48 90 01 00 34 */ stw r0, 0x34(r1) /* 803AABEC 003A7B4C 39 61 00 30 */ addi r11, r1, 0x30 /* 803AABF0 003A7B50 4B FD EE 85 */ bl _savegpr_25 -/* 803AABF4 003A7B54 A8 0D AF 18 */ lha r0, lbl_805A9AD8@sda21(r13) +/* 803AABF4 003A7B54 A8 0D AF 18 */ lha r0, sp@sda21(r13) /* 803AABF8 003A7B58 3D 00 80 56 */ lis r8, lbl_8055EC60@ha /* 803AABFC 003A7B5C 7C BD 2B 78 */ mr r29, r5 /* 803AAC00 003A7B60 7C DE 33 78 */ mr r30, r6 diff --git a/asm/musyx/sbss.s b/asm/musyx/sbss.s deleted file mode 100644 index 22da0c6c..00000000 --- a/asm/musyx/sbss.s +++ /dev/null @@ -1,264 +0,0 @@ -.section .sbss, "wa" - -/* TODO: Portion this out between MusyX source files appropriately */ -.global lbl_805A99E8 -lbl_805A99E8: - .skip 0x4 -.global lbl_805A99EC -lbl_805A99EC: - .skip 0x4 -.global lbl_805A99F0 -lbl_805A99F0: - .skip 0x4 -.global lbl_805A99F4 -lbl_805A99F4: - .skip 0x4 -.global lbl_805A99F8 -lbl_805A99F8: - .skip 0x4 -.global lbl_805A99FC -lbl_805A99FC: - .skip 0x4 -.global lbl_805A9A00 -lbl_805A9A00: - .skip 0x4 -.global lbl_805A9A04 -lbl_805A9A04: - .skip 0x4 -.global lbl_805A9A08 -lbl_805A9A08: - .skip 0x1 -.global lbl_805A9A09 -lbl_805A9A09: - .skip 0x3 -.global lbl_805A9A0C -lbl_805A9A0C: - .skip 0x8 -.global lbl_805A9A14 -lbl_805A9A14: - .skip 0x8 -.global lbl_805A9A1C -lbl_805A9A1C: - .skip 0x8 -.global lbl_805A9A24 -lbl_805A9A24: - .skip 0x8 -.global lbl_805A9A2C -lbl_805A9A2C: - .skip 0x4 -.global lbl_805A9A30 -lbl_805A9A30: - .skip 0x4 -.global lbl_805A9A34 -lbl_805A9A34: - .skip 0x4 -.global lbl_805A9A38 -lbl_805A9A38: - .skip 0x4 -.global lbl_805A9A3C -lbl_805A9A3C: - .skip 0x4 -.global lbl_805A9A40 -lbl_805A9A40: - .skip 0x8 -.global lbl_805A9A48 -lbl_805A9A48: - .skip 0x4 -.global lbl_805A9A4C -lbl_805A9A4C: - .skip 0x4 -.global lbl_805A9A50 -lbl_805A9A50: - .skip 0x4 -.global lbl_805A9A54 -lbl_805A9A54: - .skip 0x1 -.global lbl_805A9A55 -lbl_805A9A55: - .skip 0x3 -.global lbl_805A9A58 -lbl_805A9A58: - .skip 0x4 -.global lbl_805A9A5C -lbl_805A9A5C: - .skip 0x4 -.global lbl_805A9A60 -lbl_805A9A60: - .skip 0x8 -.global lbl_805A9A68 -lbl_805A9A68: - .skip 0x4 -.global lbl_805A9A6C -lbl_805A9A6C: - .skip 0x8 -.global lbl_805A9A74 -lbl_805A9A74: - .skip 0x4 -.global lbl_805A9A78 -lbl_805A9A78: - .skip 0x4 -.global lbl_805A9A7C -lbl_805A9A7C: - .skip 0x4 -.global lbl_805A9A80 -lbl_805A9A80: - .skip 0x8 -.global lbl_805A9A88 -lbl_805A9A88: - .skip 0x4 -.global lbl_805A9A8C -lbl_805A9A8C: - .skip 0x4 -.global lbl_805A9A90 -lbl_805A9A90: - .skip 0x2 -.global lbl_805A9A92 -lbl_805A9A92: - .skip 0x2 -.global lbl_805A9A94 -lbl_805A9A94: - .skip 0x2 -.global lbl_805A9A96 -lbl_805A9A96: - .skip 0x2 -.global lbl_805A9A98 -lbl_805A9A98: - .skip 0x2 -.global lbl_805A9A9A -lbl_805A9A9A: - .skip 0x6 -.global lbl_805A9AA0 -lbl_805A9AA0: - .skip 0x8 -.global lbl_805A9AA8 -lbl_805A9AA8: - .skip 0x4 -.global lbl_805A9AAC -lbl_805A9AAC: - .skip 0x4 -.global lbl_805A9AB0 -lbl_805A9AB0: - .skip 0x4 -.global lbl_805A9AB4 -lbl_805A9AB4: - .skip 0x4 -.global lbl_805A9AB8 -lbl_805A9AB8: - .skip 0x8 -.global lbl_805A9AC0 -lbl_805A9AC0: - .skip 0x4 -.global lbl_805A9AC4 -lbl_805A9AC4: - .skip 0x4 -.global lbl_805A9AC8 -lbl_805A9AC8: - .skip 0x4 -.global lbl_805A9ACC -lbl_805A9ACC: - .skip 0x2 -.global lbl_805A9ACE -lbl_805A9ACE: - .skip 0x1 -.global lbl_805A9ACF -lbl_805A9ACF: - .skip 0x1 -.global lbl_805A9AD0 -lbl_805A9AD0: - .skip 0x1 -.global lbl_805A9AD1 -lbl_805A9AD1: - .skip 0x7 -.global lbl_805A9AD8 -lbl_805A9AD8: - .skip 0x8 -.global lbl_805A9AE0 -lbl_805A9AE0: - .skip 0x4 -.global lbl_805A9AE4 -lbl_805A9AE4: - .skip 0x4 -.global lbl_805A9AE8 -lbl_805A9AE8: - .skip 0x4 -.global lbl_805A9AEC -lbl_805A9AEC: - .skip 0x4 -.global lbl_805A9AF0 -lbl_805A9AF0: - .skip 0x4 -.global lbl_805A9AF4 -lbl_805A9AF4: - .skip 0x4 -.global lbl_805A9AF8 -lbl_805A9AF8: - .skip 0x4 -.global lbl_805A9AFC -lbl_805A9AFC: - .skip 0x4 -.global dspCmdList -dspCmdList: - .skip 0x4 -.global lbl_805A9B04 -lbl_805A9B04: - .skip 0x4 -.global lbl_805A9B08 -lbl_805A9B08: - .skip 0x4 -.global lbl_805A9B0C -lbl_805A9B0C: - .skip 0x4 -.global lbl_805A9B10 -lbl_805A9B10: - .skip 0x4 -.global lbl_805A9B14 -lbl_805A9B14: - .skip 0x4 -.global lbl_805A9B18 -lbl_805A9B18: - .skip 0x8 -.global lbl_805A9B20 -lbl_805A9B20: - .skip 0x1 -.global lbl_805A9B21 -lbl_805A9B21: - .skip 0x1 -.global lbl_805A9B22 -lbl_805A9B22: - .skip 0x1 -.global lbl_805A9B23 -lbl_805A9B23: - .skip 0x1 -.global lbl_805A9B24 -lbl_805A9B24: - .skip 0x1 -.global lbl_805A9B25 -lbl_805A9B25: - .skip 0x3 -.global lbl_805A9B28 -lbl_805A9B28: - .skip 0x4 -.global lbl_805A9B2C -lbl_805A9B2C: - .skip 0x4 -.global lbl_805A9B30 -lbl_805A9B30: - .skip 0x4 -.global lbl_805A9B34 -lbl_805A9B34: - .skip 0x4 -.global lbl_805A9B38 -lbl_805A9B38: - .skip 0x4 -.global lbl_805A9B3C -lbl_805A9B3C: - .skip 0x4 -.global lbl_805A9B40 -lbl_805A9B40: - .skip 0x4 -.global lbl_805A9B44 -lbl_805A9B44: - .skip 0x4 -.global lbl_805A9B48 -lbl_805A9B48: - .skip 0x4 diff --git a/asm/musyx/seq.s b/asm/musyx/seq.s index 135d5831..ccd7f4ba 100644 --- a/asm/musyx/seq.s +++ b/asm/musyx/seq.s @@ -1,5 +1,23 @@ .include "macros.inc" +.section .sbss +seq_next_id: + .skip 0x4 +curFadeOutState: + .skip 0x4 +curSeqId: + .skip 0x4 +noteFree: + .skip 0x4 +cseq: + .skip 0x4 +seqFreeRoot: + .skip 0x4 +seqPausedRoot: + .skip 0x4 +seqActiveRoot: + .skip 0x4 + .section .data, "wa" .global lbl_803F2F88 @@ -11,7 +29,7 @@ lbl_803F2F88: .global seqGetPrivateId seqGetPrivateId: /* 80394D30 00391C90 7C 65 1B 78 */ mr r5, r3 -/* 80394D34 00391C94 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 80394D34 00391C94 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 80394D38 00391C98 54 63 00 7E */ clrlwi r3, r3, 1 /* 80394D3C 00391C9C 48 00 00 20 */ b lbl_80394D5C lbl_80394D40: @@ -26,7 +44,7 @@ lbl_80394D58: lbl_80394D5C: /* 80394D5C 00391CBC 28 04 00 00 */ cmplwi r4, 0 /* 80394D60 00391CC0 40 82 FF E0 */ bne lbl_80394D40 -/* 80394D64 00391CC4 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80394D64 00391CC4 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80394D68 00391CC8 48 00 00 20 */ b lbl_80394D88 lbl_80394D6C: /* 80394D6C 00391CCC 80 04 00 0C */ lwz r0, 0xc(r4) @@ -50,7 +68,7 @@ seqStartPlay: /* 80394DA0 00391D00 90 01 00 44 */ stw r0, 0x44(r1) /* 80394DA4 00391D04 39 61 00 40 */ addi r11, r1, 0x40 /* 80394DA8 00391D08 4B FF 4C B9 */ bl _savegpr_20 -/* 80394DAC 00391D0C 83 6D AE 3C */ lwz r27, lbl_805A99FC@sda21(r13) +/* 80394DAC 00391D0C 83 6D AE 3C */ lwz r27, seqFreeRoot@sda21(r13) /* 80394DB0 00391D10 7C BD 2B 78 */ mr r29, r5 /* 80394DB4 00391D14 7C DC 33 78 */ mr r28, r6 /* 80394DB8 00391D18 7C F9 3B 78 */ mr r25, r7 @@ -61,16 +79,16 @@ seqStartPlay: lbl_80394DCC: /* 80394DCC 00391D2C 80 BB 00 00 */ lwz r5, 0(r27) /* 80394DD0 00391D30 28 05 00 00 */ cmplwi r5, 0 -/* 80394DD4 00391D34 90 AD AE 3C */ stw r5, lbl_805A99FC@sda21(r13) +/* 80394DD4 00391D34 90 AD AE 3C */ stw r5, seqFreeRoot@sda21(r13) /* 80394DD8 00391D38 41 82 00 0C */ beq lbl_80394DE4 /* 80394DDC 00391D3C 38 00 00 00 */ li r0, 0 /* 80394DE0 00391D40 90 05 00 04 */ stw r0, 4(r5) lbl_80394DE4: -/* 80394DE4 00391D44 80 0D AE 44 */ lwz r0, lbl_805A9A04@sda21(r13) +/* 80394DE4 00391D44 80 0D AE 44 */ lwz r0, seqActiveRoot@sda21(r13) /* 80394DE8 00391D48 28 00 00 00 */ cmplwi r0, 0 /* 80394DEC 00391D4C 90 1B 00 00 */ stw r0, 0(r27) /* 80394DF0 00391D50 41 82 00 0C */ beq lbl_80394DFC -/* 80394DF4 00391D54 80 AD AE 44 */ lwz r5, lbl_805A9A04@sda21(r13) +/* 80394DF4 00391D54 80 AD AE 44 */ lwz r5, seqActiveRoot@sda21(r13) /* 80394DF8 00391D58 93 65 00 04 */ stw r27, 4(r5) lbl_80394DFC: /* 80394DFC 00391D5C 38 A0 00 00 */ li r5, 0 @@ -78,7 +96,7 @@ lbl_80394DFC: /* 80394E04 00391D64 90 BB 00 04 */ stw r5, 4(r27) /* 80394E08 00391D68 2C 00 00 10 */ cmpwi r0, 0x10 /* 80394E0C 00391D6C 38 00 00 01 */ li r0, 1 -/* 80394E10 00391D70 93 6D AE 44 */ stw r27, lbl_805A9A04@sda21(r13) +/* 80394E10 00391D70 93 6D AE 44 */ stw r27, seqActiveRoot@sda21(r13) /* 80394E14 00391D74 98 1B 00 08 */ stb r0, 8(r27) /* 80394E18 00391D78 40 80 00 44 */ bge lbl_80394E5C /* 80394E1C 00391D7C 90 BB 15 04 */ stw r5, 0x1504(r27) @@ -569,7 +587,7 @@ lbl_8039550C: lbl_80395510: /* 80395510 00392470 7F 44 D3 78 */ mr r4, r26 /* 80395514 00392474 56 C3 06 3E */ clrlwi r3, r22, 0x18 -/* 80395518 00392478 48 01 C6 ED */ bl sub_803b1c04 +/* 80395518 00392478 48 01 C6 ED */ bl inpResetChannelDefaults /* 8039551C 0039247C 3A D6 00 01 */ addi r22, r22, 1 /* 80395520 00392480 2C 16 00 10 */ cmpwi r22, 0x10 /* 80395524 00392484 41 80 FF EC */ blt lbl_80395510 @@ -581,7 +599,7 @@ lbl_80395510: /* 8039553C 0039249C 3B C4 FF FF */ addi r30, r4, 0x0000FFFF@l /* 80395540 003924A0 3B E3 FD 10 */ addi r31, r3, lbl_8054FD10@l lbl_80395544: -/* 80395544 003924A4 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80395544 003924A4 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 80395548 003924A8 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 8039554C 003924AC 88 BD 00 04 */ lbz r5, 4(r29) /* 80395550 003924B0 28 04 00 09 */ cmplwi r4, 9 @@ -741,19 +759,19 @@ lbl_80395784: /* 803957A0 00392700 7F 63 DB 78 */ mr r3, r27 /* 803957A4 00392704 48 00 00 B9 */ bl StartPause lbl_803957A8: -/* 803957A8 00392708 82 AD AE 38 */ lwz r21, lbl_805A99F8@sda21(r13) -/* 803957AC 0039270C 93 6D AE 38 */ stw r27, lbl_805A99F8@sda21(r13) +/* 803957A8 00392708 82 AD AE 38 */ lwz r21, cseq@sda21(r13) +/* 803957AC 0039270C 93 6D AE 38 */ stw r27, cseq@sda21(r13) /* 803957B0 00392710 48 00 23 45 */ bl InitTrackEvents -/* 803957B4 00392714 92 AD AE 38 */ stw r21, lbl_805A99F8@sda21(r13) -/* 803957B8 00392718 80 AD AE 44 */ lwz r5, lbl_805A9A04@sda21(r13) -/* 803957BC 0039271C 80 CD AE 40 */ lwz r6, lbl_805A9A00@sda21(r13) +/* 803957B4 00392714 92 AD AE 38 */ stw r21, cseq@sda21(r13) +/* 803957B8 00392718 80 AD AE 44 */ lwz r5, seqActiveRoot@sda21(r13) +/* 803957BC 0039271C 80 CD AE 40 */ lwz r6, seqPausedRoot@sda21(r13) lbl_803957C0: -/* 803957C0 00392720 80 6D AE 28 */ lwz r3, lbl_805A99E8@sda21(r13) +/* 803957C0 00392720 80 6D AE 28 */ lwz r3, seq_next_id@sda21(r13) /* 803957C4 00392724 7C A4 2B 78 */ mr r4, r5 /* 803957C8 00392728 38 03 00 01 */ addi r0, r3, 1 -/* 803957CC 0039272C 90 0D AE 28 */ stw r0, lbl_805A99E8@sda21(r13) +/* 803957CC 0039272C 90 0D AE 28 */ stw r0, seq_next_id@sda21(r13) /* 803957D0 00392730 54 00 00 7E */ clrlwi r0, r0, 1 -/* 803957D4 00392734 90 0D AE 28 */ stw r0, lbl_805A99E8@sda21(r13) +/* 803957D4 00392734 90 0D AE 28 */ stw r0, seq_next_id@sda21(r13) /* 803957D8 00392738 48 00 00 1C */ b lbl_803957F4 lbl_803957DC: /* 803957DC 0039273C 80 04 00 0C */ lwz r0, 0xc(r4) @@ -807,7 +825,7 @@ StartPause: /* 80395870 003927D0 48 00 00 0C */ b lbl_8039587C lbl_80395874: /* 80395874 003927D4 80 03 00 00 */ lwz r0, 0(r3) -/* 80395878 003927D8 90 0D AE 44 */ stw r0, lbl_805A9A04@sda21(r13) +/* 80395878 003927D8 90 0D AE 44 */ stw r0, seqActiveRoot@sda21(r13) lbl_8039587C: /* 8039587C 003927DC 80 83 00 00 */ lwz r4, 0(r3) /* 80395880 003927E0 28 04 00 00 */ cmplwi r4, 0 @@ -815,17 +833,17 @@ lbl_8039587C: /* 80395888 003927E8 80 03 00 04 */ lwz r0, 4(r3) /* 8039588C 003927EC 90 04 00 04 */ stw r0, 4(r4) lbl_80395890: -/* 80395890 003927F0 80 0D AE 40 */ lwz r0, lbl_805A9A00@sda21(r13) +/* 80395890 003927F0 80 0D AE 40 */ lwz r0, seqPausedRoot@sda21(r13) /* 80395894 003927F4 28 00 00 00 */ cmplwi r0, 0 /* 80395898 003927F8 90 03 00 00 */ stw r0, 0(r3) /* 8039589C 003927FC 41 82 00 0C */ beq lbl_803958A8 -/* 803958A0 00392800 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 803958A0 00392800 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 803958A4 00392804 90 64 00 04 */ stw r3, 4(r4) lbl_803958A8: /* 803958A8 00392808 38 80 00 00 */ li r4, 0 /* 803958AC 0039280C 38 00 00 02 */ li r0, 2 /* 803958B0 00392810 90 83 00 04 */ stw r4, 4(r3) -/* 803958B4 00392814 90 6D AE 40 */ stw r3, lbl_805A9A00@sda21(r13) +/* 803958B4 00392814 90 6D AE 40 */ stw r3, seqPausedRoot@sda21(r13) /* 803958B8 00392818 98 03 00 08 */ stb r0, 8(r3) /* 803958BC 0039281C 4E 80 00 20 */ blr @@ -839,7 +857,7 @@ seqPause: /* 803958D4 00392834 93 C1 00 18 */ stw r30, 0x18(r1) /* 803958D8 00392838 93 A1 00 14 */ stw r29, 0x14(r1) /* 803958DC 0039283C 93 81 00 10 */ stw r28, 0x10(r1) -/* 803958E0 00392840 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 803958E0 00392840 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 803958E4 00392844 48 00 00 20 */ b lbl_80395904 lbl_803958E8: /* 803958E8 00392848 80 04 00 0C */ lwz r0, 0xc(r4) @@ -853,7 +871,7 @@ lbl_80395900: lbl_80395904: /* 80395904 00392864 28 04 00 00 */ cmplwi r4, 0 /* 80395908 00392868 40 82 FF E0 */ bne lbl_803958E8 -/* 8039590C 0039286C 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 8039590C 0039286C 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80395910 00392870 48 00 00 20 */ b lbl_80395930 lbl_80395914: /* 80395914 00392874 80 04 00 0C */ lwz r0, 0xc(r4) @@ -889,7 +907,7 @@ lbl_8039593C: /* 80395980 003928E0 48 00 00 0C */ b lbl_8039598C lbl_80395984: /* 80395984 003928E4 80 1F 00 00 */ lwz r0, 0(r31) -/* 80395988 003928E8 90 0D AE 44 */ stw r0, lbl_805A9A04@sda21(r13) +/* 80395988 003928E8 90 0D AE 44 */ stw r0, seqActiveRoot@sda21(r13) lbl_8039598C: /* 8039598C 003928EC 80 7F 00 00 */ lwz r3, 0(r31) /* 80395990 003928F0 28 03 00 00 */ cmplwi r3, 0 @@ -897,7 +915,7 @@ lbl_8039598C: /* 80395998 003928F8 80 1F 00 04 */ lwz r0, 4(r31) /* 8039599C 003928FC 90 03 00 04 */ stw r0, 4(r3) lbl_803959A0: -/* 803959A0 00392900 80 6D AE 40 */ lwz r3, lbl_805A9A00@sda21(r13) +/* 803959A0 00392900 80 6D AE 40 */ lwz r3, seqPausedRoot@sda21(r13) /* 803959A4 00392904 28 03 00 00 */ cmplwi r3, 0 /* 803959A8 00392908 90 7F 00 00 */ stw r3, 0(r31) /* 803959AC 0039290C 41 82 00 08 */ beq lbl_803959B4 @@ -907,7 +925,7 @@ lbl_803959B4: /* 803959B8 00392918 38 00 00 02 */ li r0, 2 /* 803959BC 0039291C 93 DF 00 04 */ stw r30, 4(r31) /* 803959C0 00392920 7F FC FB 78 */ mr r28, r31 -/* 803959C4 00392924 93 ED AE 40 */ stw r31, lbl_805A9A00@sda21(r13) +/* 803959C4 00392924 93 ED AE 40 */ stw r31, seqPausedRoot@sda21(r13) /* 803959C8 00392928 98 1F 00 08 */ stb r0, 8(r31) lbl_803959CC: /* 803959CC 0039292C 83 BC 0E 64 */ lwz r29, 0xe64(r28) @@ -943,15 +961,15 @@ lbl_80395A2C: /* 80395A2C 0039298C 80 05 00 00 */ lwz r0, 0(r5) /* 80395A30 00392990 28 00 00 00 */ cmplwi r0, 0 /* 80395A34 00392994 40 82 FF F4 */ bne lbl_80395A28 -/* 80395A38 00392998 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395A38 00392998 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395A3C 0039299C 28 00 00 00 */ cmplwi r0, 0 /* 80395A40 003929A0 41 82 00 10 */ beq lbl_80395A50 /* 80395A44 003929A4 90 05 00 00 */ stw r0, 0(r5) -/* 80395A48 003929A8 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395A48 003929A8 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395A4C 003929AC 90 A3 00 04 */ stw r5, 4(r3) lbl_80395A50: /* 80395A50 003929B0 80 1F 0E 64 */ lwz r0, 0xe64(r31) -/* 80395A54 003929B4 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 80395A54 003929B4 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 80395A58 003929B8 90 9F 0E 64 */ stw r4, 0xe64(r31) lbl_80395A5C: /* 80395A5C 003929BC 38 DF 00 04 */ addi r6, r31, 4 @@ -965,15 +983,15 @@ lbl_80395A74: /* 80395A74 003929D4 80 05 00 00 */ lwz r0, 0(r5) /* 80395A78 003929D8 28 00 00 00 */ cmplwi r0, 0 /* 80395A7C 003929DC 40 82 FF F4 */ bne lbl_80395A70 -/* 80395A80 003929E0 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395A80 003929E0 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395A84 003929E4 28 00 00 00 */ cmplwi r0, 0 /* 80395A88 003929E8 41 82 00 10 */ beq lbl_80395A98 /* 80395A8C 003929EC 90 05 00 00 */ stw r0, 0(r5) -/* 80395A90 003929F0 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395A90 003929F0 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395A94 003929F4 90 A3 00 04 */ stw r5, 4(r3) lbl_80395A98: /* 80395A98 003929F8 80 06 0E 64 */ lwz r0, 0xe64(r6) -/* 80395A9C 003929FC 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 80395A9C 003929FC 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 80395AA0 00392A00 90 86 0E 64 */ stw r4, 0xe64(r6) lbl_80395AA4: /* 80395AA4 00392A04 80 9F 0E 6C */ lwz r4, 0xe6c(r31) @@ -986,16 +1004,16 @@ lbl_80395AB8: /* 80395AB8 00392A18 80 04 00 00 */ lwz r0, 0(r4) /* 80395ABC 00392A1C 28 00 00 00 */ cmplwi r0, 0 /* 80395AC0 00392A20 40 82 FF F4 */ bne lbl_80395AB4 -/* 80395AC4 00392A24 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395AC4 00392A24 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395AC8 00392A28 28 00 00 00 */ cmplwi r0, 0 /* 80395ACC 00392A2C 41 82 00 10 */ beq lbl_80395ADC /* 80395AD0 00392A30 90 04 00 00 */ stw r0, 0(r4) -/* 80395AD4 00392A34 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395AD4 00392A34 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395AD8 00392A38 90 83 00 04 */ stw r4, 4(r3) lbl_80395ADC: /* 80395ADC 00392A3C 80 7F 0E 6C */ lwz r3, 0xe6c(r31) /* 80395AE0 00392A40 38 00 00 00 */ li r0, 0 -/* 80395AE4 00392A44 90 6D AE 34 */ stw r3, lbl_805A99F4@sda21(r13) +/* 80395AE4 00392A44 90 6D AE 34 */ stw r3, noteFree@sda21(r13) /* 80395AE8 00392A48 90 1F 0E 6C */ stw r0, 0xe6c(r31) /* 80395AEC 00392A4C 48 00 00 30 */ b lbl_80395B1C lbl_80395AF0: @@ -1026,8 +1044,8 @@ seqStop: /* 80395B40 00392AA0 7C 08 02 A6 */ mflr r0 /* 80395B44 00392AA4 90 01 00 24 */ stw r0, 0x24(r1) /* 80395B48 00392AA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80395B4C 00392AAC 4B FF 3F 31 */ bl sub_80389a7c -/* 80395B50 00392AB0 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 80395B4C 00392AAC 4B FF 3F 31 */ bl _savegpr_27 +/* 80395B50 00392AB0 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 80395B54 00392AB4 54 65 00 7E */ clrlwi r5, r3, 1 /* 80395B58 00392AB8 48 00 00 20 */ b lbl_80395B78 lbl_80395B5C: @@ -1042,7 +1060,7 @@ lbl_80395B74: lbl_80395B78: /* 80395B78 00392AD8 28 04 00 00 */ cmplwi r4, 0 /* 80395B7C 00392ADC 40 82 FF E0 */ bne lbl_80395B5C -/* 80395B80 00392AE0 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80395B80 00392AE0 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80395B84 00392AE4 48 00 00 20 */ b lbl_80395BA4 lbl_80395B88: /* 80395B88 00392AE8 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1083,7 +1101,7 @@ lbl_80395BF0: /* 80395C04 00392B64 48 00 00 0C */ b lbl_80395C10 lbl_80395C08: /* 80395C08 00392B68 80 1F 00 00 */ lwz r0, 0(r31) -/* 80395C0C 00392B6C 90 0D AE 44 */ stw r0, lbl_805A9A04@sda21(r13) +/* 80395C0C 00392B6C 90 0D AE 44 */ stw r0, seqActiveRoot@sda21(r13) lbl_80395C10: /* 80395C10 00392B70 3B C0 00 00 */ li r30, 0 /* 80395C14 00392B74 7F FC FB 78 */ mr r28, r31 @@ -1124,15 +1142,15 @@ lbl_80395C84: /* 80395C84 00392BE4 80 05 00 00 */ lwz r0, 0(r5) /* 80395C88 00392BE8 28 00 00 00 */ cmplwi r0, 0 /* 80395C8C 00392BEC 40 82 FF F4 */ bne lbl_80395C80 -/* 80395C90 00392BF0 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395C90 00392BF0 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395C94 00392BF4 28 00 00 00 */ cmplwi r0, 0 /* 80395C98 00392BF8 41 82 00 10 */ beq lbl_80395CA8 /* 80395C9C 00392BFC 90 05 00 00 */ stw r0, 0(r5) -/* 80395CA0 00392C00 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395CA0 00392C00 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395CA4 00392C04 90 A3 00 04 */ stw r5, 4(r3) lbl_80395CA8: /* 80395CA8 00392C08 80 1F 0E 64 */ lwz r0, 0xe64(r31) -/* 80395CAC 00392C0C 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 80395CAC 00392C0C 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 80395CB0 00392C10 90 9F 0E 64 */ stw r4, 0xe64(r31) lbl_80395CB4: /* 80395CB4 00392C14 38 DF 00 04 */ addi r6, r31, 4 @@ -1146,15 +1164,15 @@ lbl_80395CCC: /* 80395CCC 00392C2C 80 05 00 00 */ lwz r0, 0(r5) /* 80395CD0 00392C30 28 00 00 00 */ cmplwi r0, 0 /* 80395CD4 00392C34 40 82 FF F4 */ bne lbl_80395CC8 -/* 80395CD8 00392C38 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395CD8 00392C38 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395CDC 00392C3C 28 00 00 00 */ cmplwi r0, 0 /* 80395CE0 00392C40 41 82 00 10 */ beq lbl_80395CF0 /* 80395CE4 00392C44 90 05 00 00 */ stw r0, 0(r5) -/* 80395CE8 00392C48 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395CE8 00392C48 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395CEC 00392C4C 90 A3 00 04 */ stw r5, 4(r3) lbl_80395CF0: /* 80395CF0 00392C50 80 06 0E 64 */ lwz r0, 0xe64(r6) -/* 80395CF4 00392C54 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 80395CF4 00392C54 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 80395CF8 00392C58 90 86 0E 64 */ stw r4, 0xe64(r6) lbl_80395CFC: /* 80395CFC 00392C5C 80 9B 00 00 */ lwz r4, 0(r27) @@ -1167,16 +1185,16 @@ lbl_80395D10: /* 80395D10 00392C70 80 04 00 00 */ lwz r0, 0(r4) /* 80395D14 00392C74 28 00 00 00 */ cmplwi r0, 0 /* 80395D18 00392C78 40 82 FF F4 */ bne lbl_80395D0C -/* 80395D1C 00392C7C 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80395D1C 00392C7C 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80395D20 00392C80 28 00 00 00 */ cmplwi r0, 0 /* 80395D24 00392C84 41 82 00 10 */ beq lbl_80395D34 /* 80395D28 00392C88 90 04 00 00 */ stw r0, 0(r4) -/* 80395D2C 00392C8C 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80395D2C 00392C8C 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80395D30 00392C90 90 83 00 04 */ stw r4, 4(r3) lbl_80395D34: /* 80395D34 00392C94 80 7B 00 00 */ lwz r3, 0(r27) /* 80395D38 00392C98 38 00 00 00 */ li r0, 0 -/* 80395D3C 00392C9C 90 6D AE 34 */ stw r3, lbl_805A99F4@sda21(r13) +/* 80395D3C 00392C9C 90 6D AE 34 */ stw r3, noteFree@sda21(r13) /* 80395D40 00392CA0 90 1B 00 00 */ stw r0, 0(r27) /* 80395D44 00392CA4 48 00 00 24 */ b lbl_80395D68 lbl_80395D48: @@ -1188,7 +1206,7 @@ lbl_80395D48: /* 80395D5C 00392CBC 48 00 00 0C */ b lbl_80395D68 lbl_80395D60: /* 80395D60 00392CC0 80 1F 00 00 */ lwz r0, 0(r31) -/* 80395D64 00392CC4 90 0D AE 40 */ stw r0, lbl_805A9A00@sda21(r13) +/* 80395D64 00392CC4 90 0D AE 40 */ stw r0, seqPausedRoot@sda21(r13) lbl_80395D68: /* 80395D68 00392CC8 80 7F 00 00 */ lwz r3, 0(r31) /* 80395D6C 00392CCC 28 03 00 00 */ cmplwi r3, 0 @@ -1196,18 +1214,18 @@ lbl_80395D68: /* 80395D74 00392CD4 80 1F 00 04 */ lwz r0, 4(r31) /* 80395D78 00392CD8 90 03 00 04 */ stw r0, 4(r3) lbl_80395D7C: -/* 80395D7C 00392CDC 80 6D AE 3C */ lwz r3, lbl_805A99FC@sda21(r13) +/* 80395D7C 00392CDC 80 6D AE 3C */ lwz r3, seqFreeRoot@sda21(r13) /* 80395D80 00392CE0 38 00 00 00 */ li r0, 0 /* 80395D84 00392CE4 98 1F 00 08 */ stb r0, 8(r31) /* 80395D88 00392CE8 28 03 00 00 */ cmplwi r3, 0 /* 80395D8C 00392CEC 41 82 00 08 */ beq lbl_80395D94 /* 80395D90 00392CF0 93 E3 00 04 */ stw r31, 4(r3) lbl_80395D94: -/* 80395D94 00392CF4 80 6D AE 3C */ lwz r3, lbl_805A99FC@sda21(r13) +/* 80395D94 00392CF4 80 6D AE 3C */ lwz r3, seqFreeRoot@sda21(r13) /* 80395D98 00392CF8 38 00 00 00 */ li r0, 0 /* 80395D9C 00392CFC 90 7F 00 00 */ stw r3, 0(r31) /* 80395DA0 00392D00 90 1F 00 04 */ stw r0, 4(r31) -/* 80395DA4 00392D04 93 ED AE 3C */ stw r31, lbl_805A99FC@sda21(r13) +/* 80395DA4 00392D04 93 ED AE 3C */ stw r31, seqFreeRoot@sda21(r13) /* 80395DA8 00392D08 48 00 00 2C */ b lbl_80395DD4 lbl_80395DAC: /* 80395DAC 00392D0C 54 80 00 7E */ clrlwi r0, r4, 1 @@ -1238,7 +1256,7 @@ seqKillInstancesByGroupID: /* 80395E00 00392D60 93 C1 00 18 */ stw r30, 0x18(r1) /* 80395E04 00392D64 93 A1 00 14 */ stw r29, 0x14(r1) /* 80395E08 00392D68 7C 7D 1B 78 */ mr r29, r3 -/* 80395E0C 00392D6C 83 CD AE 44 */ lwz r30, lbl_805A9A04@sda21(r13) +/* 80395E0C 00392D6C 83 CD AE 44 */ lwz r30, seqActiveRoot@sda21(r13) /* 80395E10 00392D70 48 00 00 1C */ b lbl_80395E2C lbl_80395E14: /* 80395E14 00392D74 A0 1E 00 0A */ lhz r0, 0xa(r30) @@ -1251,7 +1269,7 @@ lbl_80395E28: lbl_80395E2C: /* 80395E2C 00392D8C 28 1E 00 00 */ cmplwi r30, 0 /* 80395E30 00392D90 40 82 FF E4 */ bne lbl_80395E14 -/* 80395E34 00392D94 83 CD AE 40 */ lwz r30, lbl_805A9A00@sda21(r13) +/* 80395E34 00392D94 83 CD AE 40 */ lwz r30, seqPausedRoot@sda21(r13) /* 80395E38 00392D98 57 BF 04 3E */ clrlwi r31, r29, 0x10 /* 80395E3C 00392D9C 48 00 00 1C */ b lbl_80395E58 lbl_80395E40: @@ -1275,7 +1293,7 @@ lbl_80395E58: .global seqSpeed seqSpeed: -/* 80395E7C 00392DDC 80 AD AE 44 */ lwz r5, lbl_805A9A04@sda21(r13) +/* 80395E7C 00392DDC 80 AD AE 44 */ lwz r5, seqActiveRoot@sda21(r13) /* 80395E80 00392DE0 54 66 00 7E */ clrlwi r6, r3, 1 /* 80395E84 00392DE4 48 00 00 20 */ b lbl_80395EA4 lbl_80395E88: @@ -1290,7 +1308,7 @@ lbl_80395EA0: lbl_80395EA4: /* 80395EA4 00392E04 28 05 00 00 */ cmplwi r5, 0 /* 80395EA8 00392E08 40 82 FF E0 */ bne lbl_80395E88 -/* 80395EAC 00392E0C 80 AD AE 40 */ lwz r5, lbl_805A9A00@sda21(r13) +/* 80395EAC 00392E0C 80 AD AE 40 */ lwz r5, seqPausedRoot@sda21(r13) /* 80395EB0 00392E10 48 00 00 20 */ b lbl_80395ED0 lbl_80395EB4: /* 80395EB4 00392E14 80 05 00 0C */ lwz r0, 0xc(r5) @@ -1343,7 +1361,7 @@ lbl_80395F38: .global seqContinue seqContinue: -/* 80395F60 00392EC0 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 80395F60 00392EC0 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 80395F64 00392EC4 54 65 00 7E */ clrlwi r5, r3, 1 /* 80395F68 00392EC8 48 00 00 20 */ b lbl_80395F88 lbl_80395F6C: @@ -1358,7 +1376,7 @@ lbl_80395F84: lbl_80395F88: /* 80395F88 00392EE8 28 04 00 00 */ cmplwi r4, 0 /* 80395F8C 00392EEC 40 82 FF E0 */ bne lbl_80395F6C -/* 80395F90 00392EF0 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80395F90 00392EF0 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80395F94 00392EF4 48 00 00 20 */ b lbl_80395FB4 lbl_80395F98: /* 80395F98 00392EF8 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1391,7 +1409,7 @@ lbl_80395FC0: /* 80395FF8 00392F58 48 00 00 0C */ b lbl_80396004 lbl_80395FFC: /* 80395FFC 00392F5C 80 04 00 00 */ lwz r0, 0(r4) -/* 80396000 00392F60 90 0D AE 40 */ stw r0, lbl_805A9A00@sda21(r13) +/* 80396000 00392F60 90 0D AE 40 */ stw r0, seqPausedRoot@sda21(r13) lbl_80396004: /* 80396004 00392F64 80 64 00 00 */ lwz r3, 0(r4) /* 80396008 00392F68 28 03 00 00 */ cmplwi r3, 0 @@ -1399,7 +1417,7 @@ lbl_80396004: /* 80396010 00392F70 80 04 00 04 */ lwz r0, 4(r4) /* 80396014 00392F74 90 03 00 04 */ stw r0, 4(r3) lbl_80396018: -/* 80396018 00392F78 80 6D AE 44 */ lwz r3, lbl_805A9A04@sda21(r13) +/* 80396018 00392F78 80 6D AE 44 */ lwz r3, seqActiveRoot@sda21(r13) /* 8039601C 00392F7C 28 03 00 00 */ cmplwi r3, 0 /* 80396020 00392F80 90 64 00 00 */ stw r3, 0(r4) /* 80396024 00392F84 41 82 00 08 */ beq lbl_8039602C @@ -1408,7 +1426,7 @@ lbl_8039602C: /* 8039602C 00392F8C 38 60 00 00 */ li r3, 0 /* 80396030 00392F90 38 00 00 01 */ li r0, 1 /* 80396034 00392F94 90 64 00 04 */ stw r3, 4(r4) -/* 80396038 00392F98 90 8D AE 44 */ stw r4, lbl_805A9A04@sda21(r13) +/* 80396038 00392F98 90 8D AE 44 */ stw r4, seqActiveRoot@sda21(r13) /* 8039603C 00392F9C 98 04 00 08 */ stb r0, 8(r4) /* 80396040 00392FA0 4E 80 00 20 */ blr lbl_80396044: @@ -1424,7 +1442,7 @@ lbl_80396044: .global seqMute seqMute: -/* 80396068 00392FC8 80 CD AE 44 */ lwz r6, lbl_805A9A04@sda21(r13) +/* 80396068 00392FC8 80 CD AE 44 */ lwz r6, seqActiveRoot@sda21(r13) /* 8039606C 00392FCC 54 67 00 7E */ clrlwi r7, r3, 1 /* 80396070 00392FD0 48 00 00 20 */ b lbl_80396090 lbl_80396074: @@ -1439,7 +1457,7 @@ lbl_8039608C: lbl_80396090: /* 80396090 00392FF0 28 06 00 00 */ cmplwi r6, 0 /* 80396094 00392FF4 40 82 FF E0 */ bne lbl_80396074 -/* 80396098 00392FF8 80 CD AE 40 */ lwz r6, lbl_805A9A00@sda21(r13) +/* 80396098 00392FF8 80 CD AE 40 */ lwz r6, seqPausedRoot@sda21(r13) /* 8039609C 00392FFC 48 00 00 20 */ b lbl_803960BC lbl_803960A0: /* 803960A0 00393000 80 06 00 0C */ lwz r0, 0xc(r6) @@ -1486,8 +1504,8 @@ seqVolume: /* 80396128 00393088 7C 08 02 A6 */ mflr r0 /* 8039612C 0039308C 90 01 00 24 */ stw r0, 0x24(r1) /* 80396130 00393090 39 61 00 20 */ addi r11, r1, 0x20 -/* 80396134 00393094 4B FF 39 49 */ bl sub_80389a7c -/* 80396138 00393098 81 0D AE 44 */ lwz r8, lbl_805A9A04@sda21(r13) +/* 80396134 00393094 4B FF 39 49 */ bl _savegpr_27 +/* 80396138 00393098 81 0D AE 44 */ lwz r8, seqActiveRoot@sda21(r13) /* 8039613C 0039309C 7C 7E 1B 78 */ mr r30, r3 /* 80396140 003930A0 7C 9F 23 78 */ mr r31, r4 /* 80396144 003930A4 7C A7 2B 78 */ mr r7, r5 @@ -1505,7 +1523,7 @@ lbl_80396168: lbl_8039616C: /* 8039616C 003930CC 28 08 00 00 */ cmplwi r8, 0 /* 80396170 003930D0 40 82 FF E0 */ bne lbl_80396150 -/* 80396174 003930D4 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396174 003930D4 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396178 003930D8 48 00 00 20 */ b lbl_80396198 lbl_8039617C: /* 8039617C 003930DC 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1622,7 +1640,7 @@ seqCrossFade: /* 803962FC 0039325C 39 61 00 50 */ addi r11, r1, 0x50 /* 80396300 00393260 4B FF 37 75 */ bl _savegpr_25 /* 80396304 00393264 7C 7F 1B 78 */ mr r31, r3 -/* 80396308 00393268 80 CD AE 44 */ lwz r6, lbl_805A9A04@sda21(r13) +/* 80396308 00393268 80 CD AE 44 */ lwz r6, seqActiveRoot@sda21(r13) /* 8039630C 0039326C 80 E3 00 00 */ lwz r7, 0(r3) /* 80396310 00393270 7C 9D 23 78 */ mr r29, r4 /* 80396314 00393274 7C BC 2B 78 */ mr r28, r5 @@ -1641,7 +1659,7 @@ lbl_8039633C: lbl_80396340: /* 80396340 003932A0 28 03 00 00 */ cmplwi r3, 0 /* 80396344 003932A4 40 82 FF E0 */ bne lbl_80396324 -/* 80396348 003932A8 80 6D AE 40 */ lwz r3, lbl_805A9A00@sda21(r13) +/* 80396348 003932A8 80 6D AE 40 */ lwz r3, seqPausedRoot@sda21(r13) /* 8039634C 003932AC 48 00 00 20 */ b lbl_8039636C lbl_80396350: /* 80396350 003932B0 80 03 00 0C */ lwz r0, 0xc(r3) @@ -1720,7 +1738,7 @@ lbl_80396454: lbl_80396458: /* 80396458 003933B8 28 06 00 00 */ cmplwi r6, 0 /* 8039645C 003933BC 40 82 FF E0 */ bne lbl_8039643C -/* 80396460 003933C0 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396460 003933C0 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396464 003933C4 48 00 00 20 */ b lbl_80396484 lbl_80396468: /* 80396468 003933C8 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1800,7 +1818,7 @@ lbl_80396568: lbl_8039656C: /* 8039656C 003934CC 28 06 00 00 */ cmplwi r6, 0 /* 80396570 003934D0 40 82 FF E0 */ bne lbl_80396550 -/* 80396574 003934D4 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396574 003934D4 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396578 003934D8 48 00 00 20 */ b lbl_80396598 lbl_8039657C: /* 8039657C 003934DC 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1878,7 +1896,7 @@ lbl_80396674: lbl_80396678: /* 80396678 003935D8 28 06 00 00 */ cmplwi r6, 0 /* 8039667C 003935DC 40 82 FF E0 */ bne lbl_8039665C -/* 80396680 003935E0 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396680 003935E0 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396684 003935E4 48 00 00 20 */ b lbl_803966A4 lbl_80396688: /* 80396688 003935E8 80 04 00 0C */ lwz r0, 0xc(r4) @@ -1969,7 +1987,7 @@ lbl_803967A8: /* 803967B4 00393714 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 803967B8 00393718 41 82 04 B4 */ beq lbl_80396C6C /* 803967BC 0039371C 80 7F 00 08 */ lwz r3, 8(r31) -/* 803967C0 00393720 80 CD AE 44 */ lwz r6, lbl_805A9A04@sda21(r13) +/* 803967C0 00393720 80 CD AE 44 */ lwz r6, seqActiveRoot@sda21(r13) /* 803967C4 00393724 54 65 00 7E */ clrlwi r5, r3, 1 /* 803967C8 00393728 7C C4 33 78 */ mr r4, r6 /* 803967CC 0039372C 48 00 00 20 */ b lbl_803967EC @@ -1985,7 +2003,7 @@ lbl_803967E8: lbl_803967EC: /* 803967EC 0039374C 28 04 00 00 */ cmplwi r4, 0 /* 803967F0 00393750 40 82 FF E0 */ bne lbl_803967D0 -/* 803967F4 00393754 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 803967F4 00393754 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 803967F8 00393758 48 00 00 20 */ b lbl_80396818 lbl_803967FC: /* 803967FC 0039375C 80 04 00 0C */ lwz r0, 0xc(r4) @@ -2020,7 +2038,7 @@ lbl_80396858: lbl_8039685C: /* 8039685C 003937BC 28 06 00 00 */ cmplwi r6, 0 /* 80396860 003937C0 40 82 FF E0 */ bne lbl_80396840 -/* 80396864 003937C4 80 AD AE 40 */ lwz r5, lbl_805A9A00@sda21(r13) +/* 80396864 003937C4 80 AD AE 40 */ lwz r5, seqPausedRoot@sda21(r13) /* 80396868 003937C8 48 00 00 20 */ b lbl_80396888 lbl_8039686C: /* 8039686C 003937CC 80 05 00 0C */ lwz r0, 0xc(r5) @@ -2053,7 +2071,7 @@ lbl_80396894: /* 803968CC 0039382C 48 00 00 0C */ b lbl_803968D8 lbl_803968D0: /* 803968D0 00393830 80 04 00 00 */ lwz r0, 0(r4) -/* 803968D4 00393834 90 0D AE 40 */ stw r0, lbl_805A9A00@sda21(r13) +/* 803968D4 00393834 90 0D AE 40 */ stw r0, seqPausedRoot@sda21(r13) lbl_803968D8: /* 803968D8 00393838 80 64 00 00 */ lwz r3, 0(r4) /* 803968DC 0039383C 28 03 00 00 */ cmplwi r3, 0 @@ -2061,7 +2079,7 @@ lbl_803968D8: /* 803968E4 00393844 80 04 00 04 */ lwz r0, 4(r4) /* 803968E8 00393848 90 03 00 04 */ stw r0, 4(r3) lbl_803968EC: -/* 803968EC 0039384C 80 6D AE 44 */ lwz r3, lbl_805A9A04@sda21(r13) +/* 803968EC 0039384C 80 6D AE 44 */ lwz r3, seqActiveRoot@sda21(r13) /* 803968F0 00393850 28 03 00 00 */ cmplwi r3, 0 /* 803968F4 00393854 90 64 00 00 */ stw r3, 0(r4) /* 803968F8 00393858 41 82 00 08 */ beq lbl_80396900 @@ -2070,7 +2088,7 @@ lbl_80396900: /* 80396900 00393860 38 60 00 00 */ li r3, 0 /* 80396904 00393864 38 00 00 01 */ li r0, 1 /* 80396908 00393868 90 64 00 04 */ stw r3, 4(r4) -/* 8039690C 0039386C 90 8D AE 44 */ stw r4, lbl_805A9A04@sda21(r13) +/* 8039690C 0039386C 90 8D AE 44 */ stw r4, seqActiveRoot@sda21(r13) /* 80396910 00393870 98 04 00 08 */ stb r0, 8(r4) /* 80396914 00393874 48 00 00 24 */ b lbl_80396938 lbl_80396918: @@ -2087,7 +2105,7 @@ lbl_80396938: /* 8039693C 0039389C A3 DF 00 0C */ lhz r30, 0xc(r31) /* 80396940 003938A0 8B 9F 00 18 */ lbz r28, 0x18(r31) /* 80396944 003938A4 54 E4 00 7E */ clrlwi r4, r7, 1 -/* 80396948 003938A8 80 6D AE 44 */ lwz r3, lbl_805A9A04@sda21(r13) +/* 80396948 003938A8 80 6D AE 44 */ lwz r3, seqActiveRoot@sda21(r13) /* 8039694C 003938AC 48 00 00 20 */ b lbl_8039696C lbl_80396950: /* 80396950 003938B0 80 03 00 0C */ lwz r0, 0xc(r3) @@ -2101,7 +2119,7 @@ lbl_80396968: lbl_8039696C: /* 8039696C 003938CC 28 03 00 00 */ cmplwi r3, 0 /* 80396970 003938D0 40 82 FF E0 */ bne lbl_80396950 -/* 80396974 003938D4 80 6D AE 40 */ lwz r3, lbl_805A9A00@sda21(r13) +/* 80396974 003938D4 80 6D AE 40 */ lwz r3, seqPausedRoot@sda21(r13) /* 80396978 003938D8 48 00 00 20 */ b lbl_80396998 lbl_8039697C: /* 8039697C 003938DC 80 03 00 0C */ lwz r0, 0xc(r3) @@ -2167,7 +2185,7 @@ lbl_80396A40: /* 80396A50 003939B0 80 BF 00 20 */ lwz r5, 0x20(r31) /* 80396A54 003939B4 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 80396A58 003939B8 54 67 00 7E */ clrlwi r7, r3, 1 -/* 80396A5C 003939BC 80 CD AE 44 */ lwz r6, lbl_805A9A04@sda21(r13) +/* 80396A5C 003939BC 80 CD AE 44 */ lwz r6, seqActiveRoot@sda21(r13) /* 80396A60 003939C0 48 00 00 20 */ b lbl_80396A80 lbl_80396A64: /* 80396A64 003939C4 80 06 00 0C */ lwz r0, 0xc(r6) @@ -2181,7 +2199,7 @@ lbl_80396A7C: lbl_80396A80: /* 80396A80 003939E0 28 06 00 00 */ cmplwi r6, 0 /* 80396A84 003939E4 40 82 FF E0 */ bne lbl_80396A64 -/* 80396A88 003939E8 80 CD AE 40 */ lwz r6, lbl_805A9A00@sda21(r13) +/* 80396A88 003939E8 80 CD AE 40 */ lwz r6, seqPausedRoot@sda21(r13) /* 80396A8C 003939EC 48 00 00 20 */ b lbl_80396AAC lbl_80396A90: /* 80396A90 003939F0 80 06 00 0C */ lwz r0, 0xc(r6) @@ -2226,7 +2244,7 @@ lbl_80396B10: /* 80396B18 00393A78 41 82 01 3C */ beq lbl_80396C54 /* 80396B1C 00393A7C 80 7F 00 08 */ lwz r3, 8(r31) /* 80396B20 00393A80 A0 BF 00 24 */ lhz r5, 0x24(r31) -/* 80396B24 00393A84 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 80396B24 00393A84 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 80396B28 00393A88 54 66 00 7E */ clrlwi r6, r3, 1 /* 80396B2C 00393A8C 48 00 00 20 */ b lbl_80396B4C lbl_80396B30: @@ -2241,7 +2259,7 @@ lbl_80396B48: lbl_80396B4C: /* 80396B4C 00393AAC 28 04 00 00 */ cmplwi r4, 0 /* 80396B50 00393AB0 40 82 FF E0 */ bne lbl_80396B30 -/* 80396B54 00393AB4 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396B54 00393AB4 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396B58 00393AB8 48 00 00 20 */ b lbl_80396B78 lbl_80396B5C: /* 80396B5C 00393ABC 80 04 00 0C */ lwz r0, 0xc(r4) @@ -2371,7 +2389,7 @@ lbl_80396CCC: /* 80396D1C 00393C7C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 80396D20 00393C80 41 82 01 10 */ beq lbl_80396E30 /* 80396D24 00393C84 80 7D 00 00 */ lwz r3, 0(r29) -/* 80396D28 00393C88 80 8D AE 44 */ lwz r4, lbl_805A9A04@sda21(r13) +/* 80396D28 00393C88 80 8D AE 44 */ lwz r4, seqActiveRoot@sda21(r13) /* 80396D2C 00393C8C 54 65 00 7E */ clrlwi r5, r3, 1 /* 80396D30 00393C90 48 00 00 20 */ b lbl_80396D50 lbl_80396D34: @@ -2386,7 +2404,7 @@ lbl_80396D4C: lbl_80396D50: /* 80396D50 00393CB0 28 04 00 00 */ cmplwi r4, 0 /* 80396D54 00393CB4 40 82 FF E0 */ bne lbl_80396D34 -/* 80396D58 00393CB8 80 8D AE 40 */ lwz r4, lbl_805A9A00@sda21(r13) +/* 80396D58 00393CB8 80 8D AE 40 */ lwz r4, seqPausedRoot@sda21(r13) /* 80396D5C 00393CBC 48 00 00 20 */ b lbl_80396D7C lbl_80396D60: /* 80396D60 00393CC0 80 04 00 0C */ lwz r0, 0xc(r4) @@ -2457,7 +2475,7 @@ lbl_80396E30: .global GenerateNextTrackEvent GenerateNextTrackEvent: /* 80396E48 00393DA8 54 64 1D 78 */ rlwinm r4, r3, 3, 0x15, 0x1c -/* 80396E4C 00393DAC 80 ED AE 38 */ lwz r7, lbl_805A99F8@sda21(r13) +/* 80396E4C 00393DAC 80 ED AE 38 */ lwz r7, cseq@sda21(r13) /* 80396E50 00393DB0 38 84 01 24 */ addi r4, r4, 0x124 /* 80396E54 00393DB4 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80396E58 00393DB8 7C 87 22 14 */ add r4, r7, r4 @@ -2487,7 +2505,7 @@ lbl_80396E94: lbl_80396EB4: /* 80396EB4 00393E14 28 00 FF FE */ cmplwi r0, 0xfffe /* 80396EB8 00393E18 40 82 00 8C */ bne lbl_80396F44 -/* 80396EBC 00393E1C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80396EBC 00393E1C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80396EC0 00393E20 80 E3 14 E4 */ lwz r7, 0x14e4(r3) /* 80396EC4 00393E24 28 07 00 00 */ cmplwi r7, 0 /* 80396EC8 00393E28 40 82 00 20 */ bne lbl_80396EE8 @@ -2630,7 +2648,7 @@ lbl_80397098: lbl_803970A8: /* 803970A8 00394008 80 7F 00 0C */ lwz r3, 0xc(r31) /* 803970AC 0039400C 39 20 00 00 */ li r9, 0 -/* 803970B0 00394010 81 0D AE 38 */ lwz r8, lbl_805A99F8@sda21(r13) +/* 803970B0 00394010 81 0D AE 38 */ lwz r8, cseq@sda21(r13) /* 803970B4 00394014 A0 83 00 08 */ lhz r4, 8(r3) /* 803970B8 00394018 81 48 01 18 */ lwz r10, 0x118(r8) /* 803970BC 0039401C 88 DF 00 15 */ lbz r6, 0x15(r31) @@ -2651,7 +2669,7 @@ lbl_803970A8: /* 803970F8 00394058 81 05 00 04 */ lwz r8, 4(r5) /* 803970FC 0039405C 28 08 00 00 */ cmplwi r8, 0 /* 80397100 00394060 41 82 00 BC */ beq lbl_803971BC -/* 80397104 00394064 80 CD AE 38 */ lwz r6, lbl_805A99F8@sda21(r13) +/* 80397104 00394064 80 CD AE 38 */ lwz r6, cseq@sda21(r13) /* 80397108 00394068 80 C6 01 18 */ lwz r6, 0x118(r6) /* 8039710C 0039406C 7D 68 32 14 */ add r11, r8, r6 /* 80397110 00394070 89 4B 00 00 */ lbz r10, 0(r11) @@ -2714,7 +2732,7 @@ lbl_803971C8: /* 803971D0 00394130 80 C5 00 08 */ lwz r6, 8(r5) /* 803971D4 00394134 28 06 00 00 */ cmplwi r6, 0 /* 803971D8 00394138 41 82 00 BC */ beq lbl_80397294 -/* 803971DC 0039413C 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 803971DC 0039413C 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 803971E0 00394140 80 A5 01 18 */ lwz r5, 0x118(r5) /* 803971E4 00394144 7C E6 2A 14 */ add r7, r6, r5 /* 803971E8 00394148 88 C7 00 00 */ lbz r6, 0(r7) @@ -2773,7 +2791,7 @@ lbl_80397294: lbl_803972A0: /* 803972A0 00394200 38 00 00 00 */ li r0, 0 /* 803972A4 00394204 B0 04 00 20 */ sth r0, 0x20(r4) -/* 803972A8 00394208 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 803972A8 00394208 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 803972AC 0039420C 88 1F 00 15 */ lbz r0, 0x15(r31) /* 803972B0 00394210 80 C5 01 18 */ lwz r6, 0x118(r5) /* 803972B4 00394214 80 A6 00 08 */ lwz r5, 8(r6) @@ -2783,7 +2801,7 @@ lbl_803972A0: /* 803972C4 00394224 89 23 00 04 */ lbz r9, 4(r3) /* 803972C8 00394228 28 09 00 FF */ cmplwi r9, 0xff /* 803972CC 0039422C 41 82 00 CC */ beq lbl_80397398 -/* 803972D0 00394230 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803972D0 00394230 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803972D4 00394234 3C A0 80 55 */ lis r5, lbl_8054FD10@ha /* 803972D8 00394238 89 04 00 28 */ lbz r8, 0x28(r4) /* 803972DC 0039423C 3C E0 00 01 */ lis r7, 0x0000FFFF@ha @@ -2794,7 +2812,7 @@ lbl_803972A0: /* 803972F0 00394250 7C A0 32 14 */ add r5, r0, r6 /* 803972F4 00394254 55 00 0D FC */ rlwinm r0, r8, 1, 0x17, 0x1e /* 803972F8 00394258 7C E5 03 2E */ sthx r7, r5, r0 -/* 803972FC 0039425C 80 ED AE 38 */ lwz r7, lbl_805A99F8@sda21(r13) +/* 803972FC 0039425C 80 ED AE 38 */ lwz r7, cseq@sda21(r13) /* 80397300 00394260 41 82 00 50 */ beq lbl_80397350 /* 80397304 00394264 7C A7 4A 14 */ add r5, r7, r9 /* 80397308 00394268 88 05 00 14 */ lbz r0, 0x14(r5) @@ -2838,7 +2856,7 @@ lbl_80397398: /* 80397398 003942F8 88 C3 00 05 */ lbz r6, 5(r3) /* 8039739C 003942FC 28 06 00 FF */ cmplwi r6, 0xff /* 803973A0 00394300 41 82 07 34 */ beq lbl_80397AD4 -/* 803973A4 00394304 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803973A4 00394304 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803973A8 00394308 38 60 00 07 */ li r3, 7 /* 803973AC 0039430C 88 84 00 28 */ lbz r4, 0x28(r4) /* 803973B0 00394310 54 05 06 3E */ clrlwi r5, r0, 0x18 @@ -2859,7 +2877,7 @@ lbl_803973BC: /* 803973E8 00394348 40 80 00 08 */ bge lbl_803973F0 /* 803973EC 0039434C 48 00 00 EC */ b lbl_803974D8 lbl_803973F0: -/* 803973F0 00394350 80 8D AE 30 */ lwz r4, lbl_805A99F0@sda21(r13) +/* 803973F0 00394350 80 8D AE 30 */ lwz r4, curSeqId@sda21(r13) /* 803973F4 00394354 3C 60 80 55 */ lis r3, lbl_8054FD10@ha /* 803973F8 00394358 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 803973FC 0039435C 28 09 00 09 */ cmplwi r9, 9 @@ -2868,7 +2886,7 @@ lbl_803973F0: /* 80397408 00394368 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l /* 8039740C 0039436C 55 23 0D FC */ rlwinm r3, r9, 1, 0x17, 0x1e /* 80397410 00394370 7C 84 2A 14 */ add r4, r4, r5 -/* 80397414 00394374 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 80397414 00394374 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 80397418 00394378 7C C4 1B 2E */ sthx r6, r4, r3 /* 8039741C 0039437C 54 00 06 7E */ clrlwi r0, r0, 0x19 /* 80397420 00394380 41 82 00 50 */ beq lbl_80397470 @@ -2912,7 +2930,7 @@ lbl_80397470: /* 803974B4 00394414 98 04 0E 73 */ stb r0, 0xe73(r4) /* 803974B8 00394418 48 00 06 1C */ b lbl_80397AD4 lbl_803974BC: -/* 803974BC 0039441C 80 AD AE 30 */ lwz r5, lbl_805A99F0@sda21(r13) +/* 803974BC 0039441C 80 AD AE 30 */ lwz r5, curSeqId@sda21(r13) /* 803974C0 00394420 54 06 06 7E */ clrlwi r6, r0, 0x19 /* 803974C4 00394424 7D 24 4B 78 */ mr r4, r9 /* 803974C8 00394428 38 60 00 82 */ li r3, 0x82 @@ -2933,7 +2951,7 @@ lbl_803974D8: /* 80397500 00394460 7C 84 28 2E */ lwzx r4, r4, r5 /* 80397504 00394464 7C 89 03 A6 */ mtctr r4 /* 80397508 00394468 4E 80 04 20 */ bctr -/* 8039750C 0039446C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039750C 0039446C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397510 00394470 88 03 0E E0 */ lbz r0, 0xee0(r3) /* 80397514 00394474 28 00 00 00 */ cmplwi r0, 0 /* 80397518 00394478 41 82 05 BC */ beq lbl_80397AD4 @@ -2941,11 +2959,11 @@ lbl_803974D8: /* 80397520 00394480 38 63 0E B4 */ addi r3, r3, 0xeb4 /* 80397524 00394484 38 A0 00 01 */ li r5, 1 /* 80397528 00394488 4B FF ED C9 */ bl seqCrossFade -/* 8039752C 0039448C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039752C 0039448C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397530 00394490 38 00 00 00 */ li r0, 0 /* 80397534 00394494 98 03 0E E0 */ stb r0, 0xee0(r3) /* 80397538 00394498 48 00 05 9C */ b lbl_80397AD4 -/* 8039753C 0039449C 80 8D AE 30 */ lwz r4, lbl_805A99F0@sda21(r13) +/* 8039753C 0039449C 80 8D AE 30 */ lwz r4, curSeqId@sda21(r13) /* 80397540 003944A0 3C 60 80 55 */ lis r3, lbl_8054FD10@ha /* 80397544 003944A4 38 63 FD 10 */ addi r3, r3, lbl_8054FD10@l /* 80397548 003944A8 54 05 06 7E */ clrlwi r5, r0, 0x19 @@ -2954,7 +2972,7 @@ lbl_803974D8: /* 80397554 003944B4 7C 63 22 14 */ add r3, r3, r4 /* 80397558 003944B8 7C A3 03 2E */ sthx r5, r3, r0 /* 8039755C 003944BC 48 00 05 78 */ b lbl_80397AD4 -/* 80397560 003944C0 80 8D AE 30 */ lwz r4, lbl_805A99F0@sda21(r13) +/* 80397560 003944C0 80 8D AE 30 */ lwz r4, curSeqId@sda21(r13) /* 80397564 003944C4 54 05 06 7E */ clrlwi r5, r0, 0x19 /* 80397568 003944C8 3C 60 80 55 */ lis r3, lbl_8054FD10@ha /* 8039756C 003944CC 55 20 0D FC */ rlwinm r0, r9, 1, 0x17, 0x1e @@ -2964,7 +2982,7 @@ lbl_803974D8: /* 8039757C 003944DC 7C 63 22 14 */ add r3, r3, r4 /* 80397580 003944E0 7C A3 03 2E */ sthx r5, r3, r0 /* 80397584 003944E4 48 00 05 50 */ b lbl_80397AD4 -/* 80397588 003944E8 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80397588 003944E8 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 8039758C 003944EC 7D 23 4B 78 */ mr r3, r9 /* 80397590 003944F0 38 A0 00 00 */ li r5, 0 /* 80397594 003944F4 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -2973,7 +2991,7 @@ lbl_803974D8: /* 803975A0 00394500 3B A0 00 00 */ li r29, 0 /* 803975A4 00394504 7F BE EB 78 */ mr r30, r29 lbl_803975A8: -/* 803975A8 00394508 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803975A8 00394508 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803975AC 0039450C 38 1E 0E 64 */ addi r0, r30, 0xe64 /* 803975B0 00394510 7F 63 00 2E */ lwzx r27, r3, r0 /* 803975B4 00394514 48 00 00 68 */ b lbl_8039761C @@ -2982,27 +3000,27 @@ lbl_803975B8: /* 803975BC 0039451C 80 7B 00 08 */ lwz r3, 8(r27) /* 803975C0 00394520 48 00 3D A1 */ bl synthSendKeyOff /* 803975C4 00394524 80 9B 00 00 */ lwz r4, 0(r27) -/* 803975C8 00394528 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803975C8 00394528 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803975CC 0039452C 28 04 00 00 */ cmplwi r4, 0 /* 803975D0 00394530 38 03 0E 64 */ addi r0, r3, 0xe64 /* 803975D4 00394534 7C 9E 01 2E */ stwx r4, r30, r0 /* 803975D8 00394538 41 82 00 18 */ beq lbl_803975F0 -/* 803975DC 0039453C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803975DC 0039453C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803975E0 00394540 38 80 00 00 */ li r4, 0 /* 803975E4 00394544 38 03 0E 64 */ addi r0, r3, 0xe64 /* 803975E8 00394548 7C 7E 00 2E */ lwzx r3, r30, r0 /* 803975EC 0039454C 90 83 00 04 */ stw r4, 4(r3) lbl_803975F0: -/* 803975F0 00394550 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803975F0 00394550 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803975F4 00394554 80 03 0E 6C */ lwz r0, 0xe6c(r3) /* 803975F8 00394558 28 00 00 00 */ cmplwi r0, 0 /* 803975FC 0039455C 90 1B 00 00 */ stw r0, 0(r27) /* 80397600 00394560 41 82 00 10 */ beq lbl_80397610 -/* 80397604 00394564 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397604 00394564 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397608 00394568 80 63 0E 6C */ lwz r3, 0xe6c(r3) /* 8039760C 0039456C 93 63 00 04 */ stw r27, 4(r3) lbl_80397610: -/* 80397610 00394570 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397610 00394570 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397614 00394574 93 63 0E 6C */ stw r27, 0xe6c(r3) /* 80397618 00394578 7F 9B E3 78 */ mr r27, r28 lbl_8039761C: @@ -3014,7 +3032,7 @@ lbl_8039761C: /* 80397630 00394590 41 80 FF 78 */ blt lbl_803975A8 /* 80397634 00394594 48 00 04 A0 */ b lbl_80397AD4 lbl_80397638: -/* 80397638 00394598 80 AD AE 30 */ lwz r5, lbl_805A99F0@sda21(r13) +/* 80397638 00394598 80 AD AE 30 */ lwz r5, curSeqId@sda21(r13) /* 8039763C 0039459C 54 06 06 7E */ clrlwi r6, r0, 0x19 /* 80397640 003945A0 7D 24 4B 78 */ mr r4, r9 /* 80397644 003945A4 54 A5 06 3E */ clrlwi r5, r5, 0x18 @@ -3023,7 +3041,7 @@ lbl_80397638: lbl_80397650: /* 80397650 003945B0 88 7F 00 15 */ lbz r3, 0x15(r31) /* 80397654 003945B4 38 C0 00 01 */ li r6, 1 -/* 80397658 003945B8 81 4D AE 38 */ lwz r10, lbl_805A99F8@sda21(r13) +/* 80397658 003945B8 81 4D AE 38 */ lwz r10, cseq@sda21(r13) /* 8039765C 003945BC 54 68 EE FA */ rlwinm r8, r3, 0x1d, 0x1b, 0x1d /* 80397660 003945C0 54 63 06 FE */ clrlwi r3, r3, 0x1b /* 80397664 003945C4 7D 0A 42 14 */ add r8, r10, r8 @@ -3059,7 +3077,7 @@ lbl_803976D0: /* 803976D0 00394630 7C A8 FE 70 */ srawi r8, r5, 0x1f /* 803976D4 00394634 7C A5 40 78 */ andc r5, r5, r8 lbl_803976D8: -/* 803976D8 00394638 83 CD AE 34 */ lwz r30, lbl_805A99F4@sda21(r13) +/* 803976D8 00394638 83 CD AE 34 */ lwz r30, noteFree@sda21(r13) /* 803976DC 0039463C 81 1F 00 08 */ lwz r8, 8(r31) /* 803976E0 00394640 A0 E7 00 04 */ lhz r7, 4(r7) /* 803976E4 00394644 28 1E 00 00 */ cmplwi r30, 0 @@ -3067,7 +3085,7 @@ lbl_803976D8: /* 803976EC 0039464C 41 82 00 DC */ beq lbl_803977C8 /* 803976F0 00394650 81 1E 00 00 */ lwz r8, 0(r30) /* 803976F4 00394654 28 08 00 00 */ cmplwi r8, 0 -/* 803976F8 00394658 91 0D AE 34 */ stw r8, lbl_805A99F4@sda21(r13) +/* 803976F8 00394658 91 0D AE 34 */ stw r8, noteFree@sda21(r13) /* 803976FC 0039465C 41 82 00 0C */ beq lbl_80397708 /* 80397700 00394660 38 E0 00 00 */ li r7, 0 /* 80397704 00394664 90 E8 00 04 */ stw r7, 4(r8) @@ -3077,12 +3095,12 @@ lbl_80397708: /* 80397710 00394670 1C E7 00 38 */ mulli r7, r7, 0x38 /* 80397714 00394674 39 40 00 00 */ li r10, 0 /* 80397718 00394678 98 9E 00 10 */ stb r4, 0x10(r30) -/* 8039771C 0039467C 81 0D AE 38 */ lwz r8, lbl_805A99F8@sda21(r13) +/* 8039771C 0039467C 81 0D AE 38 */ lwz r8, cseq@sda21(r13) /* 80397720 00394680 7C E8 3A 14 */ add r7, r8, r7 /* 80397724 00394684 88 E7 15 18 */ lbz r7, 0x1518(r7) /* 80397728 00394688 98 FE 00 11 */ stb r7, 0x11(r30) /* 8039772C 0039468C 88 FE 00 11 */ lbz r7, 0x11(r30) -/* 80397730 00394690 81 0D AE 38 */ lwz r8, lbl_805A99F8@sda21(r13) +/* 80397730 00394690 81 0D AE 38 */ lwz r8, cseq@sda21(r13) /* 80397734 00394694 54 E7 10 3A */ slwi r7, r7, 2 /* 80397738 00394698 7C E8 3A 14 */ add r7, r8, r7 /* 8039773C 0039469C 81 67 0E 64 */ lwz r11, 0xe64(r7) @@ -3100,7 +3118,7 @@ lbl_80397744: /* 80397768 003946C8 48 00 00 18 */ b lbl_80397780 lbl_8039776C: /* 8039776C 003946CC 88 FE 00 11 */ lbz r7, 0x11(r30) -/* 80397770 003946D0 81 0D AE 38 */ lwz r8, lbl_805A99F8@sda21(r13) +/* 80397770 003946D0 81 0D AE 38 */ lwz r8, cseq@sda21(r13) /* 80397774 003946D4 54 E7 10 3A */ slwi r7, r7, 2 /* 80397778 003946D8 7C E8 3A 14 */ add r7, r8, r7 /* 8039777C 003946DC 93 C7 0E 64 */ stw r30, 0xe64(r7) @@ -3120,7 +3138,7 @@ lbl_80397790: /* 803977A8 00394708 48 00 00 18 */ b lbl_803977C0 lbl_803977AC: /* 803977AC 0039470C 88 FE 00 11 */ lbz r7, 0x11(r30) -/* 803977B0 00394710 81 0D AE 38 */ lwz r8, lbl_805A99F8@sda21(r13) +/* 803977B0 00394710 81 0D AE 38 */ lwz r8, cseq@sda21(r13) /* 803977B4 00394714 54 E7 10 3A */ slwi r7, r7, 2 /* 803977B8 00394718 7C E8 3A 14 */ add r7, r8, r7 /* 803977BC 0039471C 93 C7 0E 64 */ stw r30, 0xe64(r7) @@ -3130,13 +3148,13 @@ lbl_803977C0: lbl_803977C8: /* 803977C8 00394728 28 1E 00 00 */ cmplwi r30, 0 /* 803977CC 0039472C 41 82 03 08 */ beq lbl_80397AD4 -/* 803977D0 00394730 83 8D AE 38 */ lwz r28, lbl_805A99F8@sda21(r13) +/* 803977D0 00394730 83 8D AE 38 */ lwz r28, cseq@sda21(r13) /* 803977D4 00394734 3C E0 80 55 */ lis r7, lbl_80550AA4@ha /* 803977D8 00394738 8B 5F 00 15 */ lbz r26, 0x15(r31) /* 803977DC 0039473C 39 00 00 00 */ li r8, 0 /* 803977E0 00394740 8B 7C 0E E1 */ lbz r27, 0xee1(r28) /* 803977E4 00394744 39 67 0A A4 */ addi r11, r7, lbl_80550AA4@l -/* 803977E8 00394748 89 4D AE 2C */ lbz r10, lbl_805A99EC@sda21(r13) +/* 803977E8 00394748 89 4D AE 2C */ lbz r10, curFadeOutState@sda21(r13) /* 803977EC 0039474C 7F BC D2 14 */ add r29, r28, r26 /* 803977F0 00394750 57 6C 0D FC */ rlwinm r12, r27, 1, 0x17, 0x1e /* 803977F4 00394754 90 81 00 08 */ stw r4, 8(r1) @@ -3156,7 +3174,7 @@ lbl_803977C8: /* 8039782C 0039478C 93 61 00 1C */ stw r27, 0x1c(r1) /* 80397830 00394790 7C 0B 60 AE */ lbzx r0, r11, r12 /* 80397834 00394794 90 01 00 20 */ stw r0, 0x20(r1) -/* 80397838 00394798 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80397838 00394798 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 8039783C 0039479C 88 8A 0E 72 */ lbz r4, 0xe72(r10) /* 80397840 003947A0 88 AA 0E 73 */ lbz r5, 0xe73(r10) /* 80397844 003947A4 54 0A 06 3E */ clrlwi r10, r0, 0x18 @@ -3179,22 +3197,22 @@ lbl_80397870: /* 80397884 003947E4 48 00 00 1C */ b lbl_803978A0 lbl_80397888: /* 80397888 003947E8 88 1E 00 11 */ lbz r0, 0x11(r30) -/* 8039788C 003947EC 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039788C 003947EC 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397890 003947F0 54 00 10 3A */ slwi r0, r0, 2 /* 80397894 003947F4 80 9E 00 00 */ lwz r4, 0(r30) /* 80397898 003947F8 7C 63 02 14 */ add r3, r3, r0 /* 8039789C 003947FC 90 83 0E 64 */ stw r4, 0xe64(r3) lbl_803978A0: -/* 803978A0 00394800 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 803978A0 00394800 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 803978A4 00394804 28 00 00 00 */ cmplwi r0, 0 /* 803978A8 00394808 90 1E 00 00 */ stw r0, 0(r30) /* 803978AC 0039480C 41 82 00 0C */ beq lbl_803978B8 -/* 803978B0 00394810 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 803978B0 00394810 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 803978B4 00394814 93 C3 00 04 */ stw r30, 4(r3) lbl_803978B8: /* 803978B8 00394818 38 00 00 00 */ li r0, 0 /* 803978BC 0039481C 90 1E 00 04 */ stw r0, 4(r30) -/* 803978C0 00394820 93 CD AE 34 */ stw r30, lbl_805A99F4@sda21(r13) +/* 803978C0 00394820 93 CD AE 34 */ stw r30, noteFree@sda21(r13) /* 803978C4 00394824 48 00 02 10 */ b lbl_80397AD4 lbl_803978C8: /* 803978C8 00394828 80 BF 00 10 */ lwz r5, 0x10(r31) @@ -3261,7 +3279,7 @@ lbl_8039799C: /* 803979A0 00394900 38 03 FF FF */ addi r0, r3, 0x7FFFFFFF@l /* 803979A4 00394904 90 05 00 18 */ stw r0, 0x18(r5) lbl_803979A8: -/* 803979A8 00394908 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803979A8 00394908 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803979AC 0039490C 38 60 00 80 */ li r3, 0x80 /* 803979B0 00394910 88 85 00 28 */ lbz r4, 0x28(r5) /* 803979B4 00394914 A0 C5 00 14 */ lhz r6, 0x14(r5) @@ -3333,7 +3351,7 @@ lbl_80397A98: /* 80397A9C 003949FC 38 03 FF FF */ addi r0, r3, 0x7FFFFFFF@l /* 80397AA0 00394A00 90 05 00 24 */ stw r0, 0x24(r5) lbl_80397AA4: -/* 80397AA4 00394A04 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80397AA4 00394A04 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 80397AA8 00394A08 38 60 00 01 */ li r3, 1 /* 80397AAC 00394A0C 88 85 00 28 */ lbz r4, 0x28(r5) /* 80397AB0 00394A10 A0 C5 00 20 */ lhz r6, 0x20(r5) @@ -3363,7 +3381,7 @@ InitTrackEvents: /* 80397AF8 00394A58 7C 08 02 A6 */ mflr r0 /* 80397AFC 00394A5C 90 01 00 14 */ stw r0, 0x14(r1) /* 80397B00 00394A60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80397B04 00394A64 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397B04 00394A64 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397B08 00394A68 80 03 14 E4 */ lwz r0, 0x14e4(r3) /* 80397B0C 00394A6C 28 00 00 00 */ cmplwi r0, 0 /* 80397B10 00394A70 40 82 00 9C */ bne lbl_80397BAC @@ -3373,7 +3391,7 @@ lbl_80397B18: /* 80397B1C 00394A7C 4B FF F3 2D */ bl GenerateNextTrackEvent /* 80397B20 00394A80 28 03 00 00 */ cmplwi r3, 0 /* 80397B24 00394A84 41 82 00 78 */ beq lbl_80397B9C -/* 80397B28 00394A88 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 80397B28 00394A88 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 80397B2C 00394A8C 38 C0 00 00 */ li r6, 0 /* 80397B30 00394A90 80 E5 15 04 */ lwz r7, 0x1504(r5) /* 80397B34 00394A94 48 00 00 40 */ b lbl_80397B74 @@ -3421,7 +3439,7 @@ lbl_80397BB0: /* 80397BB4 00394B14 4B FF F2 95 */ bl GenerateNextTrackEvent /* 80397BB8 00394B18 28 03 00 00 */ cmplwi r3, 0 /* 80397BBC 00394B1C 41 82 00 8C */ beq lbl_80397C48 -/* 80397BC0 00394B20 80 CD AE 38 */ lwz r6, lbl_805A99F8@sda21(r13) +/* 80397BC0 00394B20 80 CD AE 38 */ lwz r6, cseq@sda21(r13) /* 80397BC4 00394B24 38 A0 00 00 */ li r5, 0 /* 80397BC8 00394B28 80 86 14 E4 */ lwz r4, 0x14e4(r6) /* 80397BCC 00394B2C 7C 04 F8 AE */ lbzx r0, r4, r31 @@ -3485,7 +3503,7 @@ HandleTrackEvents: /* 80397C84 00394BE4 7C 7A 1B 78 */ mr r26, r3 /* 80397C88 00394BE8 38 00 00 00 */ li r0, 0 /* 80397C8C 00394BEC 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80397C90 00394BF0 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397C90 00394BF0 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397C94 00394BF4 1F A5 00 38 */ mulli r29, r5, 0x38 /* 80397C98 00394BF8 90 01 00 08 */ stw r0, 8(r1) /* 80397C9C 00394BFC 7C 9B 23 78 */ mr r27, r4 @@ -3517,7 +3535,7 @@ lbl_80397CF0: /* 80397CF8 00394C58 88 1C 00 30 */ lbz r0, 0x30(r28) /* 80397CFC 00394C5C 68 00 00 01 */ xori r0, r0, 1 /* 80397D00 00394C60 98 1C 00 30 */ stb r0, 0x30(r28) -/* 80397D04 00394C64 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397D04 00394C64 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397D08 00394C68 88 1C 00 30 */ lbz r0, 0x30(r28) /* 80397D0C 00394C6C 80 83 01 18 */ lwz r4, 0x118(r3) /* 80397D10 00394C70 54 03 18 38 */ slwi r3, r0, 3 @@ -3533,14 +3551,14 @@ lbl_80397CF0: /* 80397D38 00394C98 38 03 00 20 */ addi r0, r3, 0x20 /* 80397D3C 00394C9C 7C 7C 20 2E */ lwzx r3, r28, r4 /* 80397D40 00394CA0 7C 7C 01 2E */ stwx r3, r28, r0 -/* 80397D44 00394CA4 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80397D44 00394CA4 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80397D48 00394CA8 7C 7D 02 14 */ add r3, r29, r0 /* 80397D4C 00394CAC 80 03 14 E8 */ lwz r0, 0x14e8(r3) /* 80397D50 00394CB0 28 00 00 00 */ cmplwi r0, 0 /* 80397D54 00394CB4 41 82 01 6C */ beq lbl_80397EC0 /* 80397D58 00394CB8 90 03 14 EC */ stw r0, 0x14ec(r3) /* 80397D5C 00394CBC 3B FD 14 E8 */ addi r31, r29, 0x14e8 -/* 80397D60 00394CC0 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80397D60 00394CC0 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80397D64 00394CC4 7F E0 FA 14 */ add r31, r0, r31 /* 80397D68 00394CC8 80 1F 00 00 */ lwz r0, 0(r31) /* 80397D6C 00394CCC 28 00 00 00 */ cmplwi r0, 0 @@ -3554,7 +3572,7 @@ lbl_80397D78: /* 80397D88 00394CE8 7C 1F 00 2E */ lwzx r0, r31, r0 /* 80397D8C 00394CEC 7C 04 00 40 */ cmplw r4, r0 /* 80397D90 00394CF0 41 81 00 7C */ bgt lbl_80397E0C -/* 80397D94 00394CF4 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397D94 00394CF4 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397D98 00394CF8 80 63 01 18 */ lwz r3, 0x118(r3) /* 80397D9C 00394CFC 80 03 00 10 */ lwz r0, 0x10(r3) /* 80397DA0 00394D00 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 @@ -3563,12 +3581,12 @@ lbl_80397D78: /* 80397DAC 00394D0C 7F 45 D3 78 */ mr r5, r26 /* 80397DB0 00394D10 90 1F 00 08 */ stw r0, 8(r31) /* 80397DB4 00394D14 54 03 B2 BE */ srwi r3, r0, 0xa -/* 80397DB8 00394D18 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80397DB8 00394D18 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 80397DBC 00394D1C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80397DC0 00394D20 48 00 0E E1 */ bl synthSetBpm /* 80397DC4 00394D24 48 00 00 28 */ b lbl_80397DEC lbl_80397DC8: -/* 80397DC8 00394D28 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80397DC8 00394D28 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 80397DCC 00394D2C 7F 45 D3 78 */ mr r5, r26 /* 80397DD0 00394D30 80 66 00 04 */ lwz r3, 4(r6) /* 80397DD4 00394D34 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -3588,7 +3606,7 @@ lbl_80397DF8: /* 80397E04 00394D64 28 00 FF FF */ cmplwi r0, 0xffff /* 80397E08 00394D68 40 82 FF 70 */ bne lbl_80397D78 lbl_80397E0C: -/* 80397E0C 00394D6C 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80397E0C 00394D6C 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80397E10 00394D70 3C 60 43 30 */ lis r3, 0x4330 /* 80397E14 00394D74 3B FD 14 E8 */ addi r31, r29, 0x14e8 /* 80397E18 00394D78 90 61 00 10 */ stw r3, 0x10(r1) @@ -3637,7 +3655,7 @@ lbl_80397EC0: /* 80397EC0 00394E20 A0 7C 00 34 */ lhz r3, 0x34(r28) /* 80397EC4 00394E24 38 03 00 01 */ addi r0, r3, 1 /* 80397EC8 00394E28 B0 1C 00 34 */ sth r0, 0x34(r28) -/* 80397ECC 00394E2C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397ECC 00394E2C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397ED0 00394E30 80 03 14 E4 */ lwz r0, 0x14e4(r3) /* 80397ED4 00394E34 28 00 00 00 */ cmplwi r0, 0 /* 80397ED8 00394E38 40 82 00 9C */ bne lbl_80397F74 @@ -3647,7 +3665,7 @@ lbl_80397EE0: /* 80397EE4 00394E44 4B FF EF 65 */ bl GenerateNextTrackEvent /* 80397EE8 00394E48 28 03 00 00 */ cmplwi r3, 0 /* 80397EEC 00394E4C 41 82 00 78 */ beq lbl_80397F64 -/* 80397EF0 00394E50 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 80397EF0 00394E50 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 80397EF4 00394E54 38 C0 00 00 */ li r6, 0 /* 80397EF8 00394E58 80 E5 15 04 */ lwz r7, 0x1504(r5) /* 80397EFC 00394E5C 48 00 00 40 */ b lbl_80397F3C @@ -3692,7 +3710,7 @@ lbl_80397F74: /* 80397F74 00394ED4 3B 20 00 00 */ li r25, 0 /* 80397F78 00394ED8 57 5F 06 3E */ clrlwi r31, r26, 0x18 lbl_80397F7C: -/* 80397F7C 00394EDC 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80397F7C 00394EDC 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80397F80 00394EE0 80 63 14 E4 */ lwz r3, 0x14e4(r3) /* 80397F84 00394EE4 7C 03 C8 AE */ lbzx r0, r3, r25 /* 80397F88 00394EE8 7C 1F 00 40 */ cmplw r31, r0 @@ -3701,7 +3719,7 @@ lbl_80397F7C: /* 80397F94 00394EF4 4B FF EE B5 */ bl GenerateNextTrackEvent /* 80397F98 00394EF8 28 03 00 00 */ cmplwi r3, 0 /* 80397F9C 00394EFC 41 82 00 80 */ beq lbl_8039801C -/* 80397FA0 00394F00 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80397FA0 00394F00 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80397FA4 00394F04 38 FD 14 E8 */ addi r7, r29, 0x14e8 /* 80397FA8 00394F08 38 A0 00 00 */ li r5, 0 /* 80397FAC 00394F0C 7C E0 3A 14 */ add r7, r0, r7 @@ -3830,17 +3848,17 @@ sub_80398104: /* 8039813C 0039509C 4B FF 19 35 */ bl _savegpr_24 /* 80398140 003950A0 7C 7C 1B 79 */ or. r28, r3, r3 /* 80398144 003950A4 41 82 09 74 */ beq lbl_80398AB8 -/* 80398148 003950A8 83 CD AE 44 */ lwz r30, lbl_805A9A04@sda21(r13) +/* 80398148 003950A8 83 CD AE 44 */ lwz r30, seqActiveRoot@sda21(r13) /* 8039814C 003950AC 48 00 09 64 */ b lbl_80398AB0 lbl_80398150: /* 80398150 003950B0 83 BE 00 00 */ lwz r29, 0(r30) -/* 80398154 003950B4 93 CD AE 38 */ stw r30, lbl_805A99F8@sda21(r13) +/* 80398154 003950B4 93 CD AE 38 */ stw r30, cseq@sda21(r13) /* 80398158 003950B8 88 1E 00 09 */ lbz r0, 9(r30) -/* 8039815C 003950BC 90 0D AE 30 */ stw r0, lbl_805A99F0@sda21(r13) +/* 8039815C 003950BC 90 0D AE 30 */ stw r0, curSeqId@sda21(r13) /* 80398160 003950C0 88 7E 0E B0 */ lbz r3, 0xeb0(r30) /* 80398164 003950C4 48 00 37 B5 */ bl synthIsFadeOutActive -/* 80398168 003950C8 98 6D AE 2C */ stb r3, lbl_805A99EC@sda21(r13) -/* 8039816C 003950CC 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398168 003950C8 98 6D AE 2C */ stb r3, curFadeOutState@sda21(r13) +/* 8039816C 003950CC 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398170 003950D0 80 03 14 E4 */ lwz r0, 0x14e4(r3) /* 80398174 003950D4 28 00 00 00 */ cmplwi r0, 0 /* 80398178 003950D8 40 82 03 9C */ bne lbl_80398514 @@ -3857,7 +3875,7 @@ lbl_80398190: /* 803981A0 00395100 7C 1F 00 2E */ lwzx r0, r31, r0 /* 803981A4 00395104 7C 04 00 40 */ cmplw r4, r0 /* 803981A8 00395108 41 81 00 7C */ bgt lbl_80398224 -/* 803981AC 0039510C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803981AC 0039510C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803981B0 00395110 80 63 01 18 */ lwz r3, 0x118(r3) /* 803981B4 00395114 80 03 00 10 */ lwz r0, 0x10(r3) /* 803981B8 00395118 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 @@ -3866,12 +3884,12 @@ lbl_80398190: /* 803981C4 00395124 38 A0 00 00 */ li r5, 0 /* 803981C8 00395128 90 1F 00 08 */ stw r0, 8(r31) /* 803981CC 0039512C 54 03 B2 BE */ srwi r3, r0, 0xa -/* 803981D0 00395130 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803981D0 00395130 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803981D4 00395134 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 803981D8 00395138 48 00 0A C9 */ bl synthSetBpm /* 803981DC 0039513C 48 00 00 28 */ b lbl_80398204 lbl_803981E0: -/* 803981E0 00395140 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803981E0 00395140 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803981E4 00395144 38 A0 00 00 */ li r5, 0 /* 803981E8 00395148 80 66 00 04 */ lwz r3, 4(r6) /* 803981EC 0039514C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -3891,7 +3909,7 @@ lbl_80398210: /* 8039821C 0039517C 28 00 FF FF */ cmplwi r0, 0xffff /* 80398220 00395180 40 82 FF 70 */ bne lbl_80398190 lbl_80398224: -/* 80398224 00395184 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 80398224 00395184 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 80398228 00395188 3C 60 43 30 */ lis r3, 0x4330 /* 8039822C 0039518C 90 61 00 08 */ stw r3, 8(r1) /* 80398230 00395190 3B 04 14 E8 */ addi r24, r4, 0x14e8 @@ -3943,7 +3961,7 @@ lbl_80398224: /* 803982E8 00395248 7F 79 DB 78 */ mr r25, r27 /* 803982EC 0039524C 7F 78 DB 78 */ mr r24, r27 lbl_803982F0: -/* 803982F0 00395250 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803982F0 00395250 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803982F4 00395254 38 19 0E 64 */ addi r0, r25, 0xe64 /* 803982F8 00395258 7F 43 00 2E */ lwzx r26, r3, r0 /* 803982FC 0039525C 28 1A 00 00 */ cmplwi r26, 0 @@ -3953,36 +3971,36 @@ lbl_80398308: /* 80398308 00395268 80 7A 00 08 */ lwz r3, 8(r26) /* 8039830C 0039526C 48 00 30 55 */ bl synthSendKeyOff /* 80398310 00395270 80 9A 00 00 */ lwz r4, 0(r26) -/* 80398314 00395274 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398314 00395274 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398318 00395278 28 04 00 00 */ cmplwi r4, 0 /* 8039831C 0039527C 38 03 0E 64 */ addi r0, r3, 0xe64 /* 80398320 00395280 7C 99 01 2E */ stwx r4, r25, r0 /* 80398324 00395284 41 82 00 18 */ beq lbl_8039833C -/* 80398328 00395288 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398328 00395288 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 8039832C 0039528C 38 80 00 00 */ li r4, 0 /* 80398330 00395290 38 03 0E 64 */ addi r0, r3, 0xe64 /* 80398334 00395294 7C 79 00 2E */ lwzx r3, r25, r0 /* 80398338 00395298 90 83 00 04 */ stw r4, 4(r3) lbl_8039833C: -/* 8039833C 0039529C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039833C 0039529C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398340 003952A0 80 03 0E 6C */ lwz r0, 0xe6c(r3) /* 80398344 003952A4 28 00 00 00 */ cmplwi r0, 0 /* 80398348 003952A8 90 1A 00 00 */ stw r0, 0(r26) /* 8039834C 003952AC 41 82 00 10 */ beq lbl_8039835C -/* 80398350 003952B0 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398350 003952B0 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398354 003952B4 80 63 0E 6C */ lwz r3, 0xe6c(r3) /* 80398358 003952B8 93 43 00 04 */ stw r26, 4(r3) lbl_8039835C: -/* 8039835C 003952BC 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039835C 003952BC 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398360 003952C0 93 43 0E 6C */ stw r26, 0xe6c(r3) -/* 80398364 003952C4 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398364 003952C4 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398368 003952C8 38 03 0E 64 */ addi r0, r3, 0xe64 /* 8039836C 003952CC 7F 59 00 2E */ lwzx r26, r25, r0 /* 80398370 003952D0 28 1A 00 00 */ cmplwi r26, 0 /* 80398374 003952D4 41 82 00 28 */ beq lbl_8039839C lbl_80398378: /* 80398378 003952D8 88 1A 00 10 */ lbz r0, 0x10(r26) -/* 8039837C 003952DC 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039837C 003952DC 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398380 003952E0 1C 00 00 38 */ mulli r0, r0, 0x38 /* 80398384 003952E4 80 9A 00 0C */ lwz r4, 0xc(r26) /* 80398388 003952E8 7C 63 02 14 */ add r3, r3, r0 @@ -3996,7 +4014,7 @@ lbl_8039839C: /* 803983A4 00395304 28 1B 00 02 */ cmplwi r27, 2 /* 803983A8 00395308 3B 39 00 04 */ addi r25, r25, 4 /* 803983AC 0039530C 41 80 FF 44 */ blt lbl_803982F0 -/* 803983B0 00395310 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 803983B0 00395310 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 803983B4 00395314 38 60 00 00 */ li r3, 0 /* 803983B8 00395318 80 04 0E 64 */ lwz r0, 0xe64(r4) /* 803983BC 0039531C 28 00 00 00 */ cmplwi r0, 0 @@ -4037,26 +4055,26 @@ lbl_80398424: /* 80398438 00395398 48 00 00 10 */ b lbl_80398448 lbl_8039843C: /* 8039843C 0039539C 80 1A 00 00 */ lwz r0, 0(r26) -/* 80398440 003953A0 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398440 003953A0 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398444 003953A4 90 03 0E 6C */ stw r0, 0xe6c(r3) lbl_80398448: -/* 80398448 003953A8 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80398448 003953A8 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 8039844C 003953AC 28 00 00 00 */ cmplwi r0, 0 /* 80398450 003953B0 90 1A 00 00 */ stw r0, 0(r26) /* 80398454 003953B4 41 82 00 0C */ beq lbl_80398460 -/* 80398458 003953B8 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80398458 003953B8 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 8039845C 003953BC 93 43 00 04 */ stw r26, 4(r3) lbl_80398460: /* 80398460 003953C0 38 00 00 00 */ li r0, 0 /* 80398464 003953C4 90 1A 00 04 */ stw r0, 4(r26) -/* 80398468 003953C8 93 4D AE 34 */ stw r26, lbl_805A99F4@sda21(r13) +/* 80398468 003953C8 93 4D AE 34 */ stw r26, noteFree@sda21(r13) lbl_8039846C: /* 8039846C 003953CC 7F 3A CB 78 */ mr r26, r25 lbl_80398470: /* 80398470 003953D0 28 1A 00 00 */ cmplwi r26, 0 /* 80398474 003953D4 40 82 FF 78 */ bne lbl_803983EC lbl_80398478: -/* 80398478 003953D8 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 80398478 003953D8 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 8039847C 003953DC 3C 60 66 66 */ lis r3, 0x66666667@ha /* 80398480 003953E0 38 03 66 67 */ addi r0, r3, 0x66666667@l /* 80398484 003953E4 88 65 0E E2 */ lbz r3, 0xee2(r5) @@ -4068,27 +4086,27 @@ lbl_80398478: /* 8039849C 003953FC 1C 00 00 05 */ mulli r0, r0, 5 /* 803984A0 00395400 7C 00 20 50 */ subf r0, r0, r4 /* 803984A4 00395404 98 05 0E E2 */ stb r0, 0xee2(r5) -/* 803984A8 00395408 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 803984A8 00395408 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 803984AC 0039540C 80 64 15 08 */ lwz r3, 0x1508(r4) /* 803984B0 00395410 80 04 14 F4 */ lwz r0, 0x14f4(r4) /* 803984B4 00395414 7C 63 02 14 */ add r3, r3, r0 /* 803984B8 00395418 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 803984BC 0039541C 90 04 15 08 */ stw r0, 0x1508(r4) /* 803984C0 00395420 54 63 84 3E */ srwi r3, r3, 0x10 -/* 803984C4 00395424 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 803984C4 00395424 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 803984C8 00395428 80 85 15 0C */ lwz r4, 0x150c(r5) /* 803984CC 0039542C 80 05 14 F8 */ lwz r0, 0x14f8(r5) /* 803984D0 00395430 7C 00 22 14 */ add r0, r0, r4 /* 803984D4 00395434 7C 03 02 14 */ add r0, r3, r0 /* 803984D8 00395438 90 05 15 0C */ stw r0, 0x150c(r5) -/* 803984DC 0039543C 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 803984DC 0039543C 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 803984E0 00395440 80 64 15 10 */ lwz r3, 0x1510(r4) /* 803984E4 00395444 80 04 14 FC */ lwz r0, 0x14fc(r4) /* 803984E8 00395448 7C 63 02 14 */ add r3, r3, r0 /* 803984EC 0039544C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 803984F0 00395450 90 04 15 10 */ stw r0, 0x1510(r4) /* 803984F4 00395454 54 63 84 3E */ srwi r3, r3, 0x10 -/* 803984F8 00395458 80 AD AE 38 */ lwz r5, lbl_805A99F8@sda21(r13) +/* 803984F8 00395458 80 AD AE 38 */ lwz r5, cseq@sda21(r13) /* 803984FC 0039545C 80 85 15 14 */ lwz r4, 0x1514(r5) /* 80398500 00395460 80 05 15 00 */ lwz r0, 0x1500(r5) /* 80398504 00395464 7C 00 22 14 */ add r0, r0, r4 @@ -4106,7 +4124,7 @@ lbl_80398514: /* 80398530 00395490 3F 60 43 30 */ lis r27, 0x4330 lbl_80398534: /* 80398534 00395494 57 20 06 3E */ clrlwi r0, r25, 0x18 -/* 80398538 00395498 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 80398538 00395498 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 8039853C 0039549C 1C 60 00 38 */ mulli r3, r0, 0x38 /* 80398540 003954A0 3B 43 14 E8 */ addi r26, r3, 0x14e8 /* 80398544 003954A4 7F 44 D2 14 */ add r26, r4, r26 @@ -4122,7 +4140,7 @@ lbl_80398558: /* 80398568 003954C8 7C 1A 00 2E */ lwzx r0, r26, r0 /* 8039856C 003954CC 7C 04 00 40 */ cmplw r4, r0 /* 80398570 003954D0 41 81 00 7C */ bgt lbl_803985EC -/* 80398574 003954D4 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398574 003954D4 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398578 003954D8 80 63 01 18 */ lwz r3, 0x118(r3) /* 8039857C 003954DC 80 03 00 10 */ lwz r0, 0x10(r3) /* 80398580 003954E0 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 @@ -4131,12 +4149,12 @@ lbl_80398558: /* 8039858C 003954EC 57 25 06 3E */ clrlwi r5, r25, 0x18 /* 80398590 003954F0 90 1A 00 08 */ stw r0, 8(r26) /* 80398594 003954F4 54 03 B2 BE */ srwi r3, r0, 0xa -/* 80398598 003954F8 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 80398598 003954F8 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 8039859C 003954FC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 803985A0 00395500 48 00 07 01 */ bl synthSetBpm /* 803985A4 00395504 48 00 00 28 */ b lbl_803985CC lbl_803985A8: -/* 803985A8 00395508 80 0D AE 30 */ lwz r0, lbl_805A99F0@sda21(r13) +/* 803985A8 00395508 80 0D AE 30 */ lwz r0, curSeqId@sda21(r13) /* 803985AC 0039550C 57 25 06 3E */ clrlwi r5, r25, 0x18 /* 803985B0 00395510 80 66 00 04 */ lwz r3, 4(r6) /* 803985B4 00395514 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -4156,7 +4174,7 @@ lbl_803985D8: /* 803985E4 00395544 28 00 FF FF */ cmplwi r0, 0xffff /* 803985E8 00395548 40 82 FF 70 */ bne lbl_80398558 lbl_803985EC: -/* 803985EC 0039554C 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 803985EC 0039554C 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 803985F0 00395550 3B 58 14 E8 */ addi r26, r24, 0x14e8 /* 803985F4 00395554 93 61 00 20 */ stw r27, 0x20(r1) /* 803985F8 00395558 7F 40 D2 14 */ add r26, r0, r26 @@ -4208,7 +4226,7 @@ lbl_803985EC: /* 803986B0 00395610 7F 58 D3 78 */ mr r24, r26 /* 803986B4 00395614 7F 59 D3 78 */ mr r25, r26 lbl_803986B8: -/* 803986B8 00395618 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803986B8 00395618 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803986BC 0039561C 38 18 0E 64 */ addi r0, r24, 0xe64 /* 803986C0 00395620 7F 63 00 2E */ lwzx r27, r3, r0 /* 803986C4 00395624 28 1B 00 00 */ cmplwi r27, 0 @@ -4218,36 +4236,36 @@ lbl_803986D0: /* 803986D0 00395630 80 7B 00 08 */ lwz r3, 8(r27) /* 803986D4 00395634 48 00 2C 8D */ bl synthSendKeyOff /* 803986D8 00395638 80 9B 00 00 */ lwz r4, 0(r27) -/* 803986DC 0039563C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803986DC 0039563C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803986E0 00395640 28 04 00 00 */ cmplwi r4, 0 /* 803986E4 00395644 38 03 0E 64 */ addi r0, r3, 0xe64 /* 803986E8 00395648 7C 98 01 2E */ stwx r4, r24, r0 /* 803986EC 0039564C 41 82 00 18 */ beq lbl_80398704 -/* 803986F0 00395650 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 803986F0 00395650 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 803986F4 00395654 38 80 00 00 */ li r4, 0 /* 803986F8 00395658 38 03 0E 64 */ addi r0, r3, 0xe64 /* 803986FC 0039565C 7C 78 00 2E */ lwzx r3, r24, r0 /* 80398700 00395660 90 83 00 04 */ stw r4, 4(r3) lbl_80398704: -/* 80398704 00395664 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398704 00395664 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398708 00395668 80 03 0E 6C */ lwz r0, 0xe6c(r3) /* 8039870C 0039566C 28 00 00 00 */ cmplwi r0, 0 /* 80398710 00395670 90 1B 00 00 */ stw r0, 0(r27) /* 80398714 00395674 41 82 00 10 */ beq lbl_80398724 -/* 80398718 00395678 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398718 00395678 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 8039871C 0039567C 80 63 0E 6C */ lwz r3, 0xe6c(r3) /* 80398720 00395680 93 63 00 04 */ stw r27, 4(r3) lbl_80398724: -/* 80398724 00395684 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398724 00395684 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398728 00395688 93 63 0E 6C */ stw r27, 0xe6c(r3) -/* 8039872C 0039568C 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 8039872C 0039568C 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398730 00395690 38 03 0E 64 */ addi r0, r3, 0xe64 /* 80398734 00395694 7F 78 00 2E */ lwzx r27, r24, r0 /* 80398738 00395698 28 1B 00 00 */ cmplwi r27, 0 /* 8039873C 0039569C 41 82 00 28 */ beq lbl_80398764 lbl_80398740: /* 80398740 003956A0 88 1B 00 10 */ lbz r0, 0x10(r27) -/* 80398744 003956A4 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398744 003956A4 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 80398748 003956A8 1C 00 00 38 */ mulli r0, r0, 0x38 /* 8039874C 003956AC 80 9B 00 0C */ lwz r4, 0xc(r27) /* 80398750 003956B0 7C 63 02 14 */ add r3, r3, r0 @@ -4261,7 +4279,7 @@ lbl_80398764: /* 8039876C 003956CC 28 1A 00 02 */ cmplwi r26, 2 /* 80398770 003956D0 3B 18 00 04 */ addi r24, r24, 4 /* 80398774 003956D4 41 80 FF 44 */ blt lbl_803986B8 -/* 80398778 003956D8 80 8D AE 38 */ lwz r4, lbl_805A99F8@sda21(r13) +/* 80398778 003956D8 80 8D AE 38 */ lwz r4, cseq@sda21(r13) /* 8039877C 003956DC 38 60 00 00 */ li r3, 0 /* 80398780 003956E0 80 04 0E 64 */ lwz r0, 0xe64(r4) /* 80398784 003956E4 28 00 00 00 */ cmplwi r0, 0 @@ -4302,26 +4320,26 @@ lbl_803987EC: /* 80398800 00395760 48 00 00 10 */ b lbl_80398810 lbl_80398804: /* 80398804 00395764 80 1A 00 00 */ lwz r0, 0(r26) -/* 80398808 00395768 80 6D AE 38 */ lwz r3, lbl_805A99F8@sda21(r13) +/* 80398808 00395768 80 6D AE 38 */ lwz r3, cseq@sda21(r13) /* 8039880C 0039576C 90 03 0E 6C */ stw r0, 0xe6c(r3) lbl_80398810: -/* 80398810 00395770 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80398810 00395770 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80398814 00395774 28 00 00 00 */ cmplwi r0, 0 /* 80398818 00395778 90 1A 00 00 */ stw r0, 0(r26) /* 8039881C 0039577C 41 82 00 0C */ beq lbl_80398828 -/* 80398820 00395780 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80398820 00395780 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80398824 00395784 93 43 00 04 */ stw r26, 4(r3) lbl_80398828: /* 80398828 00395788 38 00 00 00 */ li r0, 0 /* 8039882C 0039578C 90 1A 00 04 */ stw r0, 4(r26) -/* 80398830 00395790 93 4D AE 34 */ stw r26, lbl_805A99F4@sda21(r13) +/* 80398830 00395790 93 4D AE 34 */ stw r26, noteFree@sda21(r13) lbl_80398834: /* 80398834 00395794 7F 3A CB 78 */ mr r26, r25 lbl_80398838: /* 80398838 00395798 28 1A 00 00 */ cmplwi r26, 0 /* 8039883C 0039579C 40 82 FF 78 */ bne lbl_803987B4 lbl_80398840: -/* 80398840 003957A0 80 ED AE 38 */ lwz r7, lbl_805A99F8@sda21(r13) +/* 80398840 003957A0 80 ED AE 38 */ lwz r7, cseq@sda21(r13) /* 80398844 003957A4 3C 80 66 66 */ lis r4, 0x66666667@ha /* 80398848 003957A8 38 84 66 67 */ addi r4, r4, 0x66666667@l /* 8039884C 003957AC 38 00 00 08 */ li r0, 8 @@ -4337,7 +4355,7 @@ lbl_80398840: /* 80398874 003957D4 98 87 0E E2 */ stb r4, 0xee2(r7) /* 80398878 003957D8 7C 09 03 A6 */ mtctr r0 lbl_8039887C: -/* 8039887C 003957DC 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 8039887C 003957DC 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80398880 003957E0 7C A0 1A 14 */ add r5, r0, r3 /* 80398884 003957E4 80 85 15 08 */ lwz r4, 0x1508(r5) /* 80398888 003957E8 80 05 14 F4 */ lwz r0, 0x14f4(r5) @@ -4345,14 +4363,14 @@ lbl_8039887C: /* 80398890 003957F0 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 80398894 003957F4 90 05 15 08 */ stw r0, 0x1508(r5) /* 80398898 003957F8 54 84 84 3E */ srwi r4, r4, 0x10 -/* 8039889C 003957FC 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 8039889C 003957FC 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 803988A0 00395800 7C C0 1A 14 */ add r6, r0, r3 /* 803988A4 00395804 80 A6 15 0C */ lwz r5, 0x150c(r6) /* 803988A8 00395808 80 06 14 F8 */ lwz r0, 0x14f8(r6) /* 803988AC 0039580C 7C 00 2A 14 */ add r0, r0, r5 /* 803988B0 00395810 7C 04 02 14 */ add r0, r4, r0 /* 803988B4 00395814 90 06 15 0C */ stw r0, 0x150c(r6) -/* 803988B8 00395818 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 803988B8 00395818 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 803988BC 0039581C 7C A0 1A 14 */ add r5, r0, r3 /* 803988C0 00395820 80 85 15 10 */ lwz r4, 0x1510(r5) /* 803988C4 00395824 80 05 14 FC */ lwz r0, 0x14fc(r5) @@ -4360,7 +4378,7 @@ lbl_8039887C: /* 803988CC 0039582C 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 803988D0 00395830 90 05 15 10 */ stw r0, 0x1510(r5) /* 803988D4 00395834 54 84 84 3E */ srwi r4, r4, 0x10 -/* 803988D8 00395838 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 803988D8 00395838 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 803988DC 0039583C 7C C0 1A 14 */ add r6, r0, r3 /* 803988E0 00395840 38 63 00 38 */ addi r3, r3, 0x38 /* 803988E4 00395844 80 A6 15 14 */ lwz r5, 0x1514(r6) @@ -4368,7 +4386,7 @@ lbl_8039887C: /* 803988EC 0039584C 7C 00 2A 14 */ add r0, r0, r5 /* 803988F0 00395850 7C 04 02 14 */ add r0, r4, r0 /* 803988F4 00395854 90 06 15 14 */ stw r0, 0x1514(r6) -/* 803988F8 00395858 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 803988F8 00395858 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 803988FC 0039585C 7C A0 1A 14 */ add r5, r0, r3 /* 80398900 00395860 80 85 15 08 */ lwz r4, 0x1508(r5) /* 80398904 00395864 80 05 14 F4 */ lwz r0, 0x14f4(r5) @@ -4376,14 +4394,14 @@ lbl_8039887C: /* 8039890C 0039586C 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 80398910 00395870 90 05 15 08 */ stw r0, 0x1508(r5) /* 80398914 00395874 54 84 84 3E */ srwi r4, r4, 0x10 -/* 80398918 00395878 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80398918 00395878 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 8039891C 0039587C 7C C0 1A 14 */ add r6, r0, r3 /* 80398920 00395880 80 A6 15 0C */ lwz r5, 0x150c(r6) /* 80398924 00395884 80 06 14 F8 */ lwz r0, 0x14f8(r6) /* 80398928 00395888 7C 00 2A 14 */ add r0, r0, r5 /* 8039892C 0039588C 7C 04 02 14 */ add r0, r4, r0 /* 80398930 00395890 90 06 15 0C */ stw r0, 0x150c(r6) -/* 80398934 00395894 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80398934 00395894 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80398938 00395898 7C A0 1A 14 */ add r5, r0, r3 /* 8039893C 0039589C 80 85 15 10 */ lwz r4, 0x1510(r5) /* 80398940 003958A0 80 05 14 FC */ lwz r0, 0x14fc(r5) @@ -4391,7 +4409,7 @@ lbl_8039887C: /* 80398948 003958A8 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 8039894C 003958AC 90 05 15 10 */ stw r0, 0x1510(r5) /* 80398950 003958B0 54 84 84 3E */ srwi r4, r4, 0x10 -/* 80398954 003958B4 80 0D AE 38 */ lwz r0, lbl_805A99F8@sda21(r13) +/* 80398954 003958B4 80 0D AE 38 */ lwz r0, cseq@sda21(r13) /* 80398958 003958B8 7C C0 1A 14 */ add r6, r0, r3 /* 8039895C 003958BC 38 63 00 38 */ addi r3, r3, 0x38 /* 80398960 003958C0 80 A6 15 14 */ lwz r5, 0x1514(r6) @@ -4411,7 +4429,7 @@ lbl_80398978: /* 80398994 003958F4 93 A3 00 00 */ stw r29, 0(r3) /* 80398998 003958F8 48 00 00 08 */ b lbl_803989A0 lbl_8039899C: -/* 8039899C 003958FC 93 AD AE 44 */ stw r29, lbl_805A9A04@sda21(r13) +/* 8039899C 003958FC 93 AD AE 44 */ stw r29, seqActiveRoot@sda21(r13) lbl_803989A0: /* 803989A0 00395900 28 1D 00 00 */ cmplwi r29, 0 /* 803989A4 00395904 41 82 00 0C */ beq lbl_803989B0 @@ -4429,15 +4447,15 @@ lbl_803989C8: /* 803989C8 00395928 80 05 00 00 */ lwz r0, 0(r5) /* 803989CC 0039592C 28 00 00 00 */ cmplwi r0, 0 /* 803989D0 00395930 40 82 FF F4 */ bne lbl_803989C4 -/* 803989D4 00395934 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 803989D4 00395934 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 803989D8 00395938 28 00 00 00 */ cmplwi r0, 0 /* 803989DC 0039593C 41 82 00 10 */ beq lbl_803989EC /* 803989E0 00395940 90 05 00 00 */ stw r0, 0(r5) -/* 803989E4 00395944 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 803989E4 00395944 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 803989E8 00395948 90 A3 00 04 */ stw r5, 4(r3) lbl_803989EC: /* 803989EC 0039594C 80 1E 0E 64 */ lwz r0, 0xe64(r30) -/* 803989F0 00395950 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 803989F0 00395950 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 803989F4 00395954 90 9E 0E 64 */ stw r4, 0xe64(r30) lbl_803989F8: /* 803989F8 00395958 80 BE 0E 68 */ lwz r5, 0xe68(r30) @@ -4450,15 +4468,15 @@ lbl_80398A0C: /* 80398A0C 0039596C 80 05 00 00 */ lwz r0, 0(r5) /* 80398A10 00395970 28 00 00 00 */ cmplwi r0, 0 /* 80398A14 00395974 40 82 FF F4 */ bne lbl_80398A08 -/* 80398A18 00395978 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80398A18 00395978 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80398A1C 0039597C 28 00 00 00 */ cmplwi r0, 0 /* 80398A20 00395980 41 82 00 10 */ beq lbl_80398A30 /* 80398A24 00395984 90 05 00 00 */ stw r0, 0(r5) -/* 80398A28 00395988 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80398A28 00395988 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80398A2C 0039598C 90 A3 00 04 */ stw r5, 4(r3) lbl_80398A30: /* 80398A30 00395990 80 1E 0E 68 */ lwz r0, 0xe68(r30) -/* 80398A34 00395994 90 0D AE 34 */ stw r0, lbl_805A99F4@sda21(r13) +/* 80398A34 00395994 90 0D AE 34 */ stw r0, noteFree@sda21(r13) /* 80398A38 00395998 90 9E 0E 68 */ stw r4, 0xe68(r30) lbl_80398A3C: /* 80398A3C 0039599C 80 9E 0E 6C */ lwz r4, 0xe6c(r30) @@ -4471,29 +4489,29 @@ lbl_80398A50: /* 80398A50 003959B0 80 04 00 00 */ lwz r0, 0(r4) /* 80398A54 003959B4 28 00 00 00 */ cmplwi r0, 0 /* 80398A58 003959B8 40 82 FF F4 */ bne lbl_80398A4C -/* 80398A5C 003959BC 80 0D AE 34 */ lwz r0, lbl_805A99F4@sda21(r13) +/* 80398A5C 003959BC 80 0D AE 34 */ lwz r0, noteFree@sda21(r13) /* 80398A60 003959C0 28 00 00 00 */ cmplwi r0, 0 /* 80398A64 003959C4 41 82 00 10 */ beq lbl_80398A74 /* 80398A68 003959C8 90 04 00 00 */ stw r0, 0(r4) -/* 80398A6C 003959CC 80 6D AE 34 */ lwz r3, lbl_805A99F4@sda21(r13) +/* 80398A6C 003959CC 80 6D AE 34 */ lwz r3, noteFree@sda21(r13) /* 80398A70 003959D0 90 83 00 04 */ stw r4, 4(r3) lbl_80398A74: /* 80398A74 003959D4 80 7E 0E 6C */ lwz r3, 0xe6c(r30) /* 80398A78 003959D8 38 00 00 00 */ li r0, 0 -/* 80398A7C 003959DC 90 6D AE 34 */ stw r3, lbl_805A99F4@sda21(r13) +/* 80398A7C 003959DC 90 6D AE 34 */ stw r3, noteFree@sda21(r13) /* 80398A80 003959E0 90 1E 0E 6C */ stw r0, 0xe6c(r30) lbl_80398A84: /* 80398A84 003959E4 38 00 00 00 */ li r0, 0 /* 80398A88 003959E8 98 1E 00 08 */ stb r0, 8(r30) /* 80398A8C 003959EC 90 1E 00 04 */ stw r0, 4(r30) -/* 80398A90 003959F0 80 0D AE 3C */ lwz r0, lbl_805A99FC@sda21(r13) +/* 80398A90 003959F0 80 0D AE 3C */ lwz r0, seqFreeRoot@sda21(r13) /* 80398A94 003959F4 28 00 00 00 */ cmplwi r0, 0 /* 80398A98 003959F8 90 1E 00 00 */ stw r0, 0(r30) /* 80398A9C 003959FC 41 82 00 0C */ beq lbl_80398AA8 -/* 80398AA0 00395A00 80 6D AE 3C */ lwz r3, lbl_805A99FC@sda21(r13) +/* 80398AA0 00395A00 80 6D AE 3C */ lwz r3, seqFreeRoot@sda21(r13) /* 80398AA4 00395A04 93 C3 00 04 */ stw r30, 4(r3) lbl_80398AA8: -/* 80398AA8 00395A08 93 CD AE 3C */ stw r30, lbl_805A99FC@sda21(r13) +/* 80398AA8 00395A08 93 CD AE 3C */ stw r30, seqFreeRoot@sda21(r13) lbl_80398AAC: /* 80398AAC 00395A0C 7F BE EB 78 */ mr r30, r29 lbl_80398AB0: @@ -4526,16 +4544,16 @@ seqInit: /* 80398B08 00395A68 38 00 00 08 */ li r0, 8 /* 80398B0C 00395A6C 38 E5 39 D0 */ addi r7, r5, lbl_805439D0@l /* 80398B10 00395A70 39 04 FD 10 */ addi r8, r4, lbl_8054FD10@l -/* 80398B14 00395A74 90 CD AE 44 */ stw r6, lbl_805A9A04@sda21(r13) +/* 80398B14 00395A74 90 CD AE 44 */ stw r6, seqActiveRoot@sda21(r13) /* 80398B18 00395A78 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 80398B1C 00395A7C 39 20 00 00 */ li r9, 0 -/* 80398B20 00395A80 90 CD AE 40 */ stw r6, lbl_805A9A00@sda21(r13) +/* 80398B20 00395A80 90 CD AE 40 */ stw r6, seqPausedRoot@sda21(r13) /* 80398B24 00395A84 7C 09 03 A6 */ mtctr r0 lbl_80398B28: /* 80398B28 00395A88 28 09 00 00 */ cmplwi r9, 0 /* 80398B2C 00395A8C 40 82 00 14 */ bne lbl_80398B40 /* 80398B30 00395A90 38 00 00 00 */ li r0, 0 -/* 80398B34 00395A94 90 ED AE 3C */ stw r7, lbl_805A99FC@sda21(r13) +/* 80398B34 00395A94 90 ED AE 3C */ stw r7, seqFreeRoot@sda21(r13) /* 80398B38 00395A98 90 07 00 04 */ stw r0, 4(r7) /* 80398B3C 00395A9C 48 00 00 20 */ b lbl_80398B5C lbl_80398B40: @@ -4579,7 +4597,7 @@ lbl_80398B5C: /* 80398BD0 00395B30 7C 65 22 14 */ add r3, r5, r4 /* 80398BD4 00395B34 7C C4 33 78 */ mr r4, r6 /* 80398BD8 00395B38 90 C3 E7 98 */ stw r6, -0x1868(r3) -/* 80398BDC 00395B3C 90 ED AE 34 */ stw r7, lbl_805A99F4@sda21(r13) +/* 80398BDC 00395B3C 90 ED AE 34 */ stw r7, noteFree@sda21(r13) /* 80398BE0 00395B40 7C 09 03 A6 */ mtctr r0 lbl_80398BE4: /* 80398BE4 00395B44 28 06 00 00 */ cmplwi r6, 0 @@ -4635,5 +4653,5 @@ lbl_80398C80: /* 80398C8C 00395BEC 42 00 FF 58 */ bdnz lbl_80398BE4 /* 80398C90 00395BF0 38 00 00 00 */ li r0, 0 /* 80398C94 00395BF4 90 06 00 00 */ stw r0, 0(r6) -/* 80398C98 00395BF8 90 0D AE 28 */ stw r0, lbl_805A99E8@sda21(r13) +/* 80398C98 00395BF8 90 0D AE 28 */ stw r0, seq_next_id@sda21(r13) /* 80398C9C 00395BFC 4E 80 00 20 */ blr diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index 4b7c2149..429aeb17 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -1,5 +1,44 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global runListNum +runListNum: + .skip 0x1 +.global startListNumnum +startListNumnum: + .skip 0x1 +.global startGroupNum +startGroupNum: + .skip 0x1 +.global s3dUseMaxVoices +s3dUseMaxVoices: + .skip 0x1 +.global snd_max_studios +snd_max_studios: + .skip 0x1 +.global snd_base_studio +snd_base_studio: + .skip 0x3 +.global snd_used_studios +snd_used_studios: + .skip 0x4 +.global s3dDoorRoot +s3dDoorRoot: + .skip 0x4 +.global s3dRoomRoot +s3dRoomRoot: + .skip 0x4 +.global s3dListenerRoot +s3dListenerRoot: + .skip 0x4 +.global s3dEmitterRoot +s3dEmitterRoot: + .skip 0x4 +.global s3dCallCnt +s3dCallCnt: + .skip 0x4 + .section .text, "ax" .global sub_803ae800 @@ -11,7 +50,7 @@ sub_803ae800: /* 803AE810 003AB770 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 803AE814 003AB774 39 61 00 30 */ addi r11, r1, 0x30 /* 803AE818 003AB778 4B FD B2 61 */ bl _savegpr_26 -/* 803AE81C 003AB77C 80 8D AF 74 */ lwz r4, lbl_805A9B34@sda21(r13) +/* 803AE81C 003AB77C 80 8D AF 74 */ lwz r4, s3dListenerRoot@sda21(r13) /* 803AE820 003AB780 38 60 00 00 */ li r3, 0 /* 803AE824 003AB784 48 00 00 0C */ b lbl_803AE830 lbl_803AE828: @@ -22,14 +61,14 @@ lbl_803AE830: /* 803AE834 003AB794 40 82 FF F4 */ bne lbl_803AE828 /* 803AE838 003AB798 28 03 00 00 */ cmplwi r3, 0 /* 803AE83C 003AB79C 41 82 00 98 */ beq lbl_803AE8D4 -/* 803AE840 003AB7A0 80 8D AF 70 */ lwz r4, lbl_805A9B30@sda21(r13) +/* 803AE840 003AB7A0 80 8D AF 70 */ lwz r4, s3dRoomRoot@sda21(r13) /* 803AE844 003AB7A4 48 00 00 88 */ b lbl_803AE8CC lbl_803AE848: /* 803AE848 003AB7A8 88 04 00 1C */ lbz r0, 0x1c(r4) /* 803AE84C 003AB7AC 28 00 00 FF */ cmplwi r0, 0xff /* 803AE850 003AB7B0 41 82 00 78 */ beq lbl_803AE8C8 /* 803AE854 003AB7B4 C0 82 D6 08 */ lfs f4, lbl_805AF328@sda21(r2) -/* 803AE858 003AB7B8 80 AD AF 74 */ lwz r5, lbl_805A9B34@sda21(r13) +/* 803AE858 003AB7B8 80 AD AF 74 */ lwz r5, s3dListenerRoot@sda21(r13) /* 803AE85C 003AB7BC 48 00 00 44 */ b lbl_803AE8A0 lbl_803AE860: /* 803AE860 003AB7C0 C0 64 00 0C */ lfs f3, 0xc(r4) @@ -65,7 +104,7 @@ lbl_803AE8CC: /* 803AE8CC 003AB82C 28 04 00 00 */ cmplwi r4, 0 /* 803AE8D0 003AB830 40 82 FF 78 */ bne lbl_803AE848 lbl_803AE8D4: -/* 803AE8D4 003AB834 80 6D AF 74 */ lwz r3, lbl_805A9B34@sda21(r13) +/* 803AE8D4 003AB834 80 6D AF 74 */ lwz r3, s3dListenerRoot@sda21(r13) /* 803AE8D8 003AB838 3B A0 00 00 */ li r29, 0 /* 803AE8DC 003AB83C 48 00 00 0C */ b lbl_803AE8E8 lbl_803AE8E0: @@ -76,13 +115,13 @@ lbl_803AE8E8: /* 803AE8EC 003AB84C 40 82 FF F4 */ bne lbl_803AE8E0 /* 803AE8F0 003AB850 28 1D 00 00 */ cmplwi r29, 0 /* 803AE8F4 003AB854 41 82 03 A0 */ beq lbl_803AEC94 -/* 803AE8F8 003AB858 83 CD AF 70 */ lwz r30, lbl_805A9B30@sda21(r13) +/* 803AE8F8 003AB858 83 CD AF 70 */ lwz r30, s3dRoomRoot@sda21(r13) /* 803AE8FC 003AB85C 48 00 03 90 */ b lbl_803AEC8C lbl_803AE900: /* 803AE900 003AB860 88 1E 00 1C */ lbz r0, 0x1c(r30) /* 803AE904 003AB864 28 00 00 FF */ cmplwi r0, 0xff /* 803AE908 003AB868 40 82 02 60 */ bne lbl_803AEB68 -/* 803AE90C 003AB86C 80 6D AF 74 */ lwz r3, lbl_805A9B34@sda21(r13) +/* 803AE90C 003AB86C 80 6D AF 74 */ lwz r3, s3dListenerRoot@sda21(r13) /* 803AE910 003AB870 C3 E2 D6 08 */ lfs f31, lbl_805AF328@sda21(r2) /* 803AE914 003AB874 7C 64 1B 78 */ mr r4, r3 /* 803AE918 003AB878 48 00 00 44 */ b lbl_803AE95C @@ -127,9 +166,9 @@ lbl_803AE9A0: /* 803AE9A0 003AB900 28 03 00 00 */ cmplwi r3, 0 /* 803AE9A4 003AB904 40 82 FF E4 */ bne lbl_803AE988 lbl_803AE9A8: -/* 803AE9A8 003AB908 88 AD AF 64 */ lbz r5, lbl_805A9B24@sda21(r13) +/* 803AE9A8 003AB908 88 AD AF 64 */ lbz r5, snd_max_studios@sda21(r13) /* 803AE9AC 003AB90C 38 00 FF FF */ li r0, -1 -/* 803AE9B0 003AB910 80 8D AF 68 */ lwz r4, lbl_805A9B28@sda21(r13) +/* 803AE9B0 003AB910 80 8D AF 68 */ lwz r4, snd_used_studios@sda21(r13) /* 803AE9B4 003AB914 7C 00 28 30 */ slw r0, r0, r5 /* 803AE9B8 003AB918 7C 03 00 F8 */ nor r3, r0, r0 /* 803AE9BC 003AB91C 7C 60 20 38 */ and r0, r3, r4 @@ -148,17 +187,17 @@ lbl_803AE9DC: /* 803AE9EC 003AB94C 42 00 FF F0 */ bdnz lbl_803AE9DC lbl_803AE9F0: /* 803AE9F0 003AB950 38 00 00 01 */ li r0, 1 -/* 803AE9F4 003AB954 80 8D AF 68 */ lwz r4, lbl_805A9B28@sda21(r13) +/* 803AE9F4 003AB954 80 8D AF 68 */ lwz r4, snd_used_studios@sda21(r13) /* 803AE9F8 003AB958 7C 03 30 30 */ slw r3, r0, r6 -/* 803AE9FC 003AB95C 88 0D AF 65 */ lbz r0, lbl_805A9B25@sda21(r13) +/* 803AE9FC 003AB95C 88 0D AF 65 */ lbz r0, snd_base_studio@sda21(r13) /* 803AEA00 003AB960 7C 83 1B 78 */ or r3, r4, r3 -/* 803AEA04 003AB964 90 6D AF 68 */ stw r3, lbl_805A9B28@sda21(r13) +/* 803AEA04 003AB964 90 6D AF 68 */ stw r3, snd_used_studios@sda21(r13) /* 803AEA08 003AB968 7C 06 02 14 */ add r0, r6, r0 /* 803AEA0C 003AB96C 98 1E 00 1C */ stb r0, 0x1c(r30) /* 803AEA10 003AB970 48 00 00 C0 */ b lbl_803AEAD0 lbl_803AEA14: /* 803AEA14 003AB974 C0 22 D6 18 */ lfs f1, lbl_805AF338@sda21(r2) -/* 803AEA18 003AB978 80 6D AF 70 */ lwz r3, lbl_805A9B30@sda21(r13) +/* 803AEA18 003AB978 80 6D AF 70 */ lwz r3, s3dRoomRoot@sda21(r13) /* 803AEA1C 003AB97C 48 00 00 28 */ b lbl_803AEA44 lbl_803AEA20: /* 803AEA20 003AB980 88 03 00 1C */ lbz r0, 0x1c(r3) @@ -179,7 +218,7 @@ lbl_803AEA44: /* 803AEA54 003AB9B4 FC 01 F8 40 */ fcmpo cr0, f1, f31 /* 803AEA58 003AB9B8 40 81 02 30 */ ble lbl_803AEC88 lbl_803AEA5C: -/* 803AEA5C 003AB9BC 83 4D AF 78 */ lwz r26, lbl_805A9B38@sda21(r13) +/* 803AEA5C 003AB9BC 83 4D AF 78 */ lwz r26, s3dEmitterRoot@sda21(r13) /* 803AEA60 003AB9C0 3B 60 FF FF */ li r27, -1 /* 803AEA64 003AB9C4 48 00 00 2C */ b lbl_803AEA90 lbl_803AEA68: @@ -372,7 +411,7 @@ CalcEmitter: /* 803AED08 003ABC68 D0 05 00 00 */ stfs f0, 0(r5) /* 803AED0C 003ABC6C FF 80 F8 90 */ fmr f28, f31 /* 803AED10 003ABC70 7C DB 33 78 */ mr r27, r6 -/* 803AED14 003ABC74 83 ED AF 74 */ lwz r31, lbl_805A9B34@sda21(r13) +/* 803AED14 003ABC74 83 ED AF 74 */ lwz r31, s3dListenerRoot@sda21(r13) /* 803AED18 003ABC78 7C FC 3B 78 */ mr r28, r7 /* 803AED1C 003ABC7C 7D 1D 43 78 */ mr r29, r8 /* 803AED20 003ABC80 3B C0 00 00 */ li r30, 0 @@ -702,8 +741,8 @@ sndUpdateEmitter: /* 803AF1D4 003AC134 7C 08 02 A6 */ mflr r0 /* 803AF1D8 003AC138 90 01 00 34 */ stw r0, 0x34(r1) /* 803AF1DC 003AC13C 39 61 00 30 */ addi r11, r1, 0x30 -/* 803AF1E0 003AC140 4B FD A8 9D */ bl sub_80389a7c -/* 803AF1E4 003AC144 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF1E0 003AC140 4B FD A8 9D */ bl _savegpr_27 +/* 803AF1E4 003AC144 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF1E8 003AC148 7C 7E 1B 78 */ mr r30, r3 /* 803AF1EC 003AC14C 7C 9B 23 78 */ mr r27, r4 /* 803AF1F0 003AC150 7C BC 2B 78 */ mr r28, r5 @@ -783,7 +822,7 @@ lbl_803AF2E8: .global sndCheckEmitter sndCheckEmitter: -/* 803AF300 003AC260 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF300 003AC260 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF304 003AC264 28 00 00 00 */ cmplwi r0, 0 /* 803AF308 003AC268 41 82 00 10 */ beq lbl_803AF318 /* 803AF30C 003AC26C 80 03 00 10 */ lwz r0, 0x10(r3) @@ -1037,17 +1076,17 @@ lbl_803AF688: /* 803AF68C 003AC5EC 80 7E 00 3C */ lwz r3, 0x3c(r30) /* 803AF690 003AC5F0 48 00 00 58 */ b lbl_803AF6E8 lbl_803AF694: -/* 803AF694 003AC5F4 80 0D AF 78 */ lwz r0, lbl_805A9B38@sda21(r13) +/* 803AF694 003AC5F4 80 0D AF 78 */ lwz r0, s3dEmitterRoot@sda21(r13) /* 803AF698 003AC5F8 28 00 00 00 */ cmplwi r0, 0 /* 803AF69C 003AC5FC 90 1E 00 00 */ stw r0, 0(r30) /* 803AF6A0 003AC600 41 82 00 0C */ beq lbl_803AF6AC -/* 803AF6A4 003AC604 80 6D AF 78 */ lwz r3, lbl_805A9B38@sda21(r13) +/* 803AF6A4 003AC604 80 6D AF 78 */ lwz r3, s3dEmitterRoot@sda21(r13) /* 803AF6A8 003AC608 93 C3 00 04 */ stw r30, 4(r3) lbl_803AF6AC: /* 803AF6AC 003AC60C 38 60 00 00 */ li r3, 0 /* 803AF6B0 003AC610 38 00 FF FF */ li r0, -1 /* 803AF6B4 003AC614 90 7E 00 04 */ stw r3, 4(r30) -/* 803AF6B8 003AC618 93 CD AF 78 */ stw r30, lbl_805A9B38@sda21(r13) +/* 803AF6B8 003AC618 93 CD AF 78 */ stw r30, s3dEmitterRoot@sda21(r13) /* 803AF6BC 003AC61C 93 BE 00 0C */ stw r29, 0xc(r30) /* 803AF6C0 003AC620 90 1E 00 3C */ stw r0, 0x3c(r30) /* 803AF6C4 003AC624 B0 7E 00 48 */ sth r3, 0x48(r30) @@ -1079,7 +1118,7 @@ sndAddEmitterParaEx: /* 803AF71C 003AC67C 7C 08 02 A6 */ mflr r0 /* 803AF720 003AC680 90 01 00 24 */ stw r0, 0x24(r1) /* 803AF724 003AC684 81 81 00 28 */ lwz r12, 0x28(r1) -/* 803AF728 003AC688 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF728 003AC688 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF72C 003AC68C 81 61 00 2C */ lwz r11, 0x2c(r1) /* 803AF730 003AC690 28 00 00 00 */ cmplwi r0, 0 /* 803AF734 003AC694 41 82 00 20 */ beq lbl_803AF754 @@ -1105,7 +1144,7 @@ sndRemoveEmitter: /* 803AF770 003AC6D0 90 01 00 14 */ stw r0, 0x14(r1) /* 803AF774 003AC6D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 803AF778 003AC6D8 7C 7F 1B 78 */ mr r31, r3 -/* 803AF77C 003AC6DC 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF77C 003AC6DC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF780 003AC6E0 28 00 00 00 */ cmplwi r0, 0 /* 803AF784 003AC6E4 41 82 00 74 */ beq lbl_803AF7F8 /* 803AF788 003AC6E8 48 00 59 35 */ bl hwDisableIrq @@ -1126,7 +1165,7 @@ lbl_803AF7AC: /* 803AF7C0 003AC720 48 00 00 0C */ b lbl_803AF7CC lbl_803AF7C4: /* 803AF7C4 003AC724 80 1F 00 00 */ lwz r0, 0(r31) -/* 803AF7C8 003AC728 90 0D AF 78 */ stw r0, lbl_805A9B38@sda21(r13) +/* 803AF7C8 003AC728 90 0D AF 78 */ stw r0, s3dEmitterRoot@sda21(r13) lbl_803AF7CC: /* 803AF7CC 003AC72C 80 1F 00 10 */ lwz r0, 0x10(r31) /* 803AF7D0 003AC730 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -1158,7 +1197,7 @@ sndEmitterVoiceID: /* 803AF820 003AC780 3B E0 FF FF */ li r31, -1 /* 803AF824 003AC784 93 C1 00 08 */ stw r30, 8(r1) /* 803AF828 003AC788 7C 7E 1B 78 */ mr r30, r3 -/* 803AF82C 003AC78C 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF82C 003AC78C 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF830 003AC790 28 00 00 00 */ cmplwi r0, 0 /* 803AF834 003AC794 41 82 00 1C */ beq lbl_803AF850 /* 803AF838 003AC798 48 00 58 85 */ bl hwDisableIrq @@ -1188,7 +1227,7 @@ s3dKillEmitterByFXID: /* 803AF884 003AC7E4 93 A1 00 14 */ stw r29, 0x14(r1) /* 803AF888 003AC7E8 7C 7D 1B 78 */ mr r29, r3 /* 803AF88C 003AC7EC 93 81 00 10 */ stw r28, 0x10(r1) -/* 803AF890 003AC7F0 83 8D AF 78 */ lwz r28, lbl_805A9B38@sda21(r13) +/* 803AF890 003AC7F0 83 8D AF 78 */ lwz r28, s3dEmitterRoot@sda21(r13) /* 803AF894 003AC7F4 48 00 00 AC */ b lbl_803AF940 lbl_803AF898: /* 803AF898 003AC7F8 7F A4 EB 78 */ mr r4, r29 @@ -1201,7 +1240,7 @@ lbl_803AF8AC: /* 803AF8B0 003AC810 A0 04 00 00 */ lhz r0, 0(r4) /* 803AF8B4 003AC814 7C 03 00 40 */ cmplw r3, r0 /* 803AF8B8 003AC818 40 82 00 7C */ bne lbl_803AF934 -/* 803AF8BC 003AC81C 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF8BC 003AC81C 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF8C0 003AC820 28 00 00 00 */ cmplwi r0, 0 /* 803AF8C4 003AC824 41 82 00 78 */ beq lbl_803AF93C /* 803AF8C8 003AC828 48 00 57 F5 */ bl hwDisableIrq @@ -1222,7 +1261,7 @@ lbl_803AF8EC: /* 803AF900 003AC860 48 00 00 0C */ b lbl_803AF90C lbl_803AF904: /* 803AF904 003AC864 80 1C 00 00 */ lwz r0, 0(r28) -/* 803AF908 003AC868 90 0D AF 78 */ stw r0, lbl_805A9B38@sda21(r13) +/* 803AF908 003AC868 90 0D AF 78 */ stw r0, s3dEmitterRoot@sda21(r13) lbl_803AF90C: /* 803AF90C 003AC86C 80 1C 00 10 */ lwz r0, 0x10(r28) /* 803AF910 003AC870 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -1259,7 +1298,7 @@ sndUpdateListener: /* 803AF970 003AC8D0 90 01 00 64 */ stw r0, 0x64(r1) /* 803AF974 003AC8D4 39 61 00 60 */ addi r11, r1, 0x60 /* 803AF978 003AC8D8 4B FD A0 FD */ bl _savegpr_25 -/* 803AF97C 003AC8DC 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AF97C 003AC8DC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AF980 003AC8E0 7C 7E 1B 78 */ mr r30, r3 /* 803AF984 003AC8E4 7C 99 23 78 */ mr r25, r4 /* 803AF988 003AC8E8 7C BA 2B 78 */ mr r26, r5 @@ -1343,7 +1382,7 @@ sndUpdateListener: /* 803AFAC0 003ACA20 41 82 00 84 */ beq lbl_803AFB44 /* 803AFAC4 003ACA24 28 05 00 00 */ cmplwi r5, 0 /* 803AFAC8 003ACA28 41 82 00 4C */ beq lbl_803AFB14 -/* 803AFACC 003ACA2C 80 6D AF 74 */ lwz r3, lbl_805A9B34@sda21(r13) +/* 803AFACC 003ACA2C 80 6D AF 74 */ lwz r3, s3dListenerRoot@sda21(r13) /* 803AFAD0 003ACA30 38 80 00 00 */ li r4, 0 /* 803AFAD4 003ACA34 48 00 00 18 */ b lbl_803AFAEC lbl_803AFAD8: @@ -1404,7 +1443,7 @@ sndAddListener: /* 803AFB8C 003ACAEC F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 803AFB90 003ACAF0 39 61 00 60 */ addi r11, r1, 0x60 /* 803AFB94 003ACAF4 4B FD 9E DD */ bl _savegpr_24 -/* 803AFB98 003ACAF8 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AFB98 003ACAF8 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AFB9C 003ACAFC FF A0 08 90 */ fmr f29, f1 /* 803AFBA0 003ACB00 FF C0 10 90 */ fmr f30, f2 /* 803AFBA4 003ACB04 7C 7B 1B 78 */ mr r27, r3 @@ -1419,11 +1458,11 @@ sndAddListener: /* 803AFBC8 003ACB28 7D 5F 53 78 */ mr r31, r10 /* 803AFBCC 003ACB2C 41 82 01 8C */ beq lbl_803AFD58 /* 803AFBD0 003ACB30 48 00 54 ED */ bl hwDisableIrq -/* 803AFBD4 003ACB34 80 0D AF 74 */ lwz r0, lbl_805A9B34@sda21(r13) +/* 803AFBD4 003ACB34 80 0D AF 74 */ lwz r0, s3dListenerRoot@sda21(r13) /* 803AFBD8 003ACB38 28 00 00 00 */ cmplwi r0, 0 /* 803AFBDC 003ACB3C 90 1B 00 00 */ stw r0, 0(r27) /* 803AFBE0 003ACB40 41 82 00 0C */ beq lbl_803AFBEC -/* 803AFBE4 003ACB44 80 6D AF 74 */ lwz r3, lbl_805A9B34@sda21(r13) +/* 803AFBE4 003ACB44 80 6D AF 74 */ lwz r3, s3dListenerRoot@sda21(r13) /* 803AFBE8 003ACB48 93 63 00 04 */ stw r27, 4(r3) lbl_803AFBEC: /* 803AFBEC 003ACB4C 38 00 00 00 */ li r0, 0 @@ -1432,7 +1471,7 @@ lbl_803AFBEC: /* 803AFBF8 003ACB58 38 7B 00 38 */ addi r3, r27, 0x38 /* 803AFBFC 003ACB5C 38 9B 00 2C */ addi r4, r27, 0x2c /* 803AFC00 003ACB60 38 BB 00 44 */ addi r5, r27, 0x44 -/* 803AFC04 003ACB64 93 6D AF 74 */ stw r27, lbl_805A9B34@sda21(r13) +/* 803AFC04 003ACB64 93 6D AF 74 */ stw r27, s3dListenerRoot@sda21(r13) /* 803AFC08 003ACB68 80 D8 00 00 */ lwz r6, 0(r24) /* 803AFC0C 003ACB6C 80 18 00 04 */ lwz r0, 4(r24) /* 803AFC10 003ACB70 90 DB 00 10 */ stw r6, 0x10(r27) @@ -1541,14 +1580,14 @@ sub_803afd8c: /* 803AFD94 003ACCF4 90 01 00 14 */ stw r0, 0x14(r1) /* 803AFD98 003ACCF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803AFD9C 003ACCFC 7C 7F 1B 78 */ mr r31, r3 -/* 803AFDA0 003ACD00 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803AFDA0 003ACD00 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803AFDA4 003ACD04 28 00 00 00 */ cmplwi r0, 0 /* 803AFDA8 003ACD08 41 82 00 9C */ beq lbl_803AFE44 /* 803AFDAC 003ACD0C 48 00 53 11 */ bl hwDisableIrq /* 803AFDB0 003ACD10 80 BF 00 08 */ lwz r5, 8(r31) /* 803AFDB4 003ACD14 28 05 00 00 */ cmplwi r5, 0 /* 803AFDB8 003ACD18 41 82 00 4C */ beq lbl_803AFE04 -/* 803AFDBC 003ACD1C 80 6D AF 74 */ lwz r3, lbl_805A9B34@sda21(r13) +/* 803AFDBC 003ACD1C 80 6D AF 74 */ lwz r3, s3dListenerRoot@sda21(r13) /* 803AFDC0 003ACD20 38 80 00 00 */ li r4, 0 /* 803AFDC4 003ACD24 48 00 00 18 */ b lbl_803AFDDC lbl_803AFDC8: @@ -1584,7 +1623,7 @@ lbl_803AFE18: /* 803AFE2C 003ACD8C 48 00 00 0C */ b lbl_803AFE38 lbl_803AFE30: /* 803AFE30 003ACD90 80 1F 00 00 */ lwz r0, 0(r31) -/* 803AFE34 003ACD94 90 0D AF 74 */ stw r0, lbl_805A9B34@sda21(r13) +/* 803AFE34 003ACD94 90 0D AF 74 */ stw r0, s3dListenerRoot@sda21(r13) lbl_803AFE38: /* 803AFE38 003ACD98 48 00 52 4D */ bl hwEnableIrq /* 803AFE3C 003ACD9C 38 60 00 01 */ li r3, 1 @@ -1600,7 +1639,7 @@ lbl_803AFE48: .global sub_803afe5c sub_803afe5c: -/* 803AFE5C 003ACDBC 88 CD AF 62 */ lbz r6, lbl_805A9B22@sda21(r13) +/* 803AFE5C 003ACDBC 88 CD AF 62 */ lbz r6, startGroupNum@sda21(r13) /* 803AFE60 003ACDC0 3C 80 80 56 */ lis r4, lbl_8055F990@ha /* 803AFE64 003ACDC4 38 A4 F9 90 */ addi r5, r4, lbl_8055F990@l /* 803AFE68 003ACDC8 39 20 00 00 */ li r9, 0 @@ -1624,7 +1663,7 @@ lbl_803AFE94: /* 803AFEA8 003ACE08 4E 80 00 20 */ blr lbl_803AFEAC: /* 803AFEAC 003ACE0C 3C A0 80 56 */ lis r5, lbl_8055F990@ha -/* 803AFEB0 003ACE10 88 8D AF 62 */ lbz r4, lbl_805A9B22@sda21(r13) +/* 803AFEB0 003ACE10 88 8D AF 62 */ lbz r4, startGroupNum@sda21(r13) /* 803AFEB4 003ACE14 38 C5 F9 90 */ addi r6, r5, lbl_8055F990@l /* 803AFEB8 003ACE18 55 28 20 36 */ slwi r8, r9, 4 /* 803AFEBC 003ACE1C 7C A6 42 14 */ add r5, r6, r8 @@ -1635,9 +1674,9 @@ lbl_803AFEAC: /* 803AFED0 003ACE30 B0 E5 00 0C */ sth r7, 0xc(r5) /* 803AFED4 003ACE34 80 83 00 40 */ lwz r4, 0x40(r3) /* 803AFED8 003ACE38 7C 86 41 2E */ stwx r4, r6, r8 -/* 803AFEDC 003ACE3C 98 0D AF 62 */ stb r0, lbl_805A9B22@sda21(r13) +/* 803AFEDC 003ACE3C 98 0D AF 62 */ stb r0, startGroupNum@sda21(r13) lbl_803AFEE0: -/* 803AFEE0 003ACE40 88 AD AF 61 */ lbz r5, lbl_805A9B21@sda21(r13) +/* 803AFEE0 003ACE40 88 AD AF 61 */ lbz r5, startListNumnum@sda21(r13) /* 803AFEE4 003ACE44 28 05 00 40 */ cmplwi r5, 0x40 /* 803AFEE8 003ACE48 40 82 00 0C */ bne lbl_803AFEF4 /* 803AFEEC 003ACE4C 38 60 00 00 */ li r3, 0 @@ -1678,12 +1717,12 @@ lbl_803AFF54: /* 803AFF64 003ACEC4 90 C4 00 00 */ stw r6, 0(r4) /* 803AFF68 003ACEC8 90 87 00 00 */ stw r4, 0(r7) lbl_803AFF6C: -/* 803AFF6C 003ACECC 88 8D AF 61 */ lbz r4, lbl_805A9B21@sda21(r13) +/* 803AFF6C 003ACECC 88 8D AF 61 */ lbz r4, startListNumnum@sda21(r13) /* 803AFF70 003ACED0 3C A0 80 56 */ lis r5, lbl_80560090@ha /* 803AFF74 003ACED4 38 A5 00 90 */ addi r5, r5, lbl_80560090@l /* 803AFF78 003ACED8 1C C4 00 1C */ mulli r6, r4, 0x1c /* 803AFF7C 003ACEDC 38 04 00 01 */ addi r0, r4, 1 -/* 803AFF80 003ACEE0 98 0D AF 61 */ stb r0, lbl_805A9B21@sda21(r13) +/* 803AFF80 003ACEE0 98 0D AF 61 */ stb r0, startListNumnum@sda21(r13) /* 803AFF84 003ACEE4 7C 85 32 14 */ add r4, r5, r6 /* 803AFF88 003ACEE8 90 64 00 18 */ stw r3, 0x18(r4) /* 803AFF8C 003ACEEC 38 60 00 01 */ li r3, 1 @@ -1721,7 +1760,7 @@ lbl_803AFFF8: /* 803AFFF8 003ACF58 80 BE 00 00 */ lwz r5, 0(r30) /* 803AFFFC 003ACF5C 28 05 00 00 */ cmplwi r5, 0 /* 803B0000 003ACF60 41 82 00 8C */ beq lbl_803B008C -/* 803B0004 003ACF64 88 0D AF 63 */ lbz r0, lbl_805A9B23@sda21(r13) +/* 803B0004 003ACF64 88 0D AF 63 */ lbz r0, s3dUseMaxVoices@sda21(r13) /* 803B0008 003ACF68 28 00 00 00 */ cmplwi r0, 0 /* 803B000C 003ACF6C 41 82 00 28 */ beq lbl_803B0034 /* 803B0010 003ACF70 80 1B 00 00 */ lwz r0, 0(r27) @@ -1945,7 +1984,7 @@ lbl_803B030C: /* 803B0314 003AD274 3B 7B 00 10 */ addi r27, r27, 0x10 /* 803B0318 003AD278 3B 5A 00 01 */ addi r26, r26, 1 lbl_803B031C: -/* 803B031C 003AD27C 88 0D AF 62 */ lbz r0, lbl_805A9B22@sda21(r13) +/* 803B031C 003AD27C 88 0D AF 62 */ lbz r0, startGroupNum@sda21(r13) /* 803B0320 003AD280 7C 1A 00 00 */ cmpw r26, r0 /* 803B0324 003AD284 41 80 FC C0 */ blt lbl_803AFFE4 /* 803B0328 003AD288 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 @@ -1973,21 +2012,21 @@ s3dHandle: /* 803B0374 003AD2D4 DB A1 00 60 */ stfd f29, 0x60(r1) /* 803B0378 003AD2D8 F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 803B037C 003AD2DC 39 61 00 60 */ addi r11, r1, 0x60 -/* 803B0380 003AD2E0 4B FD 96 FD */ bl sub_80389a7c -/* 803B0384 003AD2E4 88 6D AF 7C */ lbz r3, lbl_805A9B3C@sda21(r13) +/* 803B0380 003AD2E0 4B FD 96 FD */ bl _savegpr_27 +/* 803B0384 003AD2E4 88 6D AF 7C */ lbz r3, s3dCallCnt@sda21(r13) /* 803B0388 003AD2E8 28 03 00 00 */ cmplwi r3, 0 /* 803B038C 003AD2EC 41 82 00 10 */ beq lbl_803B039C /* 803B0390 003AD2F0 38 03 FF FF */ addi r0, r3, -1 -/* 803B0394 003AD2F4 98 0D AF 7C */ stb r0, lbl_805A9B3C@sda21(r13) +/* 803B0394 003AD2F4 98 0D AF 7C */ stb r0, s3dCallCnt@sda21(r13) /* 803B0398 003AD2F8 48 00 07 BC */ b lbl_803B0B54 lbl_803B039C: /* 803B039C 003AD2FC 38 00 00 00 */ li r0, 0 /* 803B03A0 003AD300 38 60 00 03 */ li r3, 3 -/* 803B03A4 003AD304 98 6D AF 7C */ stb r3, lbl_805A9B3C@sda21(r13) -/* 803B03A8 003AD308 83 CD AF 78 */ lwz r30, lbl_805A9B38@sda21(r13) -/* 803B03AC 003AD30C 98 0D AF 62 */ stb r0, lbl_805A9B22@sda21(r13) -/* 803B03B0 003AD310 98 0D AF 61 */ stb r0, lbl_805A9B21@sda21(r13) -/* 803B03B4 003AD314 98 0D AF 60 */ stb r0, lbl_805A9B20@sda21(r13) +/* 803B03A4 003AD304 98 6D AF 7C */ stb r3, s3dCallCnt@sda21(r13) +/* 803B03A8 003AD308 83 CD AF 78 */ lwz r30, s3dEmitterRoot@sda21(r13) +/* 803B03AC 003AD30C 98 0D AF 62 */ stb r0, startGroupNum@sda21(r13) +/* 803B03B0 003AD310 98 0D AF 61 */ stb r0, startListNumnum@sda21(r13) +/* 803B03B4 003AD314 98 0D AF 60 */ stb r0, runListNum@sda21(r13) /* 803B03B8 003AD318 48 00 05 E0 */ b lbl_803B0998 lbl_803B03BC: /* 803B03BC 003AD31C 80 9E 00 10 */ lwz r4, 0x10(r30) @@ -2008,7 +2047,7 @@ lbl_803B03E0: /* 803B03F4 003AD354 48 00 00 0C */ b lbl_803B0400 lbl_803B03F8: /* 803B03F8 003AD358 80 1E 00 00 */ lwz r0, 0(r30) -/* 803B03FC 003AD35C 90 0D AF 78 */ stw r0, lbl_805A9B38@sda21(r13) +/* 803B03FC 003AD35C 90 0D AF 78 */ stw r0, s3dEmitterRoot@sda21(r13) lbl_803B0400: /* 803B0400 003AD360 80 1E 00 10 */ lwz r0, 0x10(r30) /* 803B0404 003AD364 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -2069,7 +2108,7 @@ lbl_803B04BC: /* 803B04D0 003AD430 48 00 00 0C */ b lbl_803B04DC lbl_803B04D4: /* 803B04D4 003AD434 80 1E 00 00 */ lwz r0, 0(r30) -/* 803B04D8 003AD438 90 0D AF 78 */ stw r0, lbl_805A9B38@sda21(r13) +/* 803B04D8 003AD438 90 0D AF 78 */ stw r0, s3dEmitterRoot@sda21(r13) lbl_803B04DC: /* 803B04DC 003AD43C 80 1E 00 10 */ lwz r0, 0x10(r30) /* 803B04E0 003AD440 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -2150,7 +2189,7 @@ lbl_803B05D8: /* 803B05E8 003AD548 80 1E 00 10 */ lwz r0, 0x10(r30) /* 803B05EC 003AD54C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 803B05F0 003AD550 41 82 01 28 */ beq lbl_803B0718 -/* 803B05F4 003AD554 88 AD AF 62 */ lbz r5, lbl_805A9B22@sda21(r13) +/* 803B05F4 003AD554 88 AD AF 62 */ lbz r5, startGroupNum@sda21(r13) /* 803B05F8 003AD558 3C 60 80 56 */ lis r3, lbl_8055F990@ha /* 803B05FC 003AD55C 38 83 F9 90 */ addi r4, r3, lbl_8055F990@l /* 803B0600 003AD560 C0 21 00 18 */ lfs f1, 0x18(r1) @@ -2170,7 +2209,7 @@ lbl_803B0630: /* 803B0630 003AD590 7C 07 28 00 */ cmpw r7, r5 /* 803B0634 003AD594 40 82 00 38 */ bne lbl_803B066C /* 803B0638 003AD598 3C 80 80 56 */ lis r4, lbl_8055F990@ha -/* 803B063C 003AD59C 88 6D AF 62 */ lbz r3, lbl_805A9B22@sda21(r13) +/* 803B063C 003AD59C 88 6D AF 62 */ lbz r3, startGroupNum@sda21(r13) /* 803B0640 003AD5A0 54 E5 20 36 */ slwi r5, r7, 4 /* 803B0644 003AD5A4 38 C0 00 00 */ li r6, 0 /* 803B0648 003AD5A8 38 84 F9 90 */ addi r4, r4, lbl_8055F990@l @@ -2181,7 +2220,7 @@ lbl_803B0630: /* 803B065C 003AD5BC B0 C4 00 0C */ sth r6, 0xc(r4) /* 803B0660 003AD5C0 80 7E 00 40 */ lwz r3, 0x40(r30) /* 803B0664 003AD5C4 90 64 00 00 */ stw r3, 0(r4) -/* 803B0668 003AD5C8 98 0D AF 62 */ stb r0, lbl_805A9B22@sda21(r13) +/* 803B0668 003AD5C8 98 0D AF 62 */ stb r0, startGroupNum@sda21(r13) lbl_803B066C: /* 803B066C 003AD5CC 3C 60 80 56 */ lis r3, lbl_8055F990@ha /* 803B0670 003AD5D0 54 E4 20 36 */ slwi r4, r7, 4 @@ -2206,7 +2245,7 @@ lbl_803B06AC: lbl_803B06B4: /* 803B06B4 003AD614 28 05 00 00 */ cmplwi r5, 0 /* 803B06B8 003AD618 40 82 00 20 */ bne lbl_803B06D8 -/* 803B06BC 003AD61C 88 8D AF 60 */ lbz r4, lbl_805A9B20@sda21(r13) +/* 803B06BC 003AD61C 88 8D AF 60 */ lbz r4, runListNum@sda21(r13) /* 803B06C0 003AD620 3C 60 80 56 */ lis r3, lbl_8055FD90@ha /* 803B06C4 003AD624 38 03 FD 90 */ addi r0, r3, lbl_8055FD90@l /* 803B06C8 003AD628 1C 64 00 0C */ mulli r3, r4, 0xc @@ -2214,19 +2253,19 @@ lbl_803B06B4: /* 803B06D0 003AD630 90 07 00 00 */ stw r0, 0(r7) /* 803B06D4 003AD634 48 00 00 1C */ b lbl_803B06F0 lbl_803B06D8: -/* 803B06D8 003AD638 88 8D AF 60 */ lbz r4, lbl_805A9B20@sda21(r13) +/* 803B06D8 003AD638 88 8D AF 60 */ lbz r4, runListNum@sda21(r13) /* 803B06DC 003AD63C 3C 60 80 56 */ lis r3, lbl_8055FD90@ha /* 803B06E0 003AD640 38 03 FD 90 */ addi r0, r3, lbl_8055FD90@l /* 803B06E4 003AD644 1C 64 00 0C */ mulli r3, r4, 0xc /* 803B06E8 003AD648 7C 00 1A 14 */ add r0, r0, r3 /* 803B06EC 003AD64C 90 05 00 00 */ stw r0, 0(r5) lbl_803B06F0: -/* 803B06F0 003AD650 88 AD AF 60 */ lbz r5, lbl_805A9B20@sda21(r13) +/* 803B06F0 003AD650 88 AD AF 60 */ lbz r5, runListNum@sda21(r13) /* 803B06F4 003AD654 3C 60 80 56 */ lis r3, lbl_8055FD90@ha /* 803B06F8 003AD658 38 63 FD 90 */ addi r3, r3, lbl_8055FD90@l /* 803B06FC 003AD65C 1C 85 00 0C */ mulli r4, r5, 0xc /* 803B0700 003AD660 38 05 00 01 */ addi r0, r5, 1 -/* 803B0704 003AD664 98 0D AF 60 */ stb r0, lbl_805A9B20@sda21(r13) +/* 803B0704 003AD664 98 0D AF 60 */ stb r0, runListNum@sda21(r13) /* 803B0708 003AD668 7C 63 22 14 */ add r3, r3, r4 /* 803B070C 003AD66C 90 C3 00 00 */ stw r6, 0(r3) /* 803B0710 003AD670 93 C3 00 08 */ stw r30, 8(r3) @@ -2415,7 +2454,7 @@ lbl_803B0998: /* 803B099C 003AD8FC 40 82 FA 20 */ bne lbl_803B03BC /* 803B09A0 003AD900 4B FF F6 09 */ bl sub_803affa8 /* 803B09A4 003AD904 4B FF DE 5D */ bl sub_803ae800 -/* 803B09A8 003AD908 83 ED AF 6C */ lwz r31, lbl_805A9B2C@sda21(r13) +/* 803B09A8 003AD908 83 ED AF 6C */ lwz r31, s3dDoorRoot@sda21(r13) /* 803B09AC 003AD90C 48 00 01 A0 */ b lbl_803B0B4C lbl_803B09B0: /* 803B09B0 003AD910 80 1F 00 28 */ lwz r0, 0x28(r31) @@ -2553,15 +2592,15 @@ sub_803b0b84: /* 803B0B88 003ADAE8 54 60 FF FE */ rlwinm r0, r3, 0x1f, 0x1f, 0x1f /* 803B0B8C 003ADAEC 38 80 00 01 */ li r4, 1 /* 803B0B90 003ADAF0 38 60 00 03 */ li r3, 3 -/* 803B0B94 003ADAF4 90 AD AF 78 */ stw r5, lbl_805A9B38@sda21(r13) -/* 803B0B98 003ADAF8 90 AD AF 74 */ stw r5, lbl_805A9B34@sda21(r13) -/* 803B0B9C 003ADAFC 90 AD AF 70 */ stw r5, lbl_805A9B30@sda21(r13) -/* 803B0BA0 003ADB00 90 AD AF 6C */ stw r5, lbl_805A9B2C@sda21(r13) -/* 803B0BA4 003ADB04 90 AD AF 68 */ stw r5, lbl_805A9B28@sda21(r13) -/* 803B0BA8 003ADB08 98 8D AF 65 */ stb r4, lbl_805A9B25@sda21(r13) -/* 803B0BAC 003ADB0C 98 6D AF 64 */ stb r3, lbl_805A9B24@sda21(r13) -/* 803B0BB0 003ADB10 98 AD AF 7C */ stb r5, lbl_805A9B3C@sda21(r13) -/* 803B0BB4 003ADB14 98 0D AF 63 */ stb r0, lbl_805A9B23@sda21(r13) +/* 803B0B94 003ADAF4 90 AD AF 78 */ stw r5, s3dEmitterRoot@sda21(r13) +/* 803B0B98 003ADAF8 90 AD AF 74 */ stw r5, s3dListenerRoot@sda21(r13) +/* 803B0B9C 003ADAFC 90 AD AF 70 */ stw r5, s3dRoomRoot@sda21(r13) +/* 803B0BA0 003ADB00 90 AD AF 6C */ stw r5, s3dDoorRoot@sda21(r13) +/* 803B0BA4 003ADB04 90 AD AF 68 */ stw r5, snd_used_studios@sda21(r13) +/* 803B0BA8 003ADB08 98 8D AF 65 */ stb r4, snd_base_studio@sda21(r13) +/* 803B0BAC 003ADB0C 98 6D AF 64 */ stb r3, snd_max_studios@sda21(r13) +/* 803B0BB0 003ADB10 98 AD AF 7C */ stb r5, s3dCallCnt@sda21(r13) +/* 803B0BB4 003ADB14 98 0D AF 63 */ stb r0, s3dUseMaxVoices@sda21(r13) /* 803B0BB8 003ADB18 4E 80 00 20 */ blr .global s3dExit diff --git a/asm/musyx/snd_init.s b/asm/musyx/snd_init.s index cf0c2aaf..d38e4af8 100644 --- a/asm/musyx/snd_init.s +++ b/asm/musyx/snd_init.s @@ -15,7 +15,7 @@ sndInit: /* 803B0BE0 003ADB40 93 C1 00 18 */ stw r30, 0x18(r1) /* 803B0BE4 003ADB44 7C FE 3B 78 */ mr r30, r7 /* 803B0BE8 003ADB48 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803B0BEC 003ADB4C 99 2D AE 48 */ stb r9, lbl_805A9A08@sda21(r13) +/* 803B0BEC 003ADB4C 99 2D AE 48 */ stb r9, sndActive@sda21(r13) /* 803B0BF0 003ADB50 41 81 00 14 */ bgt lbl_803B0C04 /* 803B0BF4 003ADB54 3C E0 80 55 */ lis r7, synthInfo@ha /* 803B0BF8 003ADB58 38 E7 00 50 */ addi r7, r7, synthInfo@l @@ -61,7 +61,7 @@ lbl_803B0C40: /* 803B0C88 003ADBE8 4B FE 7E 71 */ bl seqInit /* 803B0C8C 003ADBEC 38 00 00 00 */ li r0, 0 /* 803B0C90 003ADBF0 7F A4 EB 78 */ mr r4, r29 -/* 803B0C94 003ADBF4 98 0D AE 80 */ stb r0, lbl_805A9A40@sda21(r13) +/* 803B0C94 003ADBF4 98 0D AE 80 */ stb r0, synthIdleWaitActive@sda21(r13) /* 803B0C98 003ADBF8 38 60 7D 00 */ li r3, 0x7d00 /* 803B0C9C 003ADBFC 4B FE AD C9 */ bl synthInit /* 803B0CA0 003ADC00 4B FE BB C5 */ bl streamInit @@ -70,7 +70,7 @@ lbl_803B0C40: /* 803B0CAC 003ADC0C 4B FF FE D9 */ bl sub_803b0b84 /* 803B0CB0 003ADC10 38 00 00 01 */ li r0, 1 /* 803B0CB4 003ADC14 38 60 00 00 */ li r3, 0 -/* 803B0CB8 003ADC18 98 0D AE 48 */ stb r0, lbl_805A9A08@sda21(r13) +/* 803B0CB8 003ADC18 98 0D AE 48 */ stb r0, sndActive@sda21(r13) lbl_803B0CBC: /* 803B0CBC 003ADC1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803B0CC0 003ADC20 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -90,7 +90,7 @@ sndQuit: /* 803B0CEC 003ADC4C 4B FF FE D1 */ bl s3dExit /* 803B0CF0 003ADC50 4B FE B2 E9 */ bl synthExit /* 803B0CF4 003ADC54 38 00 00 00 */ li r0, 0 -/* 803B0CF8 003ADC58 98 0D AE 48 */ stb r0, lbl_805A9A08@sda21(r13) +/* 803B0CF8 003ADC58 98 0D AE 48 */ stb r0, sndActive@sda21(r13) /* 803B0CFC 003ADC5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B0D00 003ADC60 7C 08 03 A6 */ mtlr r0 /* 803B0D04 003ADC64 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/musyx/snd_midictrl.s b/asm/musyx/snd_midictrl.s index 311c597b..62482bbb 100644 --- a/asm/musyx/snd_midictrl.s +++ b/asm/musyx/snd_midictrl.s @@ -111,7 +111,7 @@ lbl_803B1198: /* 803B11C0 003AE120 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B11C4 003AE124 48 00 00 3C */ b lbl_803B1200 lbl_803B11C8: -/* 803B11C8 003AE128 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B11C8 003AE128 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B11CC 003AE12C 7C E0 D2 14 */ add r7, r0, r26 /* 803B11D0 003AE130 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B11D4 003AE134 7C 09 00 40 */ cmplw r9, r0 @@ -121,7 +121,7 @@ lbl_803B11C8: /* 803B11E4 003AE144 40 82 00 14 */ bne lbl_803B11F8 /* 803B11E8 003AE148 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B11EC 003AE14C 38 1A 01 D6 */ addi r0, r26, 0x1d6 -/* 803B11F0 003AE150 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B11F0 003AE150 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B11F4 003AE154 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B11F8: /* 803B11F8 003AE158 3B 5A 04 04 */ addi r26, r26, 0x404 @@ -162,7 +162,7 @@ lbl_803B125C: /* 803B1274 003AE1D4 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B1278 003AE1D8 48 00 00 3C */ b lbl_803B12B4 lbl_803B127C: -/* 803B127C 003AE1DC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B127C 003AE1DC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B1280 003AE1E0 7C E0 D2 14 */ add r7, r0, r26 /* 803B1284 003AE1E4 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B1288 003AE1E8 7C 09 00 40 */ cmplw r9, r0 @@ -172,7 +172,7 @@ lbl_803B127C: /* 803B1298 003AE1F8 40 82 00 14 */ bne lbl_803B12AC /* 803B129C 003AE1FC 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B12A0 003AE200 38 1A 01 D6 */ addi r0, r26, 0x1d6 -/* 803B12A4 003AE204 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B12A4 003AE204 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B12A8 003AE208 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B12AC: /* 803B12AC 003AE20C 3B 5A 04 04 */ addi r26, r26, 0x404 @@ -213,7 +213,7 @@ lbl_803B1310: /* 803B1328 003AE288 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B132C 003AE28C 48 00 00 3C */ b lbl_803B1368 lbl_803B1330: -/* 803B1330 003AE290 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B1330 003AE290 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B1334 003AE294 7C E0 D2 14 */ add r7, r0, r26 /* 803B1338 003AE298 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B133C 003AE29C 7C 09 00 40 */ cmplw r9, r0 @@ -223,7 +223,7 @@ lbl_803B1330: /* 803B134C 003AE2AC 40 82 00 14 */ bne lbl_803B1360 /* 803B1350 003AE2B0 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B1354 003AE2B4 38 1A 01 D6 */ addi r0, r26, 0x1d6 -/* 803B1358 003AE2B8 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B1358 003AE2B8 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B135C 003AE2BC 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B1360: /* 803B1360 003AE2C0 3B 5A 04 04 */ addi r26, r26, 0x404 @@ -250,7 +250,7 @@ lbl_803B1374: /* 803B13AC 003AE30C 7C C5 01 AE */ stbx r6, r5, r0 /* 803B13B0 003AE310 48 00 00 3C */ b lbl_803B13EC lbl_803B13B4: -/* 803B13B4 003AE314 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B13B4 003AE314 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B13B8 003AE318 7C 60 CA 14 */ add r3, r0, r25 /* 803B13BC 003AE31C 88 03 01 22 */ lbz r0, 0x122(r3) /* 803B13C0 003AE320 7C 1D 00 40 */ cmplw r29, r0 @@ -259,7 +259,7 @@ lbl_803B13B4: /* 803B13CC 003AE32C 7C 1E 00 40 */ cmplw r30, r0 /* 803B13D0 003AE330 40 82 00 14 */ bne lbl_803B13E4 /* 803B13D4 003AE334 93 63 02 14 */ stw r27, 0x214(r3) -/* 803B13D8 003AE338 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B13D8 003AE338 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B13DC 003AE33C 7C 60 CA 14 */ add r3, r0, r25 /* 803B13E0 003AE340 4B FE 97 01 */ bl sub_8039aae0 lbl_803B13E4: @@ -323,7 +323,7 @@ lbl_803B1488: /* 803B14B0 003AE410 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B14B4 003AE414 48 00 00 3C */ b lbl_803B14F0 lbl_803B14B8: -/* 803B14B8 003AE418 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B14B8 003AE418 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B14BC 003AE41C 7C E0 CA 14 */ add r7, r0, r25 /* 803B14C0 003AE420 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B14C4 003AE424 7C 09 00 40 */ cmplw r9, r0 @@ -333,7 +333,7 @@ lbl_803B14B8: /* 803B14D4 003AE434 40 82 00 14 */ bne lbl_803B14E8 /* 803B14D8 003AE438 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B14DC 003AE43C 38 19 01 D6 */ addi r0, r25, 0x1d6 -/* 803B14E0 003AE440 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B14E0 003AE440 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B14E4 003AE444 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B14E8: /* 803B14E8 003AE448 3B 39 04 04 */ addi r25, r25, 0x404 @@ -374,7 +374,7 @@ lbl_803B154C: /* 803B1564 003AE4C4 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B1568 003AE4C8 48 00 00 3C */ b lbl_803B15A4 lbl_803B156C: -/* 803B156C 003AE4CC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B156C 003AE4CC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B1570 003AE4D0 7C E0 CA 14 */ add r7, r0, r25 /* 803B1574 003AE4D4 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B1578 003AE4D8 7C 09 00 40 */ cmplw r9, r0 @@ -384,7 +384,7 @@ lbl_803B156C: /* 803B1588 003AE4E8 40 82 00 14 */ bne lbl_803B159C /* 803B158C 003AE4EC 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B1590 003AE4F0 38 19 01 D6 */ addi r0, r25, 0x1d6 -/* 803B1594 003AE4F4 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B1594 003AE4F4 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B1598 003AE4F8 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B159C: /* 803B159C 003AE4FC 3B 39 04 04 */ addi r25, r25, 0x404 @@ -425,7 +425,7 @@ lbl_803B1600: /* 803B1618 003AE578 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803B161C 003AE57C 48 00 00 3C */ b lbl_803B1658 lbl_803B1620: -/* 803B1620 003AE580 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B1620 003AE580 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B1624 003AE584 7C E0 CA 14 */ add r7, r0, r25 /* 803B1628 003AE588 88 07 01 22 */ lbz r0, 0x122(r7) /* 803B162C 003AE58C 7C 09 00 40 */ cmplw r9, r0 @@ -435,7 +435,7 @@ lbl_803B1620: /* 803B163C 003AE59C 40 82 00 14 */ bne lbl_803B1650 /* 803B1640 003AE5A0 99 67 01 D7 */ stb r11, 0x1d7(r7) /* 803B1644 003AE5A4 38 19 01 D6 */ addi r0, r25, 0x1d6 -/* 803B1648 003AE5A8 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803B1648 003AE5A8 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803B164C 003AE5AC 7D 67 01 AE */ stbx r11, r7, r0 lbl_803B1650: /* 803B1650 003AE5B0 3B 39 04 04 */ addi r25, r25, 0x404 @@ -460,7 +460,7 @@ lbl_803B1664: /* 803B1694 003AE5F4 3B 80 1F FF */ li r28, 0x1fff /* 803B1698 003AE5F8 48 00 00 3C */ b lbl_803B16D4 lbl_803B169C: -/* 803B169C 003AE5FC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B169C 003AE5FC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B16A0 003AE600 7C 60 CA 14 */ add r3, r0, r25 /* 803B16A4 003AE604 88 03 01 22 */ lbz r0, 0x122(r3) /* 803B16A8 003AE608 7C 1E 00 40 */ cmplw r30, r0 @@ -469,7 +469,7 @@ lbl_803B169C: /* 803B16B4 003AE614 7C 1B 00 40 */ cmplw r27, r0 /* 803B16B8 003AE618 40 82 00 14 */ bne lbl_803B16CC /* 803B16BC 003AE61C 93 83 02 14 */ stw r28, 0x214(r3) -/* 803B16C0 003AE620 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803B16C0 003AE620 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B16C4 003AE624 7C 60 CA 14 */ add r3, r0, r25 /* 803B16C8 003AE628 4B FE 94 19 */ bl sub_8039aae0 lbl_803B16CC: @@ -847,18 +847,18 @@ sub_803b1bd0: /* 803B1BE8 003AEB48 7C 00 32 14 */ add r0, r0, r6 /* 803B1BEC 003AEB4C 7C 60 22 14 */ add r3, r0, r4 /* 803B1BF0 003AEB50 4C 82 00 20 */ bnelr -/* 803B1BF4 003AEB54 3C 60 80 56 */ lis r3, lbl_80566E90@ha -/* 803B1BF8 003AEB58 38 03 6E 90 */ addi r0, r3, lbl_80566E90@l +/* 803B1BF4 003AEB54 3C 60 80 56 */ lis r3, inpFXChannelDefaults@ha +/* 803B1BF8 003AEB58 38 03 6E 90 */ addi r0, r3, inpFXChannelDefaults@l /* 803B1BFC 003AEB5C 7C 60 22 14 */ add r3, r0, r4 /* 803B1C00 003AEB60 4E 80 00 20 */ blr -.global sub_803b1c04 -sub_803b1c04: +.global inpResetChannelDefaults +inpResetChannelDefaults: /* 803B1C04 003AEB64 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 803B1C08 003AEB68 3C A0 80 56 */ lis r5, lbl_80566E90@ha +/* 803B1C08 003AEB68 3C A0 80 56 */ lis r5, inpFXChannelDefaults@ha /* 803B1C0C 003AEB6C 28 00 00 FF */ cmplwi r0, 0xff /* 803B1C10 003AEB70 54 66 06 3E */ clrlwi r6, r3, 0x18 -/* 803B1C14 003AEB74 38 05 6E 90 */ addi r0, r5, lbl_80566E90@l +/* 803B1C14 003AEB74 38 05 6E 90 */ addi r0, r5, inpFXChannelDefaults@l /* 803B1C18 003AEB78 38 A0 00 02 */ li r5, 2 /* 803B1C1C 003AEB7C 7C 60 32 14 */ add r3, r0, r6 /* 803B1C20 003AEB80 41 82 00 18 */ beq lbl_803B1C38 @@ -877,7 +877,7 @@ inpAddCtrl: /* 803B1C44 003AEBA4 7C 08 02 A6 */ mflr r0 /* 803B1C48 003AEBA8 90 01 00 24 */ stw r0, 0x24(r1) /* 803B1C4C 003AEBAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803B1C50 003AEBB0 4B FD 7E 2D */ bl sub_80389a7c +/* 803B1C50 003AEBB0 4B FD 7E 2D */ bl _savegpr_27 /* 803B1C54 003AEBB4 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 803B1C58 003AEBB8 7C DD 33 78 */ mr r29, r6 /* 803B1C5C 003AEBBC 7C 7B 1B 78 */ mr r27, r3 @@ -1245,9 +1245,9 @@ lbl_803B2118: lbl_803B2120: /* 803B2120 003AF080 28 18 00 00 */ cmplwi r24, 0 /* 803B2124 003AF084 41 82 00 3C */ beq lbl_803B2160 -/* 803B2128 003AF088 80 6D AE 8C */ lwz r3, lbl_805A9A4C@sda21(r13) +/* 803B2128 003AF088 80 6D AE 8C */ lwz r3, synthRealTime+4@sda21(r13) /* 803B212C 003AF08C 80 18 00 94 */ lwz r0, 0x94(r24) -/* 803B2130 003AF090 80 8D AE 88 */ lwz r4, lbl_805A9A48@sda21(r13) +/* 803B2130 003AF090 80 8D AE 88 */ lwz r4, synthRealTime@sda21(r13) /* 803B2134 003AF094 7C 00 18 10 */ subfc r0, r0, r3 /* 803B2138 003AF098 80 78 00 90 */ lwz r3, 0x90(r24) /* 803B213C 003AF09C 54 05 C0 3E */ rotlwi r5, r0, 0x18 diff --git a/asm/musyx/snd_synthapi.s b/asm/musyx/snd_synthapi.s index e85a94b2..a8043fa1 100644 --- a/asm/musyx/snd_synthapi.s +++ b/asm/musyx/snd_synthapi.s @@ -207,7 +207,7 @@ sndOutputMode: /* 8039C450 003993B0 2C 03 00 01 */ cmpwi r3, 1 /* 8039C454 003993B4 90 01 00 14 */ stw r0, 0x14(r1) /* 8039C458 003993B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8039C45C 003993BC 83 ED AE 74 */ lwz r31, lbl_805A9A34@sda21(r13) +/* 8039C45C 003993BC 83 ED AE 74 */ lwz r31, synthFlags@sda21(r13) /* 8039C460 003993C0 41 82 00 38 */ beq lbl_8039C498 /* 8039C464 003993C4 40 80 00 10 */ bge lbl_8039C474 /* 8039C468 003993C8 2C 03 00 00 */ cmpwi r3, 0 @@ -219,26 +219,26 @@ lbl_8039C474: /* 8039C47C 003993DC 48 00 00 34 */ b lbl_8039C4B0 lbl_8039C480: /* 8039C480 003993E0 63 E0 00 01 */ ori r0, r31, 1 -/* 8039C484 003993E4 90 0D AE 74 */ stw r0, lbl_805A9A34@sda21(r13) +/* 8039C484 003993E4 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C488 003993E8 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 8039C48C 003993EC 90 0D AE 74 */ stw r0, lbl_805A9A34@sda21(r13) +/* 8039C48C 003993EC 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C490 003993F0 48 01 7A 8D */ bl sub_803b3f1c /* 8039C494 003993F4 48 00 00 30 */ b lbl_8039C4C4 lbl_8039C498: /* 8039C498 003993F8 57 E3 00 3C */ rlwinm r3, r31, 0, 0, 0x1e /* 8039C49C 003993FC 57 E0 00 3A */ rlwinm r0, r31, 0, 0, 0x1d -/* 8039C4A0 00399400 90 6D AE 74 */ stw r3, lbl_805A9A34@sda21(r13) -/* 8039C4A4 00399404 90 0D AE 74 */ stw r0, lbl_805A9A34@sda21(r13) +/* 8039C4A0 00399400 90 6D AE 74 */ stw r3, synthFlags@sda21(r13) +/* 8039C4A4 00399404 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C4A8 00399408 48 01 7A 75 */ bl sub_803b3f1c /* 8039C4AC 0039940C 48 00 00 18 */ b lbl_8039C4C4 lbl_8039C4B0: /* 8039C4B0 00399410 57 E0 00 3C */ rlwinm r0, r31, 0, 0, 0x1e -/* 8039C4B4 00399414 90 0D AE 74 */ stw r0, lbl_805A9A34@sda21(r13) +/* 8039C4B4 00399414 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C4B8 00399418 60 00 00 02 */ ori r0, r0, 2 -/* 8039C4BC 0039941C 90 0D AE 74 */ stw r0, lbl_805A9A34@sda21(r13) +/* 8039C4BC 0039941C 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C4C0 00399420 48 01 7A 5D */ bl sub_803b3f1c lbl_8039C4C4: -/* 8039C4C4 00399424 80 0D AE 74 */ lwz r0, lbl_805A9A34@sda21(r13) +/* 8039C4C4 00399424 80 0D AE 74 */ lwz r0, synthFlags@sda21(r13) /* 8039C4C8 00399428 7C 1F 00 40 */ cmplw r31, r0 /* 8039C4CC 0039942C 41 82 00 54 */ beq lbl_8039C520 /* 8039C4D0 00399430 3C 60 80 55 */ lis r3, synthInfo@ha @@ -247,7 +247,7 @@ lbl_8039C4C4: /* 8039C4DC 0039943C 38 C0 00 00 */ li r6, 0 /* 8039C4E0 00399440 48 00 00 30 */ b lbl_8039C510 lbl_8039C4E4: -/* 8039C4E4 00399444 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039C4E4 00399444 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039C4E8 00399448 38 06 01 14 */ addi r0, r6, 0x114 /* 8039C4EC 0039944C 38 C6 04 04 */ addi r6, r6, 0x404 /* 8039C4F0 00399450 38 E7 00 01 */ addi r7, r7, 1 @@ -291,7 +291,7 @@ sndSetAuxProcessingCallbacks: /* 8039C574 003994D4 41 82 00 4C */ beq lbl_8039C5C0 /* 8039C578 003994D8 56 C0 06 3E */ clrlwi r0, r22, 0x18 /* 8039C57C 003994DC 57 38 06 3E */ clrlwi r24, r25, 0x18 -/* 8039C580 003994E0 38 6D AE 64 */ addi r3, r13, lbl_805A9A24@sda21 +/* 8039C580 003994E0 38 6D AE 64 */ addi r3, r13, synthAuxAMIDI@sda21 /* 8039C584 003994E4 28 00 00 FF */ cmplwi r0, 0xff /* 8039C588 003994E8 7E C3 C1 AE */ stbx r22, r3, r24 /* 8039C58C 003994EC 41 82 00 58 */ beq lbl_8039C5E4 @@ -299,7 +299,7 @@ sndSetAuxProcessingCallbacks: /* 8039C594 003994F4 4B FF 87 9D */ bl seqGetPrivateId /* 8039C598 003994F8 3C A0 80 55 */ lis r5, lbl_80550A44@ha /* 8039C59C 003994FC 3C 80 80 55 */ lis r4, lbl_80550A24@ha -/* 8039C5A0 00399500 38 CD AE 5C */ addi r6, r13, lbl_805A9A1C@sda21 +/* 8039C5A0 00399500 38 CD AE 5C */ addi r6, r13, synthAuxAMIDISet@sda21 /* 8039C5A4 00399504 57 00 10 3A */ slwi r0, r24, 2 /* 8039C5A8 00399508 38 A5 0A 44 */ addi r5, r5, lbl_80550A44@l /* 8039C5AC 0039950C 38 84 0A 24 */ addi r4, r4, lbl_80550A24@l @@ -314,7 +314,7 @@ lbl_8039C5C0: /* 8039C5CC 0039952C 38 C0 00 00 */ li r6, 0 /* 8039C5D0 00399530 38 83 0A 44 */ addi r4, r3, lbl_80550A44@l /* 8039C5D4 00399534 38 00 00 FF */ li r0, 0xff -/* 8039C5D8 00399538 38 6D AE 64 */ addi r3, r13, lbl_805A9A24@sda21 +/* 8039C5D8 00399538 38 6D AE 64 */ addi r3, r13, synthAuxAMIDI@sda21 /* 8039C5DC 0039953C 7C C4 29 2E */ stwx r6, r4, r5 /* 8039C5E0 00399540 7C 03 39 AE */ stbx r0, r3, r7 lbl_8039C5E4: @@ -322,7 +322,7 @@ lbl_8039C5E4: /* 8039C5E8 00399548 41 82 00 4C */ beq lbl_8039C634 /* 8039C5EC 0039954C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8039C5F0 00399550 57 38 06 3E */ clrlwi r24, r25, 0x18 -/* 8039C5F4 00399554 38 6D AE 54 */ addi r3, r13, lbl_805A9A14@sda21 +/* 8039C5F4 00399554 38 6D AE 54 */ addi r3, r13, synthAuxBMIDI@sda21 /* 8039C5F8 00399558 28 00 00 FF */ cmplwi r0, 0xff /* 8039C5FC 0039955C 7F C3 C1 AE */ stbx r30, r3, r24 /* 8039C600 00399560 41 82 00 58 */ beq lbl_8039C658 @@ -330,7 +330,7 @@ lbl_8039C5E4: /* 8039C608 00399568 4B FF 87 29 */ bl seqGetPrivateId /* 8039C60C 0039956C 3C A0 80 55 */ lis r5, lbl_80550A84@ha /* 8039C610 00399570 3C 80 80 55 */ lis r4, lbl_80550A64@ha -/* 8039C614 00399574 38 CD AE 4C */ addi r6, r13, lbl_805A9A0C@sda21 +/* 8039C614 00399574 38 CD AE 4C */ addi r6, r13, synthAuxBMidiSet@sda21 /* 8039C618 00399578 57 00 10 3A */ slwi r0, r24, 2 /* 8039C61C 0039957C 38 A5 0A 84 */ addi r5, r5, lbl_80550A84@l /* 8039C620 00399580 38 84 0A 64 */ addi r4, r4, lbl_80550A64@l @@ -345,7 +345,7 @@ lbl_8039C634: /* 8039C640 003995A0 38 C0 00 00 */ li r6, 0 /* 8039C644 003995A4 38 83 0A 84 */ addi r4, r3, lbl_80550A84@l /* 8039C648 003995A8 38 00 00 FF */ li r0, 0xff -/* 8039C64C 003995AC 38 6D AE 54 */ addi r3, r13, lbl_805A9A14@sda21 +/* 8039C64C 003995AC 38 6D AE 54 */ addi r3, r13, synthAuxBMIDI@sda21 /* 8039C650 003995B0 7C C4 29 2E */ stwx r6, r4, r5 /* 8039C654 003995B4 7C 03 39 AE */ stbx r0, r3, r7 lbl_8039C658: @@ -388,8 +388,8 @@ sub_8039c68c: /* 8039C6DC 0039963C 38 84 0A 44 */ addi r4, r4, lbl_80550A44@l /* 8039C6E0 00399640 38 A3 0A 84 */ addi r5, r3, lbl_80550A84@l /* 8039C6E4 00399644 38 00 00 FF */ li r0, 0xff -/* 8039C6E8 00399648 39 0D AE 64 */ addi r8, r13, lbl_805A9A24@sda21 -/* 8039C6EC 0039964C 38 ED AE 54 */ addi r7, r13, lbl_805A9A14@sda21 +/* 8039C6E8 00399648 39 0D AE 64 */ addi r8, r13, synthAuxAMIDI@sda21 +/* 8039C6EC 0039964C 38 ED AE 54 */ addi r7, r13, synthAuxBMIDI@sda21 /* 8039C6F0 00399650 7D 24 51 2E */ stwx r9, r4, r10 /* 8039C6F4 00399654 7F A3 EB 78 */ mr r3, r29 /* 8039C6F8 00399658 7F C4 F3 78 */ mr r4, r30 @@ -414,7 +414,7 @@ sub_8039c734: /* 8039C738 00399698 7C 08 02 A6 */ mflr r0 /* 8039C73C 0039969C 90 01 00 24 */ stw r0, 0x24(r1) /* 8039C740 003996A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8039C744 003996A4 4B FE D3 39 */ bl sub_80389a7c +/* 8039C744 003996A4 4B FE D3 39 */ bl _savegpr_27 /* 8039C748 003996A8 7C 7F 1B 78 */ mr r31, r3 /* 8039C74C 003996AC 3C 60 80 55 */ lis r3, synthInfo@ha /* 8039C750 003996B0 3B A3 00 50 */ addi r29, r3, synthInfo@l @@ -423,7 +423,7 @@ sub_8039c734: /* 8039C75C 003996BC 3B 80 00 00 */ li r28, 0 /* 8039C760 003996C0 48 00 00 58 */ b lbl_8039C7B8 lbl_8039C764: -/* 8039C764 003996C4 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 8039C764 003996C4 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 8039C768 003996C8 7C 80 E2 14 */ add r4, r0, r28 /* 8039C76C 003996CC 88 04 01 1F */ lbz r0, 0x11f(r4) /* 8039C770 003996D0 7C 1E 00 40 */ cmplw r30, r0 @@ -459,8 +459,8 @@ lbl_8039C7B8: /* 8039C7DC 0039973C 38 E0 00 00 */ li r7, 0 /* 8039C7E0 00399740 38 A3 0A 84 */ addi r5, r3, lbl_80550A84@l /* 8039C7E4 00399744 38 00 00 FF */ li r0, 0xff -/* 8039C7E8 00399748 38 8D AE 64 */ addi r4, r13, lbl_805A9A24@sda21 -/* 8039C7EC 0039974C 38 6D AE 54 */ addi r3, r13, lbl_805A9A14@sda21 +/* 8039C7E8 00399748 38 8D AE 64 */ addi r4, r13, synthAuxAMIDI@sda21 +/* 8039C7EC 0039974C 38 6D AE 54 */ addi r3, r13, synthAuxBMIDI@sda21 /* 8039C7F0 00399750 7C E6 41 2E */ stwx r7, r6, r8 /* 8039C7F4 00399754 7C E5 41 2E */ stwx r7, r5, r8 /* 8039C7F8 00399758 7C 04 49 AE */ stbx r0, r4, r9 diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index 77baabcb..85545bc6 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -1,5 +1,14 @@ .include "macros.inc" +.section .sbss +.balign 4 +nextPublicID: + .skip 0x4 +streamCallDelay: + .skip 0x1 +streamCallCnt: + .skip 0x3 + .section .text, "ax" .global streamInit @@ -10,9 +19,9 @@ streamInit: /* 8039C870 003997D0 38 00 00 03 */ li r0, 3 /* 8039C874 003997D4 88 64 02 10 */ lbz r3, 0x210(r4) /* 8039C878 003997D8 38 E0 00 00 */ li r7, 0 -/* 8039C87C 003997DC 98 AD AE 95 */ stb r5, lbl_805A9A55@sda21(r13) +/* 8039C87C 003997DC 98 AD AE 95 */ stb r5, streamCallCnt@sda21(r13) /* 8039C880 003997E0 2C 03 00 00 */ cmpwi r3, 0 -/* 8039C884 003997E4 98 0D AE 94 */ stb r0, lbl_805A9A54@sda21(r13) +/* 8039C884 003997E4 98 0D AE 94 */ stb r0, streamCallDelay@sda21(r13) /* 8039C888 003997E8 40 81 00 8C */ ble lbl_8039C914 /* 8039C88C 003997EC 2C 03 00 08 */ cmpwi r3, 8 /* 8039C890 003997F0 38 C3 FF F8 */ addi r6, r3, -8 @@ -53,7 +62,7 @@ lbl_8039C908: /* 8039C910 00399870 42 00 FF F8 */ bdnz lbl_8039C908 lbl_8039C914: /* 8039C914 00399874 38 00 00 00 */ li r0, 0 -/* 8039C918 00399878 90 0D AE 90 */ stw r0, lbl_805A9A50@sda21(r13) +/* 8039C918 00399878 90 0D AE 90 */ stw r0, nextPublicID@sda21(r13) /* 8039C91C 0039987C 4E 80 00 20 */ blr .global SetHWMix @@ -100,19 +109,19 @@ streamHandle: /* 8039C9B0 00399910 7C 08 02 A6 */ mflr r0 /* 8039C9B4 00399914 90 01 00 74 */ stw r0, 0x74(r1) /* 8039C9B8 00399918 39 61 00 70 */ addi r11, r1, 0x70 -/* 8039C9BC 0039991C 4B FE D0 C1 */ bl sub_80389a7c -/* 8039C9C0 00399920 88 6D AE 95 */ lbz r3, lbl_805A9A55@sda21(r13) +/* 8039C9BC 0039991C 4B FE D0 C1 */ bl _savegpr_27 +/* 8039C9C0 00399920 88 6D AE 95 */ lbz r3, streamCallCnt@sda21(r13) /* 8039C9C4 00399924 28 03 00 00 */ cmplwi r3, 0 /* 8039C9C8 00399928 41 82 00 10 */ beq lbl_8039C9D8 /* 8039C9CC 0039992C 38 03 FF FF */ addi r0, r3, -1 -/* 8039C9D0 00399930 98 0D AE 95 */ stb r0, lbl_805A9A55@sda21(r13) +/* 8039C9D0 00399930 98 0D AE 95 */ stb r0, streamCallCnt@sda21(r13) /* 8039C9D4 00399934 48 00 08 6C */ b lbl_8039D240 lbl_8039C9D8: -/* 8039C9D8 00399938 88 8D AE 94 */ lbz r4, lbl_805A9A54@sda21(r13) +/* 8039C9D8 00399938 88 8D AE 94 */ lbz r4, streamCallDelay@sda21(r13) /* 8039C9DC 0039993C 3C 60 80 55 */ lis r3, lbl_805513F8@ha /* 8039C9E0 00399940 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 8039C9E4 00399944 3C 60 80 55 */ lis r3, synthInfo@ha -/* 8039C9E8 00399948 98 8D AE 95 */ stb r4, lbl_805A9A55@sda21(r13) +/* 8039C9E8 00399948 98 8D AE 95 */ stb r4, streamCallCnt@sda21(r13) /* 8039C9EC 0039994C 7C 1C 03 78 */ mr r28, r0 /* 8039C9F0 00399950 3B E3 00 50 */ addi r31, r3, synthInfo@l /* 8039C9F4 00399954 3B A0 00 00 */ li r29, 0 @@ -163,7 +172,7 @@ lbl_8039CA70: lbl_8039CA98: /* 8039CA98 003999F8 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 8039CA9C 003999FC 3C 80 00 01 */ lis r4, 0x0000FFFF@ha -/* 8039CAA0 00399A00 81 0D AE 78 */ lwz r8, lbl_805A9A38@sda21(r13) +/* 8039CAA0 00399A00 81 0D AE 78 */ lwz r8, synthVoice@sda21(r13) /* 8039CAA4 00399A04 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l /* 8039CAA8 00399A08 1C E3 04 04 */ mulli r7, r3, 0x404 /* 8039CAAC 00399A0C 38 A1 00 08 */ addi r5, r1, 8 @@ -1035,7 +1044,7 @@ lbl_8039D708: .global CheckOutputMode CheckOutputMode: -/* 8039D724 0039A684 80 AD AE 74 */ lwz r5, lbl_805A9A34@sda21(r13) +/* 8039D724 0039A684 80 AD AE 74 */ lwz r5, synthFlags@sda21(r13) /* 8039D728 0039A688 54 A0 07 FF */ clrlwi. r0, r5, 0x1f /* 8039D72C 0039A68C 41 82 00 18 */ beq lbl_8039D744 /* 8039D730 0039A690 38 A0 00 40 */ li r5, 0x40 @@ -1054,7 +1063,7 @@ lbl_8039D744: SetupVolumeAndPan: /* 8039D758 0039A6B8 98 A3 00 5E */ stb r5, 0x5e(r3) /* 8039D75C 0039A6BC 98 C3 00 5F */ stb r6, 0x5f(r3) -/* 8039D760 0039A6C0 81 2D AE 74 */ lwz r9, lbl_805A9A34@sda21(r13) +/* 8039D760 0039A6C0 81 2D AE 74 */ lwz r9, synthFlags@sda21(r13) /* 8039D764 0039A6C4 55 20 07 FF */ clrlwi. r0, r9, 0x1f /* 8039D768 0039A6C8 41 82 00 10 */ beq lbl_8039D778 /* 8039D76C 0039A6CC 38 A0 00 40 */ li r5, 0x40 @@ -1092,7 +1101,7 @@ lbl_8039D7D0: /* 8039D7D4 0039A734 28 00 00 00 */ cmplwi r0, 0 /* 8039D7D8 0039A738 41 82 00 C0 */ beq lbl_8039D898 /* 8039D7DC 0039A73C 88 1E 00 5E */ lbz r0, 0x5e(r30) -/* 8039D7E0 0039A740 80 8D AE 74 */ lwz r4, lbl_805A9A34@sda21(r13) +/* 8039D7E0 0039A740 80 8D AE 74 */ lwz r4, synthFlags@sda21(r13) /* 8039D7E4 0039A744 98 1E 00 5A */ stb r0, 0x5a(r30) /* 8039D7E8 0039A748 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 8039D7EC 0039A74C 88 7E 00 5F */ lbz r3, 0x5f(r30) @@ -1229,7 +1238,7 @@ lbl_8039D934: lbl_8039D9D8: /* 8039D9D8 0039A938 28 07 00 40 */ cmplwi r7, 0x40 /* 8039D9DC 0039A93C 41 82 03 24 */ beq lbl_8039DD00 -/* 8039D9E0 0039A940 80 8D AE 90 */ lwz r4, lbl_805A9A50@sda21(r13) +/* 8039D9E0 0039A940 80 8D AE 90 */ lwz r4, nextPublicID@sda21(r13) lbl_8039D9E4: /* 8039D9E4 0039A944 3C 04 00 01 */ addis r0, r4, 1 /* 8039D9E8 0039A948 7C 91 23 78 */ mr r17, r4 @@ -1322,7 +1331,7 @@ lbl_8039DB14: /* 8039DB18 0039AA78 40 82 FE CC */ bne lbl_8039D9E4 /* 8039DB1C 0039AA7C 1E 07 00 64 */ mulli r16, r7, 0x64 /* 8039DB20 0039AA80 3C 60 80 55 */ lis r3, lbl_805513F8@ha -/* 8039DB24 0039AA84 90 8D AE 90 */ stw r4, lbl_805A9A50@sda21(r13) +/* 8039DB24 0039AA84 90 8D AE 90 */ stw r4, nextPublicID@sda21(r13) /* 8039DB28 0039AA88 7E E4 BB 78 */ mr r4, r23 /* 8039DB2C 0039AA8C 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 8039DB30 0039AA90 7C A0 82 14 */ add r5, r0, r16 @@ -1389,7 +1398,7 @@ lbl_8039DC18: /* 8039DC1C 0039AB7C 98 04 00 0D */ stb r0, 0xd(r4) lbl_8039DC20: /* 8039DC20 0039AB80 3C 80 80 55 */ lis r4, lbl_805513F8@ha -/* 8039DC24 0039AB84 80 AD AE 74 */ lwz r5, lbl_805A9A34@sda21(r13) +/* 8039DC24 0039AB84 80 AD AE 74 */ lwz r5, synthFlags@sda21(r13) /* 8039DC28 0039AB88 38 04 13 F8 */ addi r0, r4, lbl_805513F8@l /* 8039DC2C 0039AB8C 7E 68 9B 78 */ mr r8, r19 /* 8039DC30 0039AB90 7C 80 82 14 */ add r4, r0, r16 @@ -2269,7 +2278,7 @@ lbl_8039E890: /* 8039E898 0039B7F8 41 82 03 7C */ beq lbl_8039EC14 /* 8039E89C 0039B7FC 1F E3 00 64 */ mulli r31, r3, 0x64 /* 8039E8A0 0039B800 3C 60 80 55 */ lis r3, lbl_805513F8@ha -/* 8039E8A4 0039B804 80 8D AE 74 */ lwz r4, lbl_805A9A34@sda21(r13) +/* 8039E8A4 0039B804 80 8D AE 74 */ lwz r4, synthFlags@sda21(r13) /* 8039E8A8 0039B808 7F 86 E3 78 */ mr r6, r28 /* 8039E8AC 0039B80C 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 8039E8B0 0039B810 7C 60 FA 14 */ add r3, r0, r31 @@ -2621,7 +2630,7 @@ lbl_8039EDA0: /* 8039EDA8 0039BD08 41 82 03 C8 */ beq lbl_8039F170 /* 8039EDAC 0039BD0C 1F E3 00 64 */ mulli r31, r3, 0x64 /* 8039EDB0 0039BD10 3C 60 80 55 */ lis r3, lbl_805513F8@ha -/* 8039EDB4 0039BD14 80 8D AE 74 */ lwz r4, lbl_805A9A34@sda21(r13) +/* 8039EDB4 0039BD14 80 8D AE 74 */ lwz r4, synthFlags@sda21(r13) /* 8039EDB8 0039BD18 7F 46 D3 78 */ mr r6, r26 /* 8039EDBC 0039BD1C 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 8039EDC0 0039BD20 7C 60 FA 14 */ add r3, r0, r31 @@ -2892,7 +2901,7 @@ sndStreamFrq: /* 8039F190 0039C0F0 7C 08 02 A6 */ mflr r0 /* 8039F194 0039C0F4 90 01 00 44 */ stw r0, 0x44(r1) /* 8039F198 0039C0F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8039F19C 0039C0FC 4B FE A8 E1 */ bl sub_80389a7c +/* 8039F19C 0039C0FC 4B FE A8 E1 */ bl _savegpr_27 /* 8039F1A0 0039C100 7C 7B 1B 78 */ mr r27, r3 /* 8039F1A4 0039C104 7C 9C 23 78 */ mr r28, r4 /* 8039F1A8 0039C108 48 01 5F 15 */ bl hwDisableIrq @@ -3941,7 +3950,7 @@ lbl_803A0030: /* 803A0054 0039CFB4 40 82 00 48 */ bne lbl_803A009C /* 803A0058 0039CFB8 7C 63 E2 14 */ add r3, r3, r28 /* 803A005C 0039CFBC 88 63 00 58 */ lbz r3, 0x58(r3) -/* 803A0060 0039CFC0 48 00 86 A9 */ bl sub_803a8708 +/* 803A0060 0039CFC0 48 00 86 A9 */ bl voiceBlock /* 803A0064 0039CFC4 3C 80 80 55 */ lis r4, lbl_805513F8@ha /* 803A0068 0039CFC8 3C 03 00 01 */ addis r0, r3, 1 /* 803A006C 0039CFCC 38 84 13 F8 */ addi r4, r4, lbl_805513F8@l @@ -4065,7 +4074,7 @@ lbl_803A01F4: /* 803A0214 0039D174 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 803A0218 0039D178 7C 60 E2 14 */ add r3, r0, r28 /* 803A021C 0039D17C 88 63 00 58 */ lbz r3, 0x58(r3) -/* 803A0220 0039D180 48 00 84 E9 */ bl sub_803a8708 +/* 803A0220 0039D180 48 00 84 E9 */ bl voiceBlock /* 803A0224 0039D184 3C 80 80 55 */ lis r4, lbl_805513F8@ha /* 803A0228 0039D188 3C 03 00 01 */ addis r0, r3, 1 /* 803A022C 0039D18C 38 84 13 F8 */ addi r4, r4, lbl_805513F8@l @@ -4188,7 +4197,7 @@ lbl_803A03B0: /* 803A03D0 0039D330 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 803A03D4 0039D334 7C 60 E2 14 */ add r3, r0, r28 /* 803A03D8 0039D338 88 63 00 58 */ lbz r3, 0x58(r3) -/* 803A03DC 0039D33C 48 00 83 2D */ bl sub_803a8708 +/* 803A03DC 0039D33C 48 00 83 2D */ bl voiceBlock /* 803A03E0 0039D340 3C 80 80 55 */ lis r4, lbl_805513F8@ha /* 803A03E4 0039D344 3C 03 00 01 */ addis r0, r3, 1 /* 803A03E8 0039D348 38 84 13 F8 */ addi r4, r4, lbl_805513F8@l @@ -4226,7 +4235,7 @@ lbl_803A0418: /* 803A0460 0039D3C0 38 03 13 F8 */ addi r0, r3, lbl_805513F8@l /* 803A0464 0039D3C4 7C 60 E2 14 */ add r3, r0, r28 /* 803A0468 0039D3C8 88 63 00 58 */ lbz r3, 0x58(r3) -/* 803A046C 0039D3CC 48 00 82 9D */ bl sub_803a8708 +/* 803A046C 0039D3CC 48 00 82 9D */ bl voiceBlock /* 803A0470 0039D3D0 3C 80 80 55 */ lis r4, lbl_805513F8@ha /* 803A0474 0039D3D4 3C 03 00 01 */ addis r0, r3, 1 /* 803A0478 0039D3D8 38 84 13 F8 */ addi r4, r4, lbl_805513F8@l diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index 7de19c47..e430ede9 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -1,6 +1,47 @@ .include "macros.inc" - +.section .sbss +.balign 4 +.global sndActive +sndActive: + .skip 0x1 +.global synthJobTableIndex +synthJobTableIndex: + .skip 0x3 +.global synthAuxBMidiSet +synthAuxBMidiSet: + .skip 0x8 +.global synthAuxBMIDI +synthAuxBMIDI: + .skip 0x8 +.global synthAuxAMIDISet +synthAuxAMIDISet: + .skip 0x8 +.global synthAuxAMIDI +synthAuxAMIDI: + .skip 0x8 +.global synthMasterFaderPauseActiveFlags +synthMasterFaderPauseActiveFlags: + .skip 0x4 +.global synthMasterFaderActiveFlags +synthMasterFaderActiveFlags: + .skip 0x4 +.global synthFlags +synthFlags: + .skip 0x4 +.global synthVoice +synthVoice: + .skip 0x4 +.global synthMessageCallback +synthMessageCallback: + .skip 0x4 +.global synthIdleWaitActive +synthIdleWaitActive: + .skip 0x8 +.global synthRealTime +synthRealTime: + .skip 0x8 + .section .text, "ax" .global synthSetBpm @@ -86,7 +127,7 @@ do_voice_portamento: /* 80398DA0 00395D00 4B FF 0C B9 */ bl func_80389A58 /* 80398DA4 00395D04 7C 72 1B 78 */ mr r18, r3 /* 80398DA8 00395D08 3C 60 80 55 */ lis r3, synthInfo@ha -/* 80398DAC 00395D0C 83 2D AE 78 */ lwz r25, lbl_805A9A38@sda21(r13) +/* 80398DAC 00395D0C 83 2D AE 78 */ lwz r25, synthVoice@sda21(r13) /* 80398DB0 00395D10 7C 93 23 78 */ mr r19, r4 /* 80398DB4 00395D14 7C B4 2B 78 */ mr r20, r5 /* 80398DB8 00395D18 7C D5 33 78 */ mr r21, r6 @@ -195,9 +236,9 @@ lbl_80398EDC: /* 80398F48 00395EA8 80 99 01 18 */ lwz r4, 0x118(r25) /* 80398F4C 00395EAC 7C 80 03 78 */ or r0, r4, r0 /* 80398F50 00395EB0 90 19 01 18 */ stw r0, 0x118(r25) -/* 80398F54 00395EB4 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 80398F54 00395EB4 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 80398F58 00395EB8 7C 60 F2 14 */ add r3, r0, r30 -/* 80398F5C 00395EBC 48 00 E7 E5 */ bl sub_803a7740 +/* 80398F5C 00395EBC 48 00 E7 E5 */ bl vidRemoveVoiceReferences /* 80398F60 00395EC0 3C 1B 00 01 */ addis r0, r27, 1 /* 80398F64 00395EC4 28 00 FF FF */ cmplwi r0, 0xffff /* 80398F68 00395EC8 40 82 00 2C */ bne lbl_80398F94 @@ -205,9 +246,9 @@ lbl_80398EDC: /* 80398F70 00395ED0 7E A4 AB 78 */ mr r4, r21 /* 80398F74 00395ED4 90 19 00 EC */ stw r0, 0xec(r25) /* 80398F78 00395ED8 90 19 00 F0 */ stw r0, 0xf0(r25) -/* 80398F7C 00395EDC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 80398F7C 00395EDC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 80398F80 00395EE0 7C 60 F2 14 */ add r3, r0, r30 -/* 80398F84 00395EE4 48 00 EB 21 */ bl sub_803a7aa4 +/* 80398F84 00395EE4 48 00 EB 21 */ bl vidMakeNew /* 80398F88 00395EE8 83 59 00 F4 */ lwz r26, 0xf4(r25) /* 80398F8C 00395EEC 7C 7B 1B 78 */ mr r27, r3 /* 80398F90 00395EF0 48 00 00 34 */ b lbl_80398FC4 @@ -215,15 +256,15 @@ lbl_80398F94: /* 80398F94 00395EF4 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 80398F98 00395EF8 80 D9 00 F4 */ lwz r6, 0xf4(r25) /* 80398F9C 00395EFC 1C 60 04 04 */ mulli r3, r0, 0x404 -/* 80398FA0 00395F00 80 AD AE 78 */ lwz r5, lbl_805A9A38@sda21(r13) +/* 80398FA0 00395F00 80 AD AE 78 */ lwz r5, synthVoice@sda21(r13) /* 80398FA4 00395F04 38 80 00 00 */ li r4, 0 /* 80398FA8 00395F08 38 03 00 EC */ addi r0, r3, 0xec /* 80398FAC 00395F0C 7C C5 01 2E */ stwx r6, r5, r0 /* 80398FB0 00395F10 93 59 00 F0 */ stw r26, 0xf0(r25) -/* 80398FB4 00395F14 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 80398FB4 00395F14 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 80398FB8 00395F18 83 59 00 F4 */ lwz r26, 0xf4(r25) /* 80398FBC 00395F1C 7C 60 F2 14 */ add r3, r0, r30 -/* 80398FC0 00395F20 48 00 EA E5 */ bl sub_803a7aa4 +/* 80398FC0 00395F20 48 00 EA E5 */ bl vidMakeNew lbl_80398FC4: /* 80398FC4 00395F24 3B DE 04 04 */ addi r30, r30, 0x404 /* 80398FC8 00395F28 3B 9C 00 01 */ addi r28, r28, 1 @@ -467,7 +508,7 @@ lbl_80399310: /* 80399320 00396280 28 00 00 00 */ cmplwi r0, 0 /* 80399324 00396284 41 82 00 20 */ beq lbl_80399344 /* 80399328 00396288 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8039932C 0039628C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039932C 0039628C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 80399330 00396290 1C 00 04 04 */ mulli r0, r0, 0x404 /* 80399334 00396294 7C 63 02 14 */ add r3, r3, r0 /* 80399338 00396298 48 00 E7 59 */ bl vidMakeRoot @@ -480,11 +521,11 @@ lbl_8039934C: /* 8039934C 003962AC 57 63 06 3E */ clrlwi r3, r27, 0x18 /* 80399350 003962B0 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 80399354 003962B4 1C 63 04 04 */ mulli r3, r3, 0x404 -/* 80399358 003962B8 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 80399358 003962B8 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039935C 003962BC 38 63 00 EC */ addi r3, r3, 0xec /* 80399360 003962C0 7F 84 19 2E */ stwx r28, r4, r3 /* 80399364 003962C4 1C 60 04 04 */ mulli r3, r0, 0x404 -/* 80399368 003962C8 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 80399368 003962C8 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039936C 003962CC 38 03 00 F0 */ addi r0, r3, 0xf0 /* 80399370 003962D0 7F 64 01 2E */ stwx r27, r4, r0 lbl_80399374: @@ -494,11 +535,11 @@ lbl_80399374: lbl_80399380: /* 80399380 003962E0 98 85 01 1C */ stb r4, 0x11c(r5) /* 80399384 003962E4 38 06 00 EC */ addi r0, r6, 0xec -/* 80399388 003962E8 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 80399388 003962E8 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039938C 003962EC 7F 63 00 2E */ lwzx r27, r3, r0 lbl_80399390: /* 80399390 003962F0 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80399394 003962F4 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 80399394 003962F4 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 80399398 003962F8 1C C0 04 04 */ mulli r6, r0, 0x404 /* 8039939C 003962FC 7C A3 32 14 */ add r5, r3, r6 /* 803993A0 00396300 80 65 00 EC */ lwz r3, 0xec(r5) @@ -942,12 +983,12 @@ lbl_803999A4: /* 803999BC 0039691C 48 00 00 24 */ b lbl_803999E0 lbl_803999C0: /* 803999C0 00396920 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803999C4 00396924 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803999C4 00396924 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803999C8 00396928 1C A0 04 04 */ mulli r5, r0, 0x404 /* 803999CC 0039692C 38 05 01 1C */ addi r0, r5, 0x11c /* 803999D0 00396930 7C 83 01 AE */ stbx r4, r3, r0 /* 803999D4 00396934 38 05 00 EC */ addi r0, r5, 0xec -/* 803999D8 00396938 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803999D8 00396938 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803999DC 0039693C 7C 63 00 2E */ lwzx r3, r3, r0 lbl_803999E0: /* 803999E0 00396940 3C 03 00 01 */ addis r0, r3, 1 @@ -984,12 +1025,12 @@ lbl_803999F4: /* 80399A54 003969B4 48 00 00 24 */ b lbl_80399A78 lbl_80399A58: /* 80399A58 003969B8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80399A5C 003969BC 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 80399A5C 003969BC 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 80399A60 003969C0 1C A0 04 04 */ mulli r5, r0, 0x404 /* 80399A64 003969C4 38 05 01 1C */ addi r0, r5, 0x11c /* 80399A68 003969C8 7C 83 01 AE */ stbx r4, r3, r0 /* 80399A6C 003969CC 38 05 00 EC */ addi r0, r5, 0xec -/* 80399A70 003969D0 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 80399A70 003969D0 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 80399A74 003969D4 7C 63 00 2E */ lwzx r3, r3, r0 lbl_80399A78: /* 80399A78 003969D8 3C 03 00 01 */ addis r0, r3, 1 @@ -1014,9 +1055,9 @@ LowPrecisionHandler: /* 80399AAC 00396A0C 7C 08 02 A6 */ mflr r0 /* 80399AB0 00396A10 90 01 00 34 */ stw r0, 0x34(r1) /* 80399AB4 00396A14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80399AB8 00396A18 4B FE FF C5 */ bl sub_80389a7c +/* 80399AB8 00396A18 4B FE FF C5 */ bl _savegpr_27 /* 80399ABC 00396A1C 7C 7B 1B 78 */ mr r27, r3 -/* 80399AC0 00396A20 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 80399AC0 00396A20 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 80399AC4 00396A24 1C 1B 04 04 */ mulli r0, r27, 0x404 /* 80399AC8 00396A28 7F 84 02 14 */ add r28, r4, r0 /* 80399ACC 00396A2C 48 01 96 D1 */ bl hwIsActive @@ -1026,9 +1067,9 @@ LowPrecisionHandler: /* 80399ADC 00396A3C 28 00 00 00 */ cmplwi r0, 0 /* 80399AE0 00396A40 41 82 06 D8 */ beq lbl_8039A1B8 lbl_80399AE4: -/* 80399AE4 00396A44 80 8D AE 88 */ lwz r4, lbl_805A9A48@sda21(r13) +/* 80399AE4 00396A44 80 8D AE 88 */ lwz r4, synthRealTime@sda21(r13) /* 80399AE8 00396A48 7F 9E E3 78 */ mr r30, r28 -/* 80399AEC 00396A4C 80 AD AE 8C */ lwz r5, lbl_805A9A4C@sda21(r13) +/* 80399AEC 00396A4C 80 AD AE 8C */ lwz r5, synthRealTime+4@sda21(r13) /* 80399AF0 00396A50 3B A0 00 00 */ li r29, 0 /* 80399AF4 00396A54 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80399AF8 00396A58 80 1C 00 24 */ lwz r0, 0x24(r28) @@ -1533,7 +1574,7 @@ sub_8039a1ec: /* 8039A220 00397180 93 A1 00 54 */ stw r29, 0x54(r1) /* 8039A224 00397184 93 81 00 50 */ stw r28, 0x50(r1) /* 8039A228 00397188 7C 7D 1B 78 */ mr r29, r3 -/* 8039A22C 0039718C 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039A22C 0039718C 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039A230 00397190 1C 1D 04 04 */ mulli r0, r29, 0x404 /* 8039A234 00397194 7F C4 02 14 */ add r30, r4, r0 /* 8039A238 00397198 48 01 8F 65 */ bl hwIsActive @@ -1543,9 +1584,9 @@ sub_8039a1ec: /* 8039A248 003971A8 28 00 00 00 */ cmplwi r0, 0 /* 8039A24C 003971AC 41 82 06 40 */ beq lbl_8039A88C lbl_8039A250: -/* 8039A250 003971B0 80 CD AE 88 */ lwz r6, lbl_805A9A48@sda21(r13) +/* 8039A250 003971B0 80 CD AE 88 */ lwz r6, synthRealTime@sda21(r13) /* 8039A254 003971B4 3C 60 00 01 */ lis r3, 0x00008000@ha -/* 8039A258 003971B8 80 ED AE 8C */ lwz r7, lbl_805A9A4C@sda21(r13) +/* 8039A258 003971B8 80 ED AE 8C */ lwz r7, synthRealTime+4@sda21(r13) /* 8039A25C 003971BC 38 63 80 00 */ addi r3, r3, 0x00008000@l /* 8039A260 003971C0 80 BE 00 30 */ lwz r5, 0x30(r30) /* 8039A264 003971C4 38 80 00 00 */ li r4, 0 @@ -1750,7 +1791,7 @@ lbl_8039A548: /* 8039A55C 003974BC EC 01 00 28 */ fsubs f0, f1, f0 /* 8039A560 003974C0 EF DE 00 32 */ fmuls f30, f30, f0 lbl_8039A564: -/* 8039A564 003974C4 80 ED AE 74 */ lwz r7, lbl_805A9A34@sda21(r13) +/* 8039A564 003974C4 80 ED AE 74 */ lwz r7, synthFlags@sda21(r13) /* 8039A568 003974C8 54 E3 07 FF */ clrlwi. r3, r7, 0x1f /* 8039A56C 003974CC 40 82 00 EC */ bne lbl_8039A658 /* 8039A570 003974D0 80 9E 01 14 */ lwz r4, 0x114(r30) @@ -1792,7 +1833,7 @@ lbl_8039A5EC: /* 8039A5F8 00397558 7C 60 1B 78 */ mr r0, r3 lbl_8039A5FC: /* 8039A5FC 0039755C 90 1E 01 60 */ stw r0, 0x160(r30) -/* 8039A600 00397560 80 0D AE 74 */ lwz r0, lbl_805A9A34@sda21(r13) +/* 8039A600 00397560 80 0D AE 74 */ lwz r0, synthFlags@sda21(r13) /* 8039A604 00397564 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8039A608 00397568 41 82 00 30 */ beq lbl_8039A638 /* 8039A60C 0039756C 7F C3 F3 78 */ mr r3, r30 @@ -1992,7 +2033,7 @@ lbl_8039A8A8: .global synthAddJob synthAddJob: -/* 8039A8E8 00397848 88 0D AE 49 */ lbz r0, lbl_805A9A09@sda21(r13) +/* 8039A8E8 00397848 88 0D AE 49 */ lbz r0, synthJobTableIndex@sda21(r13) /* 8039A8EC 0039784C 54 A6 C2 3E */ srwi r6, r5, 8 /* 8039A8F0 00397850 3C A0 80 55 */ lis r5, lbl_805508A4@ha /* 8039A8F4 00397854 2C 04 00 01 */ cmpwi r4, 1 @@ -2098,12 +2139,12 @@ synthStartSynthJobHandling: /* 8039AA48 003979A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8039AA4C 003979AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8039AA50 003979B0 7C 7F 1B 78 */ mr r31, r3 -/* 8039AA54 003979B4 80 0D AE 88 */ lwz r0, lbl_805A9A48@sda21(r13) -/* 8039AA58 003979B8 80 CD AE 8C */ lwz r6, lbl_805A9A4C@sda21(r13) +/* 8039AA54 003979B4 80 0D AE 88 */ lwz r0, synthRealTime@sda21(r13) +/* 8039AA58 003979B8 80 CD AE 8C */ lwz r6, synthRealTime+4@sda21(r13) /* 8039AA5C 003979BC 90 C3 00 28 */ stw r6, 0x28(r3) /* 8039AA60 003979C0 90 03 00 24 */ stw r0, 0x24(r3) -/* 8039AA64 003979C4 80 0D AE 88 */ lwz r0, lbl_805A9A48@sda21(r13) -/* 8039AA68 003979C8 80 CD AE 8C */ lwz r6, lbl_805A9A4C@sda21(r13) +/* 8039AA64 003979C4 80 0D AE 88 */ lwz r0, synthRealTime@sda21(r13) +/* 8039AA68 003979C8 80 CD AE 8C */ lwz r6, synthRealTime+4@sda21(r13) /* 8039AA6C 003979CC 90 C3 00 30 */ stw r6, 0x30(r3) /* 8039AA70 003979D0 90 03 00 2C */ stw r0, 0x2c(r3) /* 8039AA74 003979D4 4B FF FE 75 */ bl synthAddJob @@ -2165,7 +2206,7 @@ synthHandle: /* 8039AB30 00397A90 28 00 00 00 */ cmplwi r0, 0 /* 8039AB34 00397A94 41 82 04 CC */ beq lbl_8039B000 /* 8039AB38 00397A98 48 00 BF ED */ bl sub_803a6b24 -/* 8039AB3C 00397A9C 88 0D AE 49 */ lbz r0, lbl_805A9A09@sda21(r13) +/* 8039AB3C 00397A9C 88 0D AE 49 */ lbz r0, synthJobTableIndex@sda21(r13) /* 8039AB40 00397AA0 3B DF 0A 94 */ addi r30, r31, 0xa94 /* 8039AB44 00397AA4 3B 40 00 FF */ li r26, 0xff /* 8039AB48 00397AA8 1C 00 00 0C */ mulli r0, r0, 0xc @@ -2176,7 +2217,7 @@ lbl_8039AB58: /* 8039AB58 00397AB8 83 63 00 00 */ lwz r27, 0(r3) /* 8039AB5C 00397ABC 9B 43 00 09 */ stb r26, 9(r3) /* 8039AB60 00397AC0 88 63 00 08 */ lbz r3, 8(r3) -/* 8039AB64 00397AC4 80 AD AE 78 */ lwz r5, lbl_805A9A38@sda21(r13) +/* 8039AB64 00397AC4 80 AD AE 78 */ lwz r5, synthVoice@sda21(r13) /* 8039AB68 00397AC8 1C 83 04 04 */ mulli r4, r3, 0x404 /* 8039AB6C 00397ACC 38 04 01 1C */ addi r0, r4, 0x11c /* 8039AB70 00397AD0 7C 05 00 AE */ lbzx r0, r5, r0 @@ -2198,7 +2239,7 @@ lbl_8039ABA0: /* 8039ABA4 00397B04 38 00 00 FF */ li r0, 0xff /* 8039ABA8 00397B08 98 03 00 09 */ stb r0, 9(r3) /* 8039ABAC 00397B0C 8B 43 00 08 */ lbz r26, 8(r3) -/* 8039ABB0 00397B10 80 AD AE 78 */ lwz r5, lbl_805A9A38@sda21(r13) +/* 8039ABB0 00397B10 80 AD AE 78 */ lwz r5, synthVoice@sda21(r13) /* 8039ABB4 00397B14 1C 9A 04 04 */ mulli r4, r26, 0x404 /* 8039ABB8 00397B18 38 04 01 1C */ addi r0, r4, 0x11c /* 8039ABBC 00397B1C 7C 05 00 AE */ lbzx r0, r5, r0 @@ -2307,7 +2348,7 @@ lbl_8039AD40: /* 8039AD40 00397CA0 83 63 00 00 */ lwz r27, 0(r3) /* 8039AD44 00397CA4 9B 43 00 09 */ stb r26, 9(r3) /* 8039AD48 00397CA8 88 63 00 08 */ lbz r3, 8(r3) -/* 8039AD4C 00397CAC 80 AD AE 78 */ lwz r5, lbl_805A9A38@sda21(r13) +/* 8039AD4C 00397CAC 80 AD AE 78 */ lwz r5, synthVoice@sda21(r13) /* 8039AD50 00397CB0 1C 83 04 04 */ mulli r4, r3, 0x404 /* 8039AD54 00397CB4 38 04 01 1C */ addi r0, r4, 0x11c /* 8039AD58 00397CB8 7C 05 00 AE */ lbzx r0, r5, r0 @@ -2319,24 +2360,24 @@ lbl_8039AD68: lbl_8039AD6C: /* 8039AD6C 00397CCC 28 03 00 00 */ cmplwi r3, 0 /* 8039AD70 00397CD0 40 82 FF D0 */ bne lbl_8039AD40 -/* 8039AD74 00397CD4 88 6D AE 49 */ lbz r3, lbl_805A9A09@sda21(r13) +/* 8039AD74 00397CD4 88 6D AE 49 */ lbz r3, synthJobTableIndex@sda21(r13) /* 8039AD78 00397CD8 38 00 00 00 */ li r0, 0 /* 8039AD7C 00397CDC 90 1D 00 00 */ stw r0, 0(r29) /* 8039AD80 00397CE0 38 03 00 01 */ addi r0, r3, 1 /* 8039AD84 00397CE4 54 00 06 FE */ clrlwi r0, r0, 0x1b -/* 8039AD88 00397CE8 98 0D AE 49 */ stb r0, lbl_805A9A09@sda21(r13) +/* 8039AD88 00397CE8 98 0D AE 49 */ stb r0, synthJobTableIndex@sda21(r13) /* 8039AD8C 00397CEC 48 01 84 09 */ bl hwGetTimeOffset /* 8039AD90 00397CF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8039AD94 00397CF4 40 82 02 50 */ bne lbl_8039AFE4 -/* 8039AD98 00397CF8 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) -/* 8039AD9C 00397CFC 80 0D AE 6C */ lwz r0, lbl_805A9A2C@sda21(r13) +/* 8039AD98 00397CF8 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) +/* 8039AD9C 00397CFC 80 0D AE 6C */ lwz r0, synthMasterFaderPauseActiveFlags@sda21(r13) /* 8039ADA0 00397D00 7C 60 03 79 */ or. r0, r3, r0 /* 8039ADA4 00397D04 41 82 01 48 */ beq lbl_8039AEEC /* 8039ADA8 00397D08 3A 9F 04 54 */ addi r20, r31, 0x454 /* 8039ADAC 00397D0C 3A A0 00 00 */ li r21, 0 /* 8039ADB0 00397D10 3A C0 00 01 */ li r22, 1 lbl_8039ADB4: -/* 8039ADB4 00397D14 80 0D AE 70 */ lwz r0, lbl_805A9A30@sda21(r13) +/* 8039ADB4 00397D14 80 0D AE 70 */ lwz r0, synthMasterFaderActiveFlags@sda21(r13) /* 8039ADB8 00397D18 7C 00 B0 39 */ and. r0, r0, r22 /* 8039ADBC 00397D1C 41 82 00 B4 */ beq lbl_8039AE70 /* 8039ADC0 00397D20 C0 74 00 04 */ lfs f3, 4(r20) @@ -2381,15 +2422,15 @@ lbl_8039AE44: /* 8039AE4C 00397DAC 38 A0 00 00 */ li r5, 0 /* 8039AE50 00397DB0 4B FF B2 19 */ bl seqMute lbl_8039AE54: -/* 8039AE54 00397DB4 80 0D AE 70 */ lwz r0, lbl_805A9A30@sda21(r13) +/* 8039AE54 00397DB4 80 0D AE 70 */ lwz r0, synthMasterFaderActiveFlags@sda21(r13) /* 8039AE58 00397DB8 7C 00 B0 79 */ andc. r0, r0, r22 -/* 8039AE5C 00397DBC 90 0D AE 70 */ stw r0, lbl_805A9A30@sda21(r13) +/* 8039AE5C 00397DBC 90 0D AE 70 */ stw r0, synthMasterFaderActiveFlags@sda21(r13) /* 8039AE60 00397DC0 40 82 00 10 */ bne lbl_8039AE70 -/* 8039AE64 00397DC4 80 0D AE 6C */ lwz r0, lbl_805A9A2C@sda21(r13) +/* 8039AE64 00397DC4 80 0D AE 6C */ lwz r0, synthMasterFaderPauseActiveFlags@sda21(r13) /* 8039AE68 00397DC8 28 00 00 00 */ cmplwi r0, 0 /* 8039AE6C 00397DCC 41 82 00 80 */ beq lbl_8039AEEC lbl_8039AE70: -/* 8039AE70 00397DD0 80 6D AE 6C */ lwz r3, lbl_805A9A2C@sda21(r13) +/* 8039AE70 00397DD0 80 6D AE 6C */ lwz r3, synthMasterFaderPauseActiveFlags@sda21(r13) /* 8039AE74 00397DD4 7C 60 B0 39 */ and. r0, r3, r22 /* 8039AE78 00397DD8 41 82 00 60 */ beq lbl_8039AED8 /* 8039AE7C 00397DDC C0 74 00 18 */ lfs f3, 0x18(r20) @@ -2410,9 +2451,9 @@ lbl_8039AE70: /* 8039AEB8 00397E18 7C 60 B0 79 */ andc. r0, r3, r22 /* 8039AEBC 00397E1C C0 14 00 18 */ lfs f0, 0x18(r20) /* 8039AEC0 00397E20 D0 14 00 14 */ stfs f0, 0x14(r20) -/* 8039AEC4 00397E24 90 0D AE 6C */ stw r0, lbl_805A9A2C@sda21(r13) +/* 8039AEC4 00397E24 90 0D AE 6C */ stw r0, synthMasterFaderPauseActiveFlags@sda21(r13) /* 8039AEC8 00397E28 40 82 00 10 */ bne lbl_8039AED8 -/* 8039AECC 00397E2C 80 0D AE 70 */ lwz r0, lbl_805A9A30@sda21(r13) +/* 8039AECC 00397E2C 80 0D AE 70 */ lwz r0, synthMasterFaderActiveFlags@sda21(r13) /* 8039AED0 00397E30 28 00 00 00 */ cmplwi r0, 0 /* 8039AED4 00397E34 41 82 00 18 */ beq lbl_8039AEEC lbl_8039AED8: @@ -2427,10 +2468,10 @@ lbl_8039AEEC: /* 8039AEF4 00397E54 3A FF 0C 54 */ addi r23, r31, 0xc54 /* 8039AEF8 00397E58 3A DF 0C 74 */ addi r22, r31, 0xc74 /* 8039AEFC 00397E5C 3A 80 00 00 */ li r20, 0 -/* 8039AF00 00397E60 3B 6D AE 64 */ addi r27, r13, lbl_805A9A24@sda21 -/* 8039AF04 00397E64 3B 8D AE 5C */ addi r28, r13, lbl_805A9A1C@sda21 -/* 8039AF08 00397E68 3B ED AE 54 */ addi r31, r13, lbl_805A9A14@sda21 -/* 8039AF0C 00397E6C 3B 0D AE 4C */ addi r24, r13, lbl_805A9A0C@sda21 +/* 8039AF00 00397E60 3B 6D AE 64 */ addi r27, r13, synthAuxAMIDI@sda21 +/* 8039AF04 00397E64 3B 8D AE 5C */ addi r28, r13, synthAuxAMIDISet@sda21 +/* 8039AF08 00397E68 3B ED AE 54 */ addi r31, r13, synthAuxBMIDI@sda21 +/* 8039AF0C 00397E6C 3B 0D AE 4C */ addi r24, r13, synthAuxBMidiSet@sda21 lbl_8039AF10: /* 8039AF10 00397E70 88 1B 00 00 */ lbz r0, 0(r27) /* 8039AF14 00397E74 28 00 00 FF */ cmplwi r0, 0xff @@ -2491,12 +2532,12 @@ lbl_8039AFB8: /* 8039AFE0 00397F40 41 80 FF 30 */ blt lbl_8039AF10 lbl_8039AFE4: /* 8039AFE4 00397F44 48 01 8F 21 */ bl nullsub_59 -/* 8039AFE8 00397F48 80 6D AE 8C */ lwz r3, lbl_805A9A4C@sda21(r13) -/* 8039AFEC 00397F4C 80 0D AE 88 */ lwz r0, lbl_805A9A48@sda21(r13) +/* 8039AFE8 00397F48 80 6D AE 8C */ lwz r3, synthRealTime+4@sda21(r13) +/* 8039AFEC 00397F4C 80 0D AE 88 */ lwz r0, synthRealTime@sda21(r13) /* 8039AFF0 00397F50 7C 63 C8 14 */ addc r3, r3, r25 /* 8039AFF4 00397F54 7C 00 01 94 */ addze r0, r0 -/* 8039AFF8 00397F58 90 6D AE 8C */ stw r3, lbl_805A9A4C@sda21(r13) -/* 8039AFFC 00397F5C 90 0D AE 88 */ stw r0, lbl_805A9A48@sda21(r13) +/* 8039AFF8 00397F58 90 6D AE 8C */ stw r3, synthRealTime+4@sda21(r13) +/* 8039AFFC 00397F5C 90 0D AE 88 */ stw r0, synthRealTime@sda21(r13) lbl_8039B000: /* 8039B000 00397F60 39 61 00 50 */ addi r11, r1, 0x50 /* 8039B004 00397F64 4B FE EA A9 */ bl _restgpr_20 @@ -2529,7 +2570,7 @@ synthFXStart: /* 8039B050 00397FB0 7C 08 02 A6 */ mflr r0 /* 8039B054 00397FB4 90 01 00 44 */ stw r0, 0x44(r1) /* 8039B058 00397FB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8039B05C 00397FBC 4B FE EA 21 */ bl sub_80389a7c +/* 8039B05C 00397FBC 4B FE EA 21 */ bl _savegpr_27 /* 8039B060 00397FC0 7C 9B 23 78 */ mr r27, r4 /* 8039B064 00397FC4 7C BC 2B 78 */ mr r28, r5 /* 8039B068 00397FC8 7C DD 33 78 */ mr r29, r6 @@ -2595,7 +2636,7 @@ synthFXSetCtrl: /* 8039B140 003980A0 48 00 00 88 */ b lbl_8039B1C8 lbl_8039B144: /* 8039B144 003980A4 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8039B148 003980A8 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 8039B148 003980A8 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 8039B14C 003980AC 1F A4 04 04 */ mulli r29, r4, 0x404 /* 8039B150 003980B0 7C E0 EA 14 */ add r7, r0, r29 /* 8039B154 003980B4 80 07 00 F4 */ lwz r0, 0xf4(r7) @@ -2622,7 +2663,7 @@ lbl_8039B19C: /* 8039B1A4 00398104 7F E6 FB 78 */ mr r6, r31 /* 8039B1A8 00398108 48 01 5F 49 */ bl inpSetMidiCtrl lbl_8039B1AC: -/* 8039B1AC 0039810C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039B1AC 0039810C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039B1B0 00398110 38 1D 00 EC */ addi r0, r29, 0xec /* 8039B1B4 00398114 3B 80 00 01 */ li r28, 1 /* 8039B1B8 00398118 7C 63 00 2E */ lwzx r3, r3, r0 @@ -2661,7 +2702,7 @@ synthFXSetCtrl14: /* 8039B224 00398184 48 00 00 88 */ b lbl_8039B2AC lbl_8039B228: /* 8039B228 00398188 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8039B22C 0039818C 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 8039B22C 0039818C 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 8039B230 00398190 1F A4 04 04 */ mulli r29, r4, 0x404 /* 8039B234 00398194 7C E0 EA 14 */ add r7, r0, r29 /* 8039B238 00398198 80 07 00 F4 */ lwz r0, 0xf4(r7) @@ -2688,7 +2729,7 @@ lbl_8039B280: /* 8039B288 003981E8 7F E6 FB 78 */ mr r6, r31 /* 8039B28C 003981EC 48 01 64 6D */ bl inpSetMidiCtrl14 lbl_8039B290: -/* 8039B290 003981F0 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039B290 003981F0 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039B294 003981F4 38 1D 00 EC */ addi r0, r29, 0xec /* 8039B298 003981F8 3B 80 00 01 */ li r28, 1 /* 8039B29C 003981FC 7C 63 00 2E */ lwzx r3, r3, r0 @@ -2755,14 +2796,14 @@ synthSendKeyOff: /* 8039B36C 003982CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8039B370 003982D0 93 C1 00 08 */ stw r30, 8(r1) /* 8039B374 003982D4 3B C0 00 00 */ li r30, 0 -/* 8039B378 003982D8 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 8039B378 003982D8 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 8039B37C 003982DC 28 00 00 00 */ cmplwi r0, 0 /* 8039B380 003982E0 41 82 00 4C */ beq lbl_8039B3CC /* 8039B384 003982E4 48 00 C8 25 */ bl vidGetInternalId /* 8039B388 003982E8 48 00 00 38 */ b lbl_8039B3C0 lbl_8039B38C: /* 8039B38C 003982EC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8039B390 003982F0 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039B390 003982F0 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039B394 003982F4 1F E0 04 04 */ mulli r31, r0, 0x404 /* 8039B398 003982F8 7C 84 FA 14 */ add r4, r4, r31 /* 8039B39C 003982FC 80 04 00 F4 */ lwz r0, 0xf4(r4) @@ -2772,7 +2813,7 @@ lbl_8039B38C: /* 8039B3AC 0039830C 48 00 B9 75 */ bl macSetExternalKeyoff /* 8039B3B0 00398310 3B C0 00 01 */ li r30, 1 lbl_8039B3B4: -/* 8039B3B4 00398314 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039B3B4 00398314 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039B3B8 00398318 38 1F 00 EC */ addi r0, r31, 0xec /* 8039B3BC 0039831C 7C 63 00 2E */ lwzx r3, r3, r0 lbl_8039B3C0: @@ -2796,7 +2837,7 @@ synthVolume: /* 8039B3F4 00398354 DB E1 00 40 */ stfd f31, 0x40(r1) /* 8039B3F8 00398358 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8039B3FC 0039835C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8039B400 00398360 4B FE E6 7D */ bl sub_80389a7c +/* 8039B400 00398360 4B FE E6 7D */ bl _savegpr_27 /* 8039B404 00398364 54 80 04 3F */ clrlwi. r0, r4, 0x10 /* 8039B408 00398368 7C 7B 1B 78 */ mr r27, r3 /* 8039B40C 0039836C 7C BD 2B 78 */ mr r29, r5 @@ -2894,10 +2935,10 @@ lbl_8039B54C: /* 8039B554 003984B4 4B FF AB 15 */ bl seqMute lbl_8039B558: /* 8039B558 003984B8 38 00 00 01 */ li r0, 1 -/* 8039B55C 003984BC 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) +/* 8039B55C 003984BC 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) /* 8039B560 003984C0 7C 00 E0 30 */ slw r0, r0, r28 /* 8039B564 003984C4 7C 60 03 78 */ or r0, r3, r0 -/* 8039B568 003984C8 90 0D AE 70 */ stw r0, lbl_805A9A30@sda21(r13) +/* 8039B568 003984C8 90 0D AE 70 */ stw r0, synthMasterFaderActiveFlags@sda21(r13) lbl_8039B56C: /* 8039B56C 003984CC 3B 9C 00 01 */ addi r28, r28, 1 /* 8039B570 003984D0 3B BD 00 30 */ addi r29, r29, 0x30 @@ -2975,10 +3016,10 @@ lbl_8039B668: /* 8039B670 003985D0 4B FF A9 F9 */ bl seqMute lbl_8039B674: /* 8039B674 003985D4 38 00 00 01 */ li r0, 1 -/* 8039B678 003985D8 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) +/* 8039B678 003985D8 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) /* 8039B67C 003985DC 7C 00 E0 30 */ slw r0, r0, r28 /* 8039B680 003985E0 7C 60 03 78 */ or r0, r3, r0 -/* 8039B684 003985E4 90 0D AE 70 */ stw r0, lbl_805A9A30@sda21(r13) +/* 8039B684 003985E4 90 0D AE 70 */ stw r0, synthMasterFaderActiveFlags@sda21(r13) lbl_8039B688: /* 8039B688 003985E8 3B 9C 00 01 */ addi r28, r28, 1 /* 8039B68C 003985EC 3B BD 00 30 */ addi r29, r29, 0x30 @@ -3065,10 +3106,10 @@ lbl_8039B79C: /* 8039B7A4 00398704 4B FF A8 C5 */ bl seqMute lbl_8039B7A8: /* 8039B7A8 00398708 38 00 00 01 */ li r0, 1 -/* 8039B7AC 0039870C 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) +/* 8039B7AC 0039870C 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) /* 8039B7B0 00398710 7C 00 E0 30 */ slw r0, r0, r28 /* 8039B7B4 00398714 7C 60 03 78 */ or r0, r3, r0 -/* 8039B7B8 00398718 90 0D AE 70 */ stw r0, lbl_805A9A30@sda21(r13) +/* 8039B7B8 00398718 90 0D AE 70 */ stw r0, synthMasterFaderActiveFlags@sda21(r13) lbl_8039B7BC: /* 8039B7BC 0039871C 3B 9C 00 01 */ addi r28, r28, 1 /* 8039B7C0 00398720 3B BD 00 30 */ addi r29, r29, 0x30 @@ -3152,10 +3193,10 @@ lbl_8039B8D8: /* 8039B8E0 00398840 4B FF A7 89 */ bl seqMute lbl_8039B8E4: /* 8039B8E4 00398844 38 00 00 01 */ li r0, 1 -/* 8039B8E8 00398848 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) +/* 8039B8E8 00398848 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) /* 8039B8EC 0039884C 7C 00 F8 30 */ slw r0, r0, r31 /* 8039B8F0 00398850 7C 60 03 78 */ or r0, r3, r0 -/* 8039B8F4 00398854 90 0D AE 70 */ stw r0, lbl_805A9A30@sda21(r13) +/* 8039B8F4 00398854 90 0D AE 70 */ stw r0, synthMasterFaderActiveFlags@sda21(r13) lbl_8039B8F8: /* 8039B8F8 00398858 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8039B8FC 0039885C 39 61 00 40 */ addi r11, r1, 0x40 @@ -3177,7 +3218,7 @@ synthIsFadeOutActive: /* 8039B930 00398890 28 00 00 04 */ cmplwi r0, 4 /* 8039B934 00398894 41 82 00 30 */ beq lbl_8039B964 /* 8039B938 00398898 38 00 00 01 */ li r0, 1 -/* 8039B93C 0039889C 80 6D AE 70 */ lwz r3, lbl_805A9A30@sda21(r13) +/* 8039B93C 0039889C 80 6D AE 70 */ lwz r3, synthMasterFaderActiveFlags@sda21(r13) /* 8039B940 003988A0 7C 00 28 30 */ slw r0, r0, r5 /* 8039B944 003988A4 7C 60 00 39 */ and. r0, r3, r0 /* 8039B948 003988A8 41 82 00 1C */ beq lbl_8039B964 @@ -3193,7 +3234,7 @@ lbl_8039B964: .global synthSetMusicVolumeType synthSetMusicVolumeType: -/* 8039B96C 003988CC 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 8039B96C 003988CC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 8039B970 003988D0 28 00 00 00 */ cmplwi r0, 0 /* 8039B974 003988D4 4D 82 00 20 */ beqlr /* 8039B978 003988D8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3227,7 +3268,7 @@ lbl_8039B9D0: /* 8039B9D8 00398938 48 00 00 60 */ b lbl_8039BA38 lbl_8039B9DC: /* 8039B9DC 0039893C 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 8039B9E0 00398940 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 8039B9E0 00398940 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 8039B9E4 00398944 1F E3 04 04 */ mulli r31, r3, 0x404 /* 8039B9E8 00398948 7C 80 FA 14 */ add r4, r0, r31 /* 8039B9EC 0039894C 88 04 01 1C */ lbz r0, 0x11c(r4) @@ -3235,7 +3276,7 @@ lbl_8039B9DC: /* 8039B9F4 00398954 40 82 00 50 */ bne lbl_8039BA44 /* 8039B9F8 00398958 48 01 85 31 */ bl hwGetVirtualSampleID /* 8039B9FC 0039895C 48 00 E2 D9 */ bl vsSampleEndNotify -/* 8039BA00 00398960 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 8039BA00 00398960 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 8039BA04 00398964 7C 60 FA 14 */ add r3, r0, r31 /* 8039BA08 00398968 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8039BA0C 0039896C 7C 1D 00 40 */ cmplw r29, r0 @@ -3248,7 +3289,7 @@ lbl_8039BA1C: /* 8039BA24 00398984 48 00 00 20 */ b lbl_8039BA44 lbl_8039BA28: /* 8039BA28 00398988 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 8039BA2C 0039898C 48 00 E0 61 */ bl sub_803a9a8c +/* 8039BA2C 0039898C 48 00 E0 61 */ bl vsSampleStartNotify /* 8039BA30 00398990 7C 7E 1B 78 */ mr r30, r3 /* 8039BA34 00398994 48 00 00 10 */ b lbl_8039BA44 lbl_8039BA38: @@ -3280,14 +3321,14 @@ synthInit: /* 8039BA8C 003989EC 38 00 18 00 */ li r0, 0x1800 /* 8039BA90 003989F0 38 9F 00 00 */ addi r4, r31, 0 /* 8039BA94 003989F4 90 7F 02 40 */ stw r3, 0x240(r31) -/* 8039BA98 003989F8 90 AD AE 8C */ stw r5, lbl_805A9A4C@sda21(r13) +/* 8039BA98 003989F8 90 AD AE 8C */ stw r5, synthRealTime+4@sda21(r13) /* 8039BA9C 003989FC 7D C3 73 78 */ mr r3, r14 -/* 8039BAA0 00398A00 90 AD AE 88 */ stw r5, lbl_805A9A48@sda21(r13) +/* 8039BAA0 00398A00 90 AD AE 88 */ stw r5, synthRealTime@sda21(r13) /* 8039BAA4 00398A04 90 04 02 00 */ stw r0, 0x200(r4) -/* 8039BAA8 00398A08 90 AD AE 74 */ stw r5, lbl_805A9A34@sda21(r13) -/* 8039BAAC 00398A0C 90 AD AE 7C */ stw r5, lbl_805A9A3C@sda21(r13) +/* 8039BAA8 00398A08 90 AD AE 74 */ stw r5, synthFlags@sda21(r13) +/* 8039BAAC 00398A0C 90 AD AE 7C */ stw r5, synthMessageCallback@sda21(r13) /* 8039BAB0 00398A10 48 01 96 85 */ bl salMalloc -/* 8039BAB4 00398A14 90 6D AE 78 */ stw r3, lbl_805A9A38@sda21(r13) +/* 8039BAB4 00398A14 90 6D AE 78 */ stw r3, synthVoice@sda21(r13) /* 8039BAB8 00398A18 7D C5 73 78 */ mr r5, r14 /* 8039BABC 00398A1C 38 80 00 00 */ li r4, 0 /* 8039BAC0 00398A20 4B C6 78 E9 */ bl memset @@ -3298,7 +3339,7 @@ synthInit: /* 8039BAD4 00398A34 28 0F 00 00 */ cmplwi r15, 0 /* 8039BAD8 00398A38 40 81 01 E8 */ ble lbl_8039BCC0 lbl_8039BADC: -/* 8039BADC 00398A3C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BADC 00398A3C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BAE0 00398A40 38 05 00 F4 */ addi r0, r5, 0xf4 /* 8039BAE4 00398A44 38 80 FF FF */ li r4, -1 /* 8039BAE8 00398A48 39 25 01 14 */ addi r9, r5, 0x114 @@ -3306,7 +3347,7 @@ lbl_8039BADC: /* 8039BAF0 00398A50 38 80 00 00 */ li r4, 0 /* 8039BAF4 00398A54 39 05 01 10 */ addi r8, r5, 0x110 /* 8039BAF8 00398A58 38 65 01 0C */ addi r3, r5, 0x10c -/* 8039BAFC 00398A5C 81 4D AE 78 */ lwz r10, lbl_805A9A38@sda21(r13) +/* 8039BAFC 00398A5C 81 4D AE 78 */ lwz r10, synthVoice@sda21(r13) /* 8039BB00 00398A60 38 E5 01 21 */ addi r7, r5, 0x121 /* 8039BB04 00398A64 38 00 00 FF */ li r0, 0xff /* 8039BB08 00398A68 39 C5 01 54 */ addi r14, r5, 0x154 @@ -3320,7 +3361,7 @@ lbl_8039BADC: /* 8039BB28 00398A88 3A 85 01 80 */ addi r20, r5, 0x180 /* 8039BB2C 00398A8C 3A A5 01 70 */ addi r21, r5, 0x170 /* 8039BB30 00398A90 3A C5 01 84 */ addi r22, r5, 0x184 -/* 8039BB34 00398A94 81 2D AE 78 */ lwz r9, lbl_805A9A38@sda21(r13) +/* 8039BB34 00398A94 81 2D AE 78 */ lwz r9, synthVoice@sda21(r13) /* 8039BB38 00398A98 3A E5 01 74 */ addi r23, r5, 0x174 /* 8039BB3C 00398A9C 3B 05 01 A0 */ addi r24, r5, 0x1a0 /* 8039BB40 00398AA0 3B 25 01 A4 */ addi r25, r5, 0x1a4 @@ -3328,7 +3369,7 @@ lbl_8039BADC: /* 8039BB48 00398AA8 3B 45 01 B8 */ addi r26, r5, 0x1b8 /* 8039BB4C 00398AAC 3B 65 01 B9 */ addi r27, r5, 0x1b9 /* 8039BB50 00398AB0 3B 85 01 1C */ addi r28, r5, 0x11c -/* 8039BB54 00398AB4 81 0D AE 78 */ lwz r8, lbl_805A9A38@sda21(r13) +/* 8039BB54 00398AB4 81 0D AE 78 */ lwz r8, synthVoice@sda21(r13) /* 8039BB58 00398AB8 3B A5 01 1E */ addi r29, r5, 0x11e /* 8039BB5C 00398ABC 3B C5 01 04 */ addi r30, r5, 0x104 /* 8039BB60 00398AC0 39 85 01 93 */ addi r12, r5, 0x193 @@ -3336,53 +3377,53 @@ lbl_8039BADC: /* 8039BB68 00398AC8 39 65 01 C0 */ addi r11, r5, 0x1c0 /* 8039BB6C 00398ACC 39 45 01 C4 */ addi r10, r5, 0x1c4 /* 8039BB70 00398AD0 39 05 01 C6 */ addi r8, r5, 0x1c6 -/* 8039BB74 00398AD4 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BB74 00398AD4 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BB78 00398AD8 39 20 7F FF */ li r9, 0x7fff /* 8039BB7C 00398ADC 7C 03 39 AE */ stbx r0, r3, r7 /* 8039BB80 00398AE0 38 E5 01 CC */ addi r7, r5, 0x1cc -/* 8039BB84 00398AE4 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BB84 00398AE4 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BB88 00398AE8 7C 83 71 2E */ stwx r4, r3, r14 -/* 8039BB8C 00398AEC 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BB8C 00398AEC 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BB90 00398AF0 7C 83 79 AE */ stbx r4, r3, r15 -/* 8039BB94 00398AF4 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BB94 00398AF4 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BB98 00398AF8 7E 03 89 AE */ stbx r16, r3, r17 -/* 8039BB9C 00398AFC 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BB9C 00398AFC 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBA0 00398B00 7C 83 91 AE */ stbx r4, r3, r18 -/* 8039BBA4 00398B04 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBA4 00398B04 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBA8 00398B08 7E 63 A1 2E */ stwx r19, r3, r20 -/* 8039BBAC 00398B0C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBAC 00398B0C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBB0 00398B10 7E 63 A9 2E */ stwx r19, r3, r21 -/* 8039BBB4 00398B14 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBB4 00398B14 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBB8 00398B18 7C 83 B1 2E */ stwx r4, r3, r22 -/* 8039BBBC 00398B1C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBBC 00398B1C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBC0 00398B20 7C 83 B9 2E */ stwx r4, r3, r23 -/* 8039BBC4 00398B24 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBC4 00398B24 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBC8 00398B28 7C 83 C1 2E */ stwx r4, r3, r24 -/* 8039BBCC 00398B2C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBCC 00398B2C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBD0 00398B30 7C 83 C9 2E */ stwx r4, r3, r25 -/* 8039BBD4 00398B34 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBD4 00398B34 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBD8 00398B38 7C 83 D1 AE */ stbx r4, r3, r26 -/* 8039BBDC 00398B3C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBDC 00398B3C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBE0 00398B40 7C 83 D9 AE */ stbx r4, r3, r27 -/* 8039BBE4 00398B44 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBE4 00398B44 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBE8 00398B48 7C 83 E1 AE */ stbx r4, r3, r28 /* 8039BBEC 00398B4C 38 60 00 17 */ li r3, 0x17 -/* 8039BBF0 00398B50 81 CD AE 78 */ lwz r14, lbl_805A9A38@sda21(r13) +/* 8039BBF0 00398B50 81 CD AE 78 */ lwz r14, synthVoice@sda21(r13) /* 8039BBF4 00398B54 7C 6E E9 AE */ stbx r3, r14, r29 -/* 8039BBF8 00398B58 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BBF8 00398B58 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BBFC 00398B5C 7C 83 F1 AE */ stbx r4, r3, r30 /* 8039BC00 00398B60 38 60 00 01 */ li r3, 1 -/* 8039BC04 00398B64 81 CD AE 78 */ lwz r14, lbl_805A9A38@sda21(r13) +/* 8039BC04 00398B64 81 CD AE 78 */ lwz r14, synthVoice@sda21(r13) /* 8039BC08 00398B68 7C 6E 61 AE */ stbx r3, r14, r12 -/* 8039BC0C 00398B6C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BC0C 00398B6C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BC10 00398B70 7C 83 59 2E */ stwx r4, r3, r11 -/* 8039BC14 00398B74 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BC14 00398B74 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BC18 00398B78 7C 83 53 2E */ sthx r4, r3, r10 -/* 8039BC1C 00398B7C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BC1C 00398B7C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BC20 00398B80 7D 23 43 2E */ sthx r9, r3, r8 -/* 8039BC24 00398B84 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BC24 00398B84 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BC28 00398B88 7C 83 39 2E */ stwx r4, r3, r7 -/* 8039BC2C 00398B8C 81 0D AE 78 */ lwz r8, lbl_805A9A38@sda21(r13) +/* 8039BC2C 00398B8C 81 0D AE 78 */ lwz r8, synthVoice@sda21(r13) /* 8039BC30 00398B90 38 E5 01 D0 */ addi r7, r5, 0x1d0 /* 8039BC34 00398B94 38 65 01 D2 */ addi r3, r5, 0x1d2 /* 8039BC38 00398B98 3A 05 01 3C */ addi r16, r5, 0x13c @@ -3390,7 +3431,7 @@ lbl_8039BADC: /* 8039BC40 00398BA0 3A 20 64 00 */ li r17, 0x6400 /* 8039BC44 00398BA4 39 E5 01 31 */ addi r15, r5, 0x131 /* 8039BC48 00398BA8 39 C5 01 1F */ addi r14, r5, 0x11f -/* 8039BC4C 00398BAC 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 8039BC4C 00398BAC 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 8039BC50 00398BB0 39 85 00 08 */ addi r12, r5, 8 /* 8039BC54 00398BB4 39 65 00 09 */ addi r11, r5, 9 /* 8039BC58 00398BB8 39 45 00 14 */ addi r10, r5, 0x14 @@ -3398,25 +3439,25 @@ lbl_8039BADC: /* 8039BC60 00398BC0 39 05 00 15 */ addi r8, r5, 0x15 /* 8039BC64 00398BC4 38 E5 00 20 */ addi r7, r5, 0x20 /* 8039BC68 00398BC8 38 65 00 21 */ addi r3, r5, 0x21 -/* 8039BC6C 00398BCC 81 2D AE 78 */ lwz r9, lbl_805A9A38@sda21(r13) +/* 8039BC6C 00398BCC 81 2D AE 78 */ lwz r9, synthVoice@sda21(r13) /* 8039BC70 00398BD0 38 A5 04 04 */ addi r5, r5, 0x404 /* 8039BC74 00398BD4 7E 29 81 2E */ stwx r17, r9, r16 -/* 8039BC78 00398BD8 81 2D AE 78 */ lwz r9, lbl_805A9A38@sda21(r13) +/* 8039BC78 00398BD8 81 2D AE 78 */ lwz r9, synthVoice@sda21(r13) /* 8039BC7C 00398BDC 7C 89 79 AE */ stbx r4, r9, r15 -/* 8039BC80 00398BE0 81 2D AE 78 */ lwz r9, lbl_805A9A38@sda21(r13) +/* 8039BC80 00398BE0 81 2D AE 78 */ lwz r9, synthVoice@sda21(r13) /* 8039BC84 00398BE4 7C 89 71 AE */ stbx r4, r9, r14 -/* 8039BC88 00398BE8 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BC88 00398BE8 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BC8C 00398BEC 7C C4 61 AE */ stbx r6, r4, r12 -/* 8039BC90 00398BF0 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BC90 00398BF0 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BC94 00398BF4 7C 04 59 AE */ stbx r0, r4, r11 -/* 8039BC98 00398BF8 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BC98 00398BF8 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BC9C 00398BFC 7C C4 51 AE */ stbx r6, r4, r10 -/* 8039BCA0 00398C00 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BCA0 00398C00 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BCA4 00398C04 7C 04 41 AE */ stbx r0, r4, r8 -/* 8039BCA8 00398C08 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BCA8 00398C08 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BCAC 00398C0C 7C C4 39 AE */ stbx r6, r4, r7 /* 8039BCB0 00398C10 38 C6 00 01 */ addi r6, r6, 1 -/* 8039BCB4 00398C14 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 8039BCB4 00398C14 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 8039BCB8 00398C18 7C 04 19 AE */ stbx r0, r4, r3 /* 8039BCBC 00398C1C 42 00 FE 20 */ bdnz lbl_8039BADC lbl_8039BCC0: @@ -3481,9 +3522,9 @@ lbl_8039BCD4: /* 8039BDA4 00398D04 38 9F 04 54 */ addi r4, r31, 0x454 /* 8039BDA8 00398D08 38 A0 00 00 */ li r5, 0 /* 8039BDAC 00398D0C 38 00 00 01 */ li r0, 1 -/* 8039BDB0 00398D10 90 AD AE 70 */ stw r5, lbl_805A9A30@sda21(r13) +/* 8039BDB0 00398D10 90 AD AE 70 */ stw r5, synthMasterFaderActiveFlags@sda21(r13) /* 8039BDB4 00398D14 38 60 00 00 */ li r3, 0 -/* 8039BDB8 00398D18 90 AD AE 6C */ stw r5, lbl_805A9A2C@sda21(r13) +/* 8039BDB8 00398D18 90 AD AE 6C */ stw r5, synthMasterFaderPauseActiveFlags@sda21(r13) /* 8039BDBC 00398D1C 98 04 05 FD */ stb r0, 0x5fd(r4) /* 8039BDC0 00398D20 98 A4 04 7D */ stb r5, 0x47d(r4) /* 8039BDC4 00398D24 98 A4 04 AD */ stb r5, 0x4ad(r4) @@ -3501,12 +3542,12 @@ lbl_8039BCD4: /* 8039BDF4 00398D54 38 DF 0C 34 */ addi r6, r31, 0xc34 /* 8039BDF8 00398D58 38 9F 0C 74 */ addi r4, r31, 0xc74 /* 8039BDFC 00398D5C 38 00 00 FF */ li r0, 0xff -/* 8039BE00 00398D60 38 AD AE 64 */ addi r5, r13, lbl_805A9A24@sda21 -/* 8039BE04 00398D64 38 6D AE 54 */ addi r3, r13, lbl_805A9A14@sda21 +/* 8039BE00 00398D60 38 AD AE 64 */ addi r5, r13, synthAuxAMIDI@sda21 +/* 8039BE04 00398D64 38 6D AE 54 */ addi r3, r13, synthAuxBMIDI@sda21 /* 8039BE08 00398D68 91 1F 0C 34 */ stw r8, 0xc34(r31) -/* 8039BE0C 00398D6C 98 0D AE 64 */ stb r0, lbl_805A9A24@sda21(r13) +/* 8039BE0C 00398D6C 98 0D AE 64 */ stb r0, synthAuxAMIDI@sda21(r13) /* 8039BE10 00398D70 91 1F 0C 74 */ stw r8, 0xc74(r31) -/* 8039BE14 00398D74 98 0D AE 54 */ stb r0, lbl_805A9A14@sda21(r13) +/* 8039BE14 00398D74 98 0D AE 54 */ stb r0, synthAuxBMIDI@sda21(r13) /* 8039BE18 00398D78 99 07 00 01 */ stb r8, 1(r7) /* 8039BE1C 00398D7C 99 1F 0C 94 */ stb r8, 0xc94(r31) /* 8039BE20 00398D80 91 06 00 04 */ stw r8, 4(r6) @@ -3612,7 +3653,7 @@ lbl_8039BFA0: /* 8039BFA8 00398F08 41 80 FF 80 */ blt lbl_8039BF28 /* 8039BFAC 00398F0C 38 00 00 00 */ li r0, 0 /* 8039BFB0 00398F10 3C 60 80 3A */ lis r3, sub_8039b994@ha -/* 8039BFB4 00398F14 98 0D AE 49 */ stb r0, lbl_805A9A09@sda21(r13) +/* 8039BFB4 00398F14 98 0D AE 49 */ stb r0, synthJobTableIndex@sda21(r13) /* 8039BFB8 00398F18 38 63 B9 94 */ addi r3, r3, sub_8039b994@l /* 8039BFBC 00398F1C 48 01 72 01 */ bl hwSetMesgCallback /* 8039BFC0 00398F20 39 61 00 50 */ addi r11, r1, 0x50 @@ -3627,7 +3668,7 @@ synthExit: /* 8039BFD8 00398F38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8039BFDC 00398F3C 7C 08 02 A6 */ mflr r0 /* 8039BFE0 00398F40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8039BFE4 00398F44 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 8039BFE4 00398F44 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 8039BFE8 00398F48 48 01 91 75 */ bl salFree /* 8039BFEC 00398F4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039BFF0 00398F50 7C 08 03 A6 */ mtlr r0 diff --git a/asm/musyx/synth_vsamples.s b/asm/musyx/synth_vsamples.s index e2208790..15a7cf50 100644 --- a/asm/musyx/synth_vsamples.s +++ b/asm/musyx/synth_vsamples.s @@ -4,9 +4,9 @@ .global vsInit vsInit: -/* 803A99D0 003A6930 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A99D0 003A6930 3C 60 80 56 */ lis r3, vs@ha /* 803A99D4 003A6934 38 80 00 00 */ li r4, 0 -/* 803A99D8 003A6938 38 A3 E3 10 */ addi r5, r3, lbl_8055E310@l +/* 803A99D8 003A6938 38 A3 E3 10 */ addi r5, r3, vs@l /* 803A99DC 003A693C 38 00 00 02 */ li r0, 2 /* 803A99E0 003A6940 98 85 00 00 */ stb r4, 0(r5) /* 803A99E4 003A6944 38 60 00 FF */ li r3, 0xff @@ -46,15 +46,15 @@ lbl_803A99EC: /* 803A9A68 003A69C8 98 65 09 27 */ stb r3, 0x927(r5) /* 803A9A6C 003A69CC 38 A5 00 20 */ addi r5, r5, 0x20 /* 803A9A70 003A69D0 42 00 FF 7C */ bdnz lbl_803A99EC -/* 803A9A74 003A69D4 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9A74 003A69D4 3C 60 80 56 */ lis r3, vs@ha /* 803A9A78 003A69D8 38 00 00 00 */ li r0, 0 -/* 803A9A7C 003A69DC 38 63 E3 10 */ addi r3, r3, lbl_8055E310@l +/* 803A9A7C 003A69DC 38 63 E3 10 */ addi r3, r3, vs@l /* 803A9A80 003A69E0 B0 03 09 48 */ sth r0, 0x948(r3) /* 803A9A84 003A69E4 90 03 09 4C */ stw r0, 0x94c(r3) /* 803A9A88 003A69E8 4E 80 00 20 */ blr -.global sub_803a9a8c -sub_803a9a8c: +.global vsSampleStartNotify +vsSampleStartNotify: /* 803A9A8C 003A69EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A9A90 003A69F0 7C 08 02 A6 */ mflr r0 /* 803A9A94 003A69F4 39 20 00 00 */ li r9, 0 @@ -65,9 +65,9 @@ sub_803a9a8c: /* 803A9AA8 003A6A08 93 C1 00 18 */ stw r30, 0x18(r1) /* 803A9AAC 003A6A0C 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A9AB0 003A6A10 7C 7D 1B 78 */ mr r29, r3 -/* 803A9AB4 003A6A14 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9AB4 003A6A14 3C 60 80 56 */ lis r3, vs@ha /* 803A9AB8 003A6A18 93 81 00 10 */ stw r28, 0x10(r1) -/* 803A9ABC 003A6A1C 38 E3 E3 10 */ addi r7, r3, lbl_8055E310@l +/* 803A9ABC 003A6A1C 38 E3 E3 10 */ addi r7, r3, vs@l /* 803A9AC0 003A6A20 57 A6 06 3E */ clrlwi r6, r29, 0x18 /* 803A9AC4 003A6A24 48 00 00 44 */ b lbl_803A9B08 lbl_803A9AC8: @@ -93,9 +93,9 @@ lbl_803A9B08: /* 803A9B0C 003A6A6C 55 20 06 3E */ clrlwi r0, r9, 0x18 /* 803A9B10 003A6A70 7C 00 40 40 */ cmplw r0, r8 /* 803A9B14 003A6A74 41 80 FF B4 */ blt lbl_803A9AC8 -/* 803A9B18 003A6A78 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9B18 003A6A78 3C 60 80 56 */ lis r3, vs@ha /* 803A9B1C 003A6A7C 3B E0 00 00 */ li r31, 0 -/* 803A9B20 003A6A80 38 83 E3 10 */ addi r4, r3, lbl_8055E310@l +/* 803A9B20 003A6A80 38 83 E3 10 */ addi r4, r3, vs@l /* 803A9B24 003A6A84 48 00 00 40 */ b lbl_803A9B64 lbl_803A9B28: /* 803A9B28 003A6A88 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -104,9 +104,9 @@ lbl_803A9B28: /* 803A9B34 003A6A94 88 03 00 08 */ lbz r0, 8(r3) /* 803A9B38 003A6A98 28 00 00 00 */ cmplwi r0, 0 /* 803A9B3C 003A6A9C 40 82 00 24 */ bne lbl_803A9B60 -/* 803A9B40 003A6AA0 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9B40 003A6AA0 3C 60 80 56 */ lis r3, vs@ha /* 803A9B44 003A6AA4 38 80 00 01 */ li r4, 1 -/* 803A9B48 003A6AA8 38 63 E3 10 */ addi r3, r3, lbl_8055E310@l +/* 803A9B48 003A6AA8 38 63 E3 10 */ addi r3, r3, vs@l /* 803A9B4C 003A6AAC 38 00 00 00 */ li r0, 0 /* 803A9B50 003A6AB0 7C 63 2A 14 */ add r3, r3, r5 /* 803A9B54 003A6AB4 98 83 00 08 */ stb r4, 8(r3) @@ -120,9 +120,9 @@ lbl_803A9B64: /* 803A9B6C 003A6ACC 41 80 FF BC */ blt lbl_803A9B28 /* 803A9B70 003A6AD0 3B E0 00 FF */ li r31, 0xff lbl_803A9B74: -/* 803A9B74 003A6AD4 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9B74 003A6AD4 3C 60 80 56 */ lis r3, vs@ha /* 803A9B78 003A6AD8 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 803A9B7C 003A6ADC 38 63 E3 10 */ addi r3, r3, lbl_8055E310@l +/* 803A9B7C 003A6ADC 38 63 E3 10 */ addi r3, r3, vs@l /* 803A9B80 003A6AE0 57 BE 06 3E */ clrlwi r30, r29, 0x18 /* 803A9B84 003A6AE4 7C 63 F2 14 */ add r3, r3, r30 /* 803A9B88 003A6AE8 28 00 00 FF */ cmplwi r0, 0xff @@ -131,9 +131,9 @@ lbl_803A9B74: /* 803A9B94 003A6AF4 88 63 00 00 */ lbz r3, 0(r3) /* 803A9B98 003A6AF8 38 80 00 00 */ li r4, 0 /* 803A9B9C 003A6AFC 48 00 AF 71 */ bl aramGetStreamBufferAddress -/* 803A9BA0 003A6B00 3C 80 80 56 */ lis r4, lbl_8055E310@ha +/* 803A9BA0 003A6B00 3C 80 80 56 */ lis r4, vs@ha /* 803A9BA4 003A6B04 7C 60 1B 78 */ mr r0, r3 -/* 803A9BA8 003A6B08 38 A4 E3 10 */ addi r5, r4, lbl_8055E310@l +/* 803A9BA8 003A6B08 38 A4 E3 10 */ addi r5, r4, vs@l /* 803A9BAC 003A6B0C 7F C3 F3 78 */ mr r3, r30 /* 803A9BB0 003A6B10 80 A5 00 04 */ lwz r5, 4(r5) /* 803A9BB4 003A6B14 7C 04 03 78 */ mr r4, r0 @@ -141,9 +141,9 @@ lbl_803A9B74: /* 803A9BBC 003A6B1C 7F C3 F3 78 */ mr r3, r30 /* 803A9BC0 003A6B20 48 00 9A 11 */ bl hwGetSampleID /* 803A9BC4 003A6B24 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 803A9BC8 003A6B28 3C 80 80 56 */ lis r4, lbl_8055E310@ha +/* 803A9BC8 003A6B28 3C 80 80 56 */ lis r4, vs@ha /* 803A9BCC 003A6B2C 1F E0 00 24 */ mulli r31, r0, 0x24 -/* 803A9BD0 003A6B30 38 C4 E3 10 */ addi r6, r4, lbl_8055E310@l +/* 803A9BD0 003A6B30 38 C4 E3 10 */ addi r6, r4, vs@l /* 803A9BD4 003A6B34 7C 86 FA 14 */ add r4, r6, r31 /* 803A9BD8 003A6B38 B0 64 00 18 */ sth r3, 0x18(r4) /* 803A9BDC 003A6B3C 88 E6 00 00 */ lbz r7, 0(r6) @@ -173,14 +173,14 @@ lbl_803A9C28: /* 803A9C28 003A6B88 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803A9C2C 003A6B8C 7C 00 38 40 */ cmplw r0, r7 /* 803A9C30 003A6B90 40 82 FF B0 */ bne lbl_803A9BE0 -/* 803A9C34 003A6B94 3C 80 80 56 */ lis r4, lbl_8055E310@ha +/* 803A9C34 003A6B94 3C 80 80 56 */ lis r4, vs@ha /* 803A9C38 003A6B98 7F C3 F3 78 */ mr r3, r30 -/* 803A9C3C 003A6B9C 38 04 E3 10 */ addi r0, r4, lbl_8055E310@l +/* 803A9C3C 003A6B9C 38 04 E3 10 */ addi r0, r4, vs@l /* 803A9C40 003A6BA0 7F 80 FA 14 */ add r28, r0, r31 /* 803A9C44 003A6BA4 B4 BC 00 1A */ sthu r5, 0x1a(r28) -/* 803A9C48 003A6BA8 48 00 99 75 */ bl sub_803b35bc -/* 803A9C4C 003A6BAC 3C 80 80 56 */ lis r4, lbl_8055E310@ha -/* 803A9C50 003A6BB0 38 A4 E3 10 */ addi r5, r4, lbl_8055E310@l +/* 803A9C48 003A6BA8 48 00 99 75 */ bl hwGetSampleType +/* 803A9C4C 003A6BAC 3C 80 80 56 */ lis r4, vs@ha +/* 803A9C50 003A6BB0 38 A4 E3 10 */ addi r5, r4, vs@l /* 803A9C54 003A6BB4 7C 85 FA 14 */ add r4, r5, r31 /* 803A9C58 003A6BB8 98 64 00 0A */ stb r3, 0xa(r4) /* 803A9C5C 003A6BBC 9B A4 00 0B */ stb r29, 0xb(r4) @@ -228,9 +228,9 @@ vsSampleEndNotify: /* 803A9CE8 003A6C48 93 E1 00 0C */ stw r31, 0xc(r1) /* 803A9CEC 003A6C4C 93 C1 00 08 */ stw r30, 8(r1) /* 803A9CF0 003A6C50 41 82 00 74 */ beq lbl_803A9D64 -/* 803A9CF4 003A6C54 3C 80 80 56 */ lis r4, lbl_8055E310@ha +/* 803A9CF4 003A6C54 3C 80 80 56 */ lis r4, vs@ha /* 803A9CF8 003A6C58 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A9CFC 003A6C5C 38 A4 E3 10 */ addi r5, r4, lbl_8055E310@l +/* 803A9CFC 003A6C5C 38 A4 E3 10 */ addi r5, r4, vs@l /* 803A9D00 003A6C60 3B C5 09 08 */ addi r30, r5, 0x908 /* 803A9D04 003A6C64 7C 1E 00 AE */ lbzx r0, r30, r0 /* 803A9D08 003A6C68 28 00 00 FF */ cmplwi r0, 0xff @@ -249,9 +249,9 @@ vsSampleEndNotify: /* 803A9D3C 003A6C9C 7D 89 03 A6 */ mtctr r12 /* 803A9D40 003A6CA0 4E 80 04 21 */ bctrl lbl_803A9D44: -/* 803A9D44 003A6CA4 3C 60 80 56 */ lis r3, lbl_8055E310@ha +/* 803A9D44 003A6CA4 3C 60 80 56 */ lis r3, vs@ha /* 803A9D48 003A6CA8 38 A0 00 00 */ li r5, 0 -/* 803A9D4C 003A6CAC 38 03 E3 10 */ addi r0, r3, lbl_8055E310@l +/* 803A9D4C 003A6CAC 38 03 E3 10 */ addi r0, r3, vs@l /* 803A9D50 003A6CB0 38 60 00 FF */ li r3, 0xff /* 803A9D54 003A6CB4 7C 80 FA 14 */ add r4, r0, r31 /* 803A9D58 003A6CB8 98 A4 00 08 */ stb r5, 8(r4) diff --git a/asm/musyx/synthdata.s b/asm/musyx/synthdata.s index f5df3037..3cfdd235 100644 --- a/asm/musyx/synthdata.s +++ b/asm/musyx/synthdata.s @@ -1,5 +1,41 @@ .include "macros.inc" +.section .sbss +.balign 4 +"result$494": + .skip 0x4 +"result$768": + .skip 0x4 +"key$767": + .skip 0x8 +"result$760": + .skip 0x4 +"key$759": + .skip 0x8 +"sheader$733": + .skip 0x4 +"result$732": + .skip 0x4 +"result$714": + .skip 0x4 +"key$713": + .skip 0x8 +"main$712": + .skip 0x4 +"base$711": + .skip 0x4 +dataFXGroupNum: + .skip 0x2 +dataMacTotal: + .skip 0x2 +dataLayerNum: + .skip 0x2 +dataKeymapNum: + .skip 0x2 +dataCurveNum: + .skip 0x2 +dataSmpSDirNum: + .skip 0x6 .section .data, "wa" .global lbl_803F2FD8 lbl_803F2FD8: @@ -51,7 +87,7 @@ dataInsertKeymap: /* 803A0C4C 0039DBAC 7C 7E 1B 78 */ mr r30, r3 /* 803A0C50 0039DBB0 48 01 44 6D */ bl hwDisableIrq /* 803A0C54 0039DBB4 3C 60 80 55 */ lis r3, lbl_80552CF8@ha -/* 803A0C58 0039DBB8 A0 CD AE D6 */ lhz r6, lbl_805A9A96@sda21(r13) +/* 803A0C58 0039DBB8 A0 CD AE D6 */ lhz r6, dataKeymapNum@sda21(r13) /* 803A0C5C 0039DBBC 38 83 2C F8 */ addi r4, r3, lbl_80552CF8@l /* 803A0C60 0039DBC0 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 803A0C64 0039DBC4 38 E0 00 00 */ li r7, 0 @@ -135,9 +171,9 @@ lbl_803A0D74: /* 803A0D84 0039DCE4 38 A5 FF F8 */ addi r5, r5, -8 /* 803A0D88 0039DCE8 42 00 FF EC */ bdnz lbl_803A0D74 lbl_803A0D8C: -/* 803A0D8C 0039DCEC A0 6D AE D6 */ lhz r3, lbl_805A9A96@sda21(r13) +/* 803A0D8C 0039DCEC A0 6D AE D6 */ lhz r3, dataKeymapNum@sda21(r13) /* 803A0D90 0039DCF0 38 03 00 01 */ addi r0, r3, 1 -/* 803A0D94 0039DCF4 B0 0D AE D6 */ sth r0, lbl_805A9A96@sda21(r13) +/* 803A0D94 0039DCF4 B0 0D AE D6 */ sth r0, dataKeymapNum@sda21(r13) /* 803A0D98 0039DCF8 48 00 00 4C */ b lbl_803A0DE4 lbl_803A0D9C: /* 803A0D9C 0039DCFC 48 01 42 E9 */ bl hwEnableIrq @@ -153,9 +189,9 @@ lbl_803A0DA8: lbl_803A0DC0: /* 803A0DC0 0039DD20 28 06 01 00 */ cmplwi r6, 0x100 /* 803A0DC4 0039DD24 40 80 00 14 */ bge lbl_803A0DD8 -/* 803A0DC8 0039DD28 A0 6D AE D6 */ lhz r3, lbl_805A9A96@sda21(r13) +/* 803A0DC8 0039DD28 A0 6D AE D6 */ lhz r3, dataKeymapNum@sda21(r13) /* 803A0DCC 0039DD2C 38 03 00 01 */ addi r0, r3, 1 -/* 803A0DD0 0039DD30 B0 0D AE D6 */ sth r0, lbl_805A9A96@sda21(r13) +/* 803A0DD0 0039DD30 B0 0D AE D6 */ sth r0, dataKeymapNum@sda21(r13) /* 803A0DD4 0039DD34 48 00 00 10 */ b lbl_803A0DE4 lbl_803A0DD8: /* 803A0DD8 0039DD38 48 01 42 AD */ bl hwEnableIrq @@ -189,7 +225,7 @@ sub_803a0e24: /* 803A0E34 0039DD94 7C 7F 1B 78 */ mr r31, r3 /* 803A0E38 0039DD98 48 01 42 85 */ bl hwDisableIrq /* 803A0E3C 0039DD9C 3C 60 80 55 */ lis r3, lbl_80552CF8@ha -/* 803A0E40 0039DDA0 A0 CD AE D6 */ lhz r6, lbl_805A9A96@sda21(r13) +/* 803A0E40 0039DDA0 A0 CD AE D6 */ lhz r6, dataKeymapNum@sda21(r13) /* 803A0E44 0039DDA4 38 83 2C F8 */ addi r4, r3, lbl_80552CF8@l /* 803A0E48 0039DDA8 38 E0 00 00 */ li r7, 0 /* 803A0E4C 0039DDAC 57 E3 04 3E */ clrlwi r3, r31, 0x10 @@ -271,9 +307,9 @@ lbl_803A0F54: /* 803A0F64 0039DEC4 38 A5 00 08 */ addi r5, r5, 8 /* 803A0F68 0039DEC8 42 00 FF EC */ bdnz lbl_803A0F54 lbl_803A0F6C: -/* 803A0F6C 0039DECC A0 6D AE D6 */ lhz r3, lbl_805A9A96@sda21(r13) +/* 803A0F6C 0039DECC A0 6D AE D6 */ lhz r3, dataKeymapNum@sda21(r13) /* 803A0F70 0039DED0 38 03 FF FF */ addi r0, r3, -1 -/* 803A0F74 0039DED4 B0 0D AE D6 */ sth r0, lbl_805A9A96@sda21(r13) +/* 803A0F74 0039DED4 B0 0D AE D6 */ sth r0, dataKeymapNum@sda21(r13) /* 803A0F78 0039DED8 48 01 41 0D */ bl hwEnableIrq /* 803A0F7C 0039DEDC 38 60 00 01 */ li r3, 1 /* 803A0F80 0039DEE0 48 00 00 0C */ b lbl_803A0F8C @@ -300,7 +336,7 @@ dataInsertLayer: /* 803A0FC0 0039DF20 7C 7D 1B 78 */ mr r29, r3 /* 803A0FC4 0039DF24 48 01 40 F9 */ bl hwDisableIrq /* 803A0FC8 0039DF28 3C 60 80 55 */ lis r3, lbl_805534F8@ha -/* 803A0FCC 0039DF2C A0 ED AE D4 */ lhz r7, lbl_805A9A94@sda21(r13) +/* 803A0FCC 0039DF2C A0 ED AE D4 */ lhz r7, dataLayerNum@sda21(r13) /* 803A0FD0 0039DF30 38 83 34 F8 */ addi r4, r3, lbl_805534F8@l /* 803A0FD4 0039DF34 57 A0 04 3E */ clrlwi r0, r29, 0x10 /* 803A0FD8 0039DF38 39 00 00 00 */ li r8, 0 @@ -402,9 +438,9 @@ lbl_803A1128: /* 803A1140 0039E0A0 38 A5 FF F4 */ addi r5, r5, -12 /* 803A1144 0039E0A4 42 00 FF E4 */ bdnz lbl_803A1128 lbl_803A1148: -/* 803A1148 0039E0A8 A0 6D AE D4 */ lhz r3, lbl_805A9A94@sda21(r13) +/* 803A1148 0039E0A8 A0 6D AE D4 */ lhz r3, dataLayerNum@sda21(r13) /* 803A114C 0039E0AC 38 03 00 01 */ addi r0, r3, 1 -/* 803A1150 0039E0B0 B0 0D AE D4 */ sth r0, lbl_805A9A94@sda21(r13) +/* 803A1150 0039E0B0 B0 0D AE D4 */ sth r0, dataLayerNum@sda21(r13) /* 803A1154 0039E0B4 48 00 00 4C */ b lbl_803A11A0 lbl_803A1158: /* 803A1158 0039E0B8 48 01 3F 2D */ bl hwEnableIrq @@ -420,9 +456,9 @@ lbl_803A1164: lbl_803A117C: /* 803A117C 0039E0DC 28 07 01 00 */ cmplwi r7, 0x100 /* 803A1180 0039E0E0 40 80 00 14 */ bge lbl_803A1194 -/* 803A1184 0039E0E4 A0 6D AE D4 */ lhz r3, lbl_805A9A94@sda21(r13) +/* 803A1184 0039E0E4 A0 6D AE D4 */ lhz r3, dataLayerNum@sda21(r13) /* 803A1188 0039E0E8 38 03 00 01 */ addi r0, r3, 1 -/* 803A118C 0039E0EC B0 0D AE D4 */ sth r0, lbl_805A9A94@sda21(r13) +/* 803A118C 0039E0EC B0 0D AE D4 */ sth r0, dataLayerNum@sda21(r13) /* 803A1190 0039E0F0 48 00 00 10 */ b lbl_803A11A0 lbl_803A1194: /* 803A1194 0039E0F4 48 01 3E F1 */ bl hwEnableIrq @@ -458,7 +494,7 @@ dataRemoveLayer: /* 803A11F8 0039E158 7C 7F 1B 78 */ mr r31, r3 /* 803A11FC 0039E15C 48 01 3E C1 */ bl hwDisableIrq /* 803A1200 0039E160 3C 60 80 55 */ lis r3, lbl_805534F8@ha -/* 803A1204 0039E164 A0 CD AE D4 */ lhz r6, lbl_805A9A94@sda21(r13) +/* 803A1204 0039E164 A0 CD AE D4 */ lhz r6, dataLayerNum@sda21(r13) /* 803A1208 0039E168 38 83 34 F8 */ addi r4, r3, lbl_805534F8@l /* 803A120C 0039E16C 38 E0 00 00 */ li r7, 0 /* 803A1210 0039E170 57 E3 04 3E */ clrlwi r3, r31, 0x10 @@ -558,9 +594,9 @@ lbl_803A1358: /* 803A1370 0039E2D0 38 A5 00 0C */ addi r5, r5, 0xc /* 803A1374 0039E2D4 42 00 FF E4 */ bdnz lbl_803A1358 lbl_803A1378: -/* 803A1378 0039E2D8 A0 6D AE D4 */ lhz r3, lbl_805A9A94@sda21(r13) +/* 803A1378 0039E2D8 A0 6D AE D4 */ lhz r3, dataLayerNum@sda21(r13) /* 803A137C 0039E2DC 38 03 FF FF */ addi r0, r3, -1 -/* 803A1380 0039E2E0 B0 0D AE D4 */ sth r0, lbl_805A9A94@sda21(r13) +/* 803A1380 0039E2E0 B0 0D AE D4 */ sth r0, dataLayerNum@sda21(r13) /* 803A1384 0039E2E4 48 01 3D 01 */ bl hwEnableIrq /* 803A1388 0039E2E8 38 60 00 01 */ li r3, 1 /* 803A138C 0039E2EC 48 00 00 0C */ b lbl_803A1398 @@ -586,7 +622,7 @@ dataInsertCurve: /* 803A13C8 0039E328 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A13CC 0039E32C 48 01 3C F1 */ bl hwDisableIrq /* 803A13D0 0039E330 3C 60 80 55 */ lis r3, lbl_805540F8@ha -/* 803A13D4 0039E334 A0 CD AE D8 */ lhz r6, lbl_805A9A98@sda21(r13) +/* 803A13D4 0039E334 A0 CD AE D8 */ lhz r6, dataCurveNum@sda21(r13) /* 803A13D8 0039E338 38 83 40 F8 */ addi r4, r3, lbl_805540F8@l /* 803A13DC 0039E33C 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 803A13E0 0039E340 38 E0 00 00 */ li r7, 0 @@ -670,9 +706,9 @@ lbl_803A14F0: /* 803A1500 0039E460 38 A5 FF F8 */ addi r5, r5, -8 /* 803A1504 0039E464 42 00 FF EC */ bdnz lbl_803A14F0 lbl_803A1508: -/* 803A1508 0039E468 A0 6D AE D8 */ lhz r3, lbl_805A9A98@sda21(r13) +/* 803A1508 0039E468 A0 6D AE D8 */ lhz r3, dataCurveNum@sda21(r13) /* 803A150C 0039E46C 38 03 00 01 */ addi r0, r3, 1 -/* 803A1510 0039E470 B0 0D AE D8 */ sth r0, lbl_805A9A98@sda21(r13) +/* 803A1510 0039E470 B0 0D AE D8 */ sth r0, dataCurveNum@sda21(r13) /* 803A1514 0039E474 48 00 00 58 */ b lbl_803A156C lbl_803A1518: /* 803A1518 0039E478 48 01 3B 6D */ bl hwEnableIrq @@ -691,9 +727,9 @@ lbl_803A1524: lbl_803A1548: /* 803A1548 0039E4A8 28 06 08 00 */ cmplwi r6, 0x800 /* 803A154C 0039E4AC 40 80 00 14 */ bge lbl_803A1560 -/* 803A1550 0039E4B0 A0 6D AE D8 */ lhz r3, lbl_805A9A98@sda21(r13) +/* 803A1550 0039E4B0 A0 6D AE D8 */ lhz r3, dataCurveNum@sda21(r13) /* 803A1554 0039E4B4 38 03 00 01 */ addi r0, r3, 1 -/* 803A1558 0039E4B8 B0 0D AE D8 */ sth r0, lbl_805A9A98@sda21(r13) +/* 803A1558 0039E4B8 B0 0D AE D8 */ sth r0, dataCurveNum@sda21(r13) /* 803A155C 0039E4BC 48 00 00 10 */ b lbl_803A156C lbl_803A1560: /* 803A1560 0039E4C0 48 01 3B 25 */ bl hwEnableIrq @@ -728,7 +764,7 @@ dataRemoveKeymap: /* 803A15C0 0039E520 7C 7F 1B 78 */ mr r31, r3 /* 803A15C4 0039E524 48 01 3A F9 */ bl hwDisableIrq /* 803A15C8 0039E528 3C 60 80 55 */ lis r3, lbl_805540F8@ha -/* 803A15CC 0039E52C A0 CD AE D8 */ lhz r6, lbl_805A9A98@sda21(r13) +/* 803A15CC 0039E52C A0 CD AE D8 */ lhz r6, dataCurveNum@sda21(r13) /* 803A15D0 0039E530 38 83 40 F8 */ addi r4, r3, lbl_805540F8@l /* 803A15D4 0039E534 38 E0 00 00 */ li r7, 0 /* 803A15D8 0039E538 57 E3 04 3E */ clrlwi r3, r31, 0x10 @@ -810,9 +846,9 @@ lbl_803A16E0: /* 803A16F0 0039E650 38 A5 00 08 */ addi r5, r5, 8 /* 803A16F4 0039E654 42 00 FF EC */ bdnz lbl_803A16E0 lbl_803A16F8: -/* 803A16F8 0039E658 A0 6D AE D8 */ lhz r3, lbl_805A9A98@sda21(r13) +/* 803A16F8 0039E658 A0 6D AE D8 */ lhz r3, dataCurveNum@sda21(r13) /* 803A16FC 0039E65C 38 03 FF FF */ addi r0, r3, -1 -/* 803A1700 0039E660 B0 0D AE D8 */ sth r0, lbl_805A9A98@sda21(r13) +/* 803A1700 0039E660 B0 0D AE D8 */ sth r0, dataCurveNum@sda21(r13) /* 803A1704 0039E664 48 01 39 81 */ bl hwEnableIrq /* 803A1708 0039E668 38 60 00 01 */ li r3, 1 /* 803A170C 0039E66C 48 00 00 0C */ b lbl_803A1718 @@ -841,7 +877,7 @@ dataInsertSDir: /* 803A1754 0039E6B4 93 81 00 10 */ stw r28, 0x10(r1) /* 803A1758 0039E6B8 7C 7C 1B 78 */ mr r28, r3 /* 803A175C 0039E6BC 7F E3 FB 78 */ mr r3, r31 -/* 803A1760 0039E6C0 A0 CD AE DA */ lhz r6, lbl_805A9A9A@sda21(r13) +/* 803A1760 0039E6C0 A0 CD AE DA */ lhz r6, dataSmpSDirNum@sda21(r13) /* 803A1764 0039E6C4 48 00 00 0C */ b lbl_803A1770 lbl_803A1768: /* 803A1768 0039E6C8 38 63 00 0C */ addi r3, r3, 0xc @@ -872,7 +908,7 @@ lbl_803A17A8: /* 803A17BC 0039E71C 39 60 00 00 */ li r11, 0 /* 803A17C0 0039E720 48 00 00 88 */ b lbl_803A1848 lbl_803A17C4: -/* 803A17C4 0039E724 A1 0D AE DA */ lhz r8, lbl_805A9A9A@sda21(r13) +/* 803A17C4 0039E724 A1 0D AE DA */ lhz r8, dataSmpSDirNum@sda21(r13) /* 803A17C8 0039E728 55 63 2A F4 */ rlwinm r3, r11, 5, 0xb, 0x1a /* 803A17CC 0039E72C 7F E7 FB 78 */ mr r7, r31 /* 803A17D0 0039E730 39 40 00 00 */ li r10, 0 @@ -915,12 +951,12 @@ lbl_803A1848: /* 803A1848 0039E7A8 55 63 04 3E */ clrlwi r3, r11, 0x10 /* 803A184C 0039E7AC 7C 03 00 40 */ cmplw r3, r0 /* 803A1850 0039E7B0 41 80 FF 74 */ blt lbl_803A17C4 -/* 803A1854 0039E7B4 A0 8D AE DA */ lhz r4, lbl_805A9A9A@sda21(r13) +/* 803A1854 0039E7B4 A0 8D AE DA */ lhz r4, dataSmpSDirNum@sda21(r13) /* 803A1858 0039E7B8 3C 60 80 56 */ lis r3, lbl_805580F8@ha /* 803A185C 0039E7BC 38 63 80 F8 */ addi r3, r3, lbl_805580F8@l /* 803A1860 0039E7C0 1C A4 00 0C */ mulli r5, r4, 0xc /* 803A1864 0039E7C4 38 04 00 01 */ addi r0, r4, 1 -/* 803A1868 0039E7C8 B0 0D AE DA */ sth r0, lbl_805A9A9A@sda21(r13) +/* 803A1868 0039E7C8 B0 0D AE DA */ sth r0, dataSmpSDirNum@sda21(r13) /* 803A186C 0039E7CC 7F 83 29 2E */ stwx r28, r3, r5 /* 803A1870 0039E7D0 7C 63 2A 14 */ add r3, r3, r5 /* 803A1874 0039E7D4 B3 C3 00 08 */ sth r30, 8(r3) @@ -956,7 +992,7 @@ sub_803a18b4: /* 803A18D4 0039E834 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A18D8 0039E838 7C 7D 1B 78 */ mr r29, r3 /* 803A18DC 0039E83C 7F E3 FB 78 */ mr r3, r31 -/* 803A18E0 0039E840 A0 AD AE DA */ lhz r5, lbl_805A9A9A@sda21(r13) +/* 803A18E0 0039E840 A0 AD AE DA */ lhz r5, dataSmpSDirNum@sda21(r13) /* 803A18E4 0039E844 48 00 00 0C */ b lbl_803A18F0 lbl_803A18E8: /* 803A18E8 0039E848 38 63 00 0C */ addi r3, r3, 0xc @@ -1034,7 +1070,7 @@ lbl_803A19D8: /* 803A19D8 0039E938 38 A5 00 0C */ addi r5, r5, 0xc /* 803A19DC 0039E93C 39 29 00 01 */ addi r9, r9, 1 lbl_803A19E0: -/* 803A19E0 0039E940 A0 0D AE DA */ lhz r0, lbl_805A9A9A@sda21(r13) +/* 803A19E0 0039E940 A0 0D AE DA */ lhz r0, dataSmpSDirNum@sda21(r13) /* 803A19E4 0039E944 7C 09 00 00 */ cmpw r9, r0 /* 803A19E8 0039E948 41 80 FF 7C */ blt lbl_803A1964 lbl_803A19EC: @@ -1054,7 +1090,7 @@ lbl_803A1A10: /* 803A1A14 0039E974 28 00 FF FF */ cmplwi r0, 0xffff /* 803A1A18 0039E978 40 82 FF F0 */ bne lbl_803A1A08 /* 803A1A1C 0039E97C 38 FE 00 01 */ addi r7, r30, 1 -/* 803A1A20 0039E980 A0 CD AE DA */ lhz r6, lbl_805A9A9A@sda21(r13) +/* 803A1A20 0039E980 A0 CD AE DA */ lhz r6, dataSmpSDirNum@sda21(r13) /* 803A1A24 0039E984 1C 87 00 0C */ mulli r4, r7, 0xc /* 803A1A28 0039E988 3C 60 80 56 */ lis r3, lbl_805580F8@ha /* 803A1A2C 0039E98C 7C 07 30 00 */ cmpw r7, r6 @@ -1130,9 +1166,9 @@ lbl_803A1B20: /* 803A1B38 0039EA98 38 A5 00 0C */ addi r5, r5, 0xc /* 803A1B3C 0039EA9C 42 00 FF E4 */ bdnz lbl_803A1B20 lbl_803A1B40: -/* 803A1B40 0039EAA0 A0 6D AE DA */ lhz r3, lbl_805A9A9A@sda21(r13) +/* 803A1B40 0039EAA0 A0 6D AE DA */ lhz r3, dataSmpSDirNum@sda21(r13) /* 803A1B44 0039EAA4 38 03 FF FF */ addi r0, r3, -1 -/* 803A1B48 0039EAA8 B0 0D AE DA */ sth r0, lbl_805A9A9A@sda21(r13) +/* 803A1B48 0039EAA8 B0 0D AE DA */ sth r0, dataSmpSDirNum@sda21(r13) /* 803A1B4C 0039EAAC 48 01 35 39 */ bl hwEnableIrq /* 803A1B50 0039EAB0 38 60 00 01 */ li r3, 1 /* 803A1B54 0039EAB4 48 00 00 0C */ b lbl_803A1B60 @@ -1160,7 +1196,7 @@ sub_803a1b7c: /* 803A1B94 0039EAF4 38 A0 00 00 */ li r5, 0 /* 803A1B98 0039EAF8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803A1B9C 0039EAFC 3B E0 00 00 */ li r31, 0 -/* 803A1BA0 0039EB00 A0 0D AE DA */ lhz r0, lbl_805A9A9A@sda21(r13) +/* 803A1BA0 0039EB00 A0 0D AE DA */ lhz r0, dataSmpSDirNum@sda21(r13) /* 803A1BA4 0039EB04 7C 09 03 A6 */ mtctr r0 /* 803A1BA8 0039EB08 28 00 00 00 */ cmplwi r0, 0 /* 803A1BAC 0039EB0C 40 81 00 44 */ ble lbl_803A1BF0 @@ -1220,7 +1256,7 @@ sub_803a1c54: /* 803A1C60 0039EBC0 90 01 00 14 */ stw r0, 0x14(r1) /* 803A1C64 0039EBC4 38 84 80 F8 */ addi r4, r4, lbl_805580F8@l /* 803A1C68 0039EBC8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 803A1C6C 0039EBCC A0 AD AE DA */ lhz r5, lbl_805A9A9A@sda21(r13) +/* 803A1C6C 0039EBCC A0 AD AE DA */ lhz r5, dataSmpSDirNum@sda21(r13) /* 803A1C70 0039EBD0 7C A9 03 A6 */ mtctr r5 /* 803A1C74 0039EBD4 28 05 00 00 */ cmplwi r5, 0 /* 803A1C78 0039EBD8 40 81 00 60 */ ble lbl_803A1CD8 @@ -1275,7 +1311,7 @@ dataInsertFX: /* 803A1D14 0039EC74 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A1D18 0039EC78 7C 7D 1B 78 */ mr r29, r3 /* 803A1D1C 0039EC7C 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 803A1D20 0039EC80 A0 ED AE D0 */ lhz r7, lbl_805A9A90@sda21(r13) +/* 803A1D20 0039EC80 A0 ED AE D0 */ lhz r7, dataFXGroupNum@sda21(r13) /* 803A1D24 0039EC84 48 00 00 0C */ b lbl_803A1D30 lbl_803A1D28: /* 803A1D28 0039EC88 38 C6 00 08 */ addi r6, r6, 8 @@ -1292,7 +1328,7 @@ lbl_803A1D44: /* 803A1D4C 0039ECAC 28 07 00 80 */ cmplwi r7, 0x80 /* 803A1D50 0039ECB0 40 80 00 98 */ bge lbl_803A1DE8 /* 803A1D54 0039ECB4 48 01 33 69 */ bl hwDisableIrq -/* 803A1D58 0039ECB8 A0 0D AE D0 */ lhz r0, lbl_805A9A90@sda21(r13) +/* 803A1D58 0039ECB8 A0 0D AE D0 */ lhz r0, dataFXGroupNum@sda21(r13) /* 803A1D5C 0039ECBC 3C 80 80 56 */ lis r4, lbl_805586F8@ha /* 803A1D60 0039ECC0 38 84 86 F8 */ addi r4, r4, lbl_805586F8@l /* 803A1D64 0039ECC4 57 E5 04 3F */ clrlwi. r5, r31, 0x10 @@ -1326,9 +1362,9 @@ lbl_803A1DC4: /* 803A1DC8 0039ED28 3B DE 00 0A */ addi r30, r30, 0xa /* 803A1DCC 0039ED2C 42 00 FF F8 */ bdnz lbl_803A1DC4 lbl_803A1DD0: -/* 803A1DD0 0039ED30 A0 6D AE D0 */ lhz r3, lbl_805A9A90@sda21(r13) +/* 803A1DD0 0039ED30 A0 6D AE D0 */ lhz r3, dataFXGroupNum@sda21(r13) /* 803A1DD4 0039ED34 38 03 00 01 */ addi r0, r3, 1 -/* 803A1DD8 0039ED38 B0 0D AE D0 */ sth r0, lbl_805A9A90@sda21(r13) +/* 803A1DD8 0039ED38 B0 0D AE D0 */ sth r0, dataFXGroupNum@sda21(r13) /* 803A1DDC 0039ED3C 48 01 32 A9 */ bl hwEnableIrq /* 803A1DE0 0039ED40 38 60 00 01 */ li r3, 1 /* 803A1DE4 0039ED44 48 00 00 08 */ b lbl_803A1DEC @@ -1353,7 +1389,7 @@ sub_803a1e08: /* 803A1E1C 0039ED7C 38 84 86 F8 */ addi r4, r4, lbl_805586F8@l /* 803A1E20 0039ED80 93 E1 00 0C */ stw r31, 0xc(r1) /* 803A1E24 0039ED84 3B E0 00 00 */ li r31, 0 -/* 803A1E28 0039ED88 A0 AD AE D0 */ lhz r5, lbl_805A9A90@sda21(r13) +/* 803A1E28 0039ED88 A0 AD AE D0 */ lhz r5, dataFXGroupNum@sda21(r13) /* 803A1E2C 0039ED8C 48 00 00 0C */ b lbl_803A1E38 lbl_803A1E30: /* 803A1E30 0039ED90 38 84 00 08 */ addi r4, r4, 8 @@ -1368,7 +1404,7 @@ lbl_803A1E4C: /* 803A1E4C 0039EDAC 7C 1F 28 00 */ cmpw r31, r5 /* 803A1E50 0039EDB0 41 82 00 FC */ beq lbl_803A1F4C /* 803A1E54 0039EDB4 48 01 32 69 */ bl hwDisableIrq -/* 803A1E58 0039EDB8 A0 AD AE D0 */ lhz r5, lbl_805A9A90@sda21(r13) +/* 803A1E58 0039EDB8 A0 AD AE D0 */ lhz r5, dataFXGroupNum@sda21(r13) /* 803A1E5C 0039EDBC 38 DF 00 01 */ addi r6, r31, 1 /* 803A1E60 0039EDC0 3C 60 80 56 */ lis r3, lbl_805586F8@ha /* 803A1E64 0039EDC4 7C 06 28 00 */ cmpw r6, r5 @@ -1427,9 +1463,9 @@ lbl_803A1F1C: /* 803A1F2C 0039EE8C 38 A5 00 08 */ addi r5, r5, 8 /* 803A1F30 0039EE90 42 00 FF EC */ bdnz lbl_803A1F1C lbl_803A1F34: -/* 803A1F34 0039EE94 A0 6D AE D0 */ lhz r3, lbl_805A9A90@sda21(r13) +/* 803A1F34 0039EE94 A0 6D AE D0 */ lhz r3, dataFXGroupNum@sda21(r13) /* 803A1F38 0039EE98 38 03 FF FF */ addi r0, r3, -1 -/* 803A1F3C 0039EE9C B0 0D AE D0 */ sth r0, lbl_805A9A90@sda21(r13) +/* 803A1F3C 0039EE9C B0 0D AE D0 */ sth r0, dataFXGroupNum@sda21(r13) /* 803A1F40 0039EEA0 48 01 31 45 */ bl hwEnableIrq /* 803A1F44 0039EEA4 38 60 00 01 */ li r3, 1 /* 803A1F48 0039EEA8 48 00 00 08 */ b lbl_803A1F50 @@ -1459,7 +1495,7 @@ sub_803a1f64: /* 803A1F94 0039EEF4 7C E3 02 2E */ lhzx r7, r3, r0 /* 803A1F98 0039EEF8 28 07 00 00 */ cmplwi r7, 0 /* 803A1F9C 0039EEFC 40 82 00 1C */ bne lbl_803A1FB8 -/* 803A1FA0 0039EF00 A0 AD AE D2 */ lhz r5, lbl_805A9A92@sda21(r13) +/* 803A1FA0 0039EF00 A0 AD AE D2 */ lhz r5, dataMacTotal@sda21(r13) /* 803A1FA4 0039EF04 7C 83 02 14 */ add r4, r3, r0 /* 803A1FA8 0039EF08 B0 A4 00 02 */ sth r5, 2(r4) /* 803A1FAC 0039EF0C 7C A8 2B 78 */ mr r8, r5 @@ -1504,7 +1540,7 @@ lbl_803A1FF4: lbl_803A2038: /* 803A2038 0039EF98 7C 88 4A 14 */ add r4, r8, r9 lbl_803A203C: -/* 803A203C 0039EF9C A0 AD AE D2 */ lhz r5, lbl_805A9A92@sda21(r13) +/* 803A203C 0039EF9C A0 AD AE D2 */ lhz r5, dataMacTotal@sda21(r13) /* 803A2040 0039EFA0 28 05 08 00 */ cmplwi r5, 0x800 /* 803A2044 0039EFA4 40 80 02 04 */ bge lbl_803A2248 /* 803A2048 0039EFA8 3C C0 80 56 */ lis r6, lbl_80558AF8@ha @@ -1571,7 +1607,7 @@ lbl_803A2118: /* 803A2118 0039F078 38 C6 00 04 */ addi r6, r6, 4 /* 803A211C 0039F07C 38 E7 00 07 */ addi r7, r7, 7 /* 803A2120 0039F080 42 00 FF 3C */ bdnz lbl_803A205C -/* 803A2124 0039F084 A0 CD AE D2 */ lhz r6, lbl_805A9A92@sda21(r13) +/* 803A2124 0039F084 A0 CD AE D2 */ lhz r6, dataMacTotal@sda21(r13) /* 803A2128 0039F088 3C A0 80 56 */ lis r5, lbl_805592F8@ha /* 803A212C 0039F08C 38 A5 92 F8 */ addi r5, r5, lbl_805592F8@l /* 803A2130 0039F090 38 C6 FF FF */ addi r6, r6, -1 @@ -1636,7 +1672,7 @@ lbl_803A2204: /* 803A220C 0039F16C 39 06 92 F8 */ addi r8, r6, lbl_805592F8@l /* 803A2210 0039F170 54 89 18 38 */ slwi r9, r4, 3 /* 803A2214 0039F174 7C E8 4A 14 */ add r7, r8, r9 -/* 803A2218 0039F178 A0 8D AE D2 */ lhz r4, lbl_805A9A92@sda21(r13) +/* 803A2218 0039F178 A0 8D AE D2 */ lhz r4, dataMacTotal@sda21(r13) /* 803A221C 0039F17C B3 C7 00 04 */ sth r30, 4(r7) /* 803A2220 0039F180 38 A5 00 01 */ addi r5, r5, 1 /* 803A2224 0039F184 38 84 00 01 */ addi r4, r4, 1 @@ -1644,7 +1680,7 @@ lbl_803A2204: /* 803A222C 0039F18C 7F E8 49 2E */ stwx r31, r8, r9 /* 803A2230 0039F190 B0 C7 00 06 */ sth r6, 6(r7) /* 803A2234 0039F194 7C A3 03 2E */ sthx r5, r3, r0 -/* 803A2238 0039F198 B0 8D AE D2 */ sth r4, lbl_805A9A92@sda21(r13) +/* 803A2238 0039F198 B0 8D AE D2 */ sth r4, dataMacTotal@sda21(r13) /* 803A223C 0039F19C 48 01 2E 49 */ bl hwEnableIrq /* 803A2240 0039F1A0 38 60 00 01 */ li r3, 1 /* 803A2244 0039F1A4 48 00 00 0C */ b lbl_803A2250 @@ -1704,7 +1740,7 @@ lbl_803A22D8: /* 803A22FC 0039F25C 54 C5 04 3F */ clrlwi. r5, r6, 0x10 /* 803A2300 0039F260 B0 C7 00 06 */ sth r6, 6(r7) /* 803A2304 0039F264 40 82 01 CC */ bne lbl_803A24D0 -/* 803A2308 0039F268 A0 CD AE D2 */ lhz r6, lbl_805A9A92@sda21(r13) +/* 803A2308 0039F268 A0 CD AE D2 */ lhz r6, dataMacTotal@sda21(r13) /* 803A230C 0039F26C 38 E9 00 01 */ addi r7, r9, 1 /* 803A2310 0039F270 54 E5 18 38 */ slwi r5, r7, 3 /* 803A2314 0039F274 7C 07 30 00 */ cmpw r7, r6 @@ -1826,11 +1862,11 @@ lbl_803A24AC: /* 803A24B0 0039F410 38 E7 00 07 */ addi r7, r7, 7 /* 803A24B4 0039F414 42 00 FF 3C */ bdnz lbl_803A23F0 /* 803A24B8 0039F418 7C A3 02 2E */ lhzx r5, r3, r0 -/* 803A24BC 0039F41C A0 8D AE D2 */ lhz r4, lbl_805A9A92@sda21(r13) +/* 803A24BC 0039F41C A0 8D AE D2 */ lhz r4, dataMacTotal@sda21(r13) /* 803A24C0 0039F420 38 A5 FF FF */ addi r5, r5, -1 /* 803A24C4 0039F424 38 84 FF FF */ addi r4, r4, -1 /* 803A24C8 0039F428 7C A3 03 2E */ sthx r5, r3, r0 -/* 803A24CC 0039F42C B0 8D AE D2 */ sth r4, lbl_805A9A92@sda21(r13) +/* 803A24CC 0039F42C B0 8D AE D2 */ sth r4, dataMacTotal@sda21(r13) lbl_803A24D0: /* 803A24D0 0039F430 48 01 2B B5 */ bl hwEnableIrq /* 803A24D4 0039F434 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1857,11 +1893,11 @@ dataGetMacro: /* 803A2510 0039F470 38 84 8A F8 */ addi r4, r4, lbl_80558AF8@l /* 803A2514 0039F474 54 60 D5 BE */ rlwinm r0, r3, 0x1a, 0x16, 0x1f /* 803A2518 0039F478 7C A4 32 2E */ lhzx r5, r4, r6 -/* 803A251C 0039F47C 90 0D AE C8 */ stw r0, lbl_805A9A88@sda21(r13) +/* 803A251C 0039F47C 90 0D AE C8 */ stw r0, "main$712"@sda21(r13) /* 803A2520 0039F480 28 05 00 00 */ cmplwi r5, 0 /* 803A2524 0039F484 41 82 00 50 */ beq lbl_803A2574 /* 803A2528 0039F488 7C 84 32 14 */ add r4, r4, r6 -/* 803A252C 0039F48C 38 ED AE C0 */ addi r7, r13, lbl_805A9A80@sda21 +/* 803A252C 0039F48C 38 ED AE C0 */ addi r7, r13, "key$713"@sda21 /* 803A2530 0039F490 A1 04 00 02 */ lhz r8, 2(r4) /* 803A2534 0039F494 3C C0 80 56 */ lis r6, lbl_805592F8@ha /* 803A2538 0039F498 B0 67 00 04 */ sth r3, 4(r7) @@ -1869,13 +1905,13 @@ dataGetMacro: /* 803A2540 0039F4A0 38 06 92 F8 */ addi r0, r6, lbl_805592F8@l /* 803A2544 0039F4A4 55 03 18 38 */ slwi r3, r8, 3 /* 803A2548 0039F4A8 38 E4 24 EC */ addi r7, r4, sub_803a24ec@l -/* 803A254C 0039F4AC 91 0D AE CC */ stw r8, lbl_805A9A8C@sda21(r13) +/* 803A254C 0039F4AC 91 0D AE CC */ stw r8, "base$711"@sda21(r13) /* 803A2550 0039F4B0 7C 80 1A 14 */ add r4, r0, r3 -/* 803A2554 0039F4B4 38 6D AE C0 */ addi r3, r13, lbl_805A9A80@sda21 +/* 803A2554 0039F4B4 38 6D AE C0 */ addi r3, r13, "key$713"@sda21 /* 803A2558 0039F4B8 38 C0 00 08 */ li r6, 8 /* 803A255C 0039F4BC 48 01 08 ED */ bl sndBSearch /* 803A2560 0039F4C0 28 03 00 00 */ cmplwi r3, 0 -/* 803A2564 0039F4C4 90 6D AE BC */ stw r3, lbl_805A9A7C@sda21(r13) +/* 803A2564 0039F4C4 90 6D AE BC */ stw r3, "result$714"@sda21(r13) /* 803A2568 0039F4C8 41 82 00 0C */ beq lbl_803A2574 /* 803A256C 0039F4CC 80 63 00 00 */ lwz r3, 0(r3) /* 803A2570 0039F4D0 48 00 00 08 */ b lbl_803A2578 @@ -1900,7 +1936,7 @@ sub_803a2598: /* 803A259C 0039F4FC 7C 08 02 A6 */ mflr r0 /* 803A25A0 0039F500 90 01 00 24 */ stw r0, 0x24(r1) /* 803A25A4 0039F504 39 61 00 20 */ addi r11, r1, 0x20 -/* 803A25A8 0039F508 4B FE 74 D5 */ bl sub_80389a7c +/* 803A25A8 0039F508 4B FE 74 D5 */ bl _savegpr_27 /* 803A25AC 0039F50C 3C A0 80 56 */ lis r5, lbl_8055D2F8@ha /* 803A25B0 0039F510 3C C0 80 56 */ lis r6, lbl_805580F8@ha /* 803A25B4 0039F514 3B 85 D2 F8 */ addi r28, r5, lbl_8055D2F8@l @@ -1919,35 +1955,35 @@ lbl_803A25D4: /* 803A25E4 0039F544 38 C0 00 20 */ li r6, 0x20 /* 803A25E8 0039F548 48 01 08 61 */ bl sndBSearch /* 803A25EC 0039F54C 28 03 00 00 */ cmplwi r3, 0 -/* 803A25F0 0039F550 90 6D AE B8 */ stw r3, lbl_805A9A78@sda21(r13) +/* 803A25F0 0039F550 90 6D AE B8 */ stw r3, "result$732"@sda21(r13) /* 803A25F4 0039F554 41 82 00 9C */ beq lbl_803A2690 /* 803A25F8 0039F558 A0 03 00 02 */ lhz r0, 2(r3) /* 803A25FC 0039F55C 28 00 FF FF */ cmplwi r0, 0xffff /* 803A2600 0039F560 41 82 00 90 */ beq lbl_803A2690 /* 803A2604 0039F564 38 63 00 0C */ addi r3, r3, 0xc /* 803A2608 0039F568 38 00 00 00 */ li r0, 0 -/* 803A260C 0039F56C 90 6D AE B4 */ stw r3, lbl_805A9A74@sda21(r13) +/* 803A260C 0039F56C 90 6D AE B4 */ stw r3, "sheader$733"@sda21(r13) /* 803A2610 0039F570 80 63 00 00 */ lwz r3, 0(r3) /* 803A2614 0039F574 90 7E 00 00 */ stw r3, 0(r30) -/* 803A2618 0039F578 80 6D AE B8 */ lwz r3, lbl_805A9A78@sda21(r13) +/* 803A2618 0039F578 80 6D AE B8 */ lwz r3, "result$732"@sda21(r13) /* 803A261C 0039F57C 80 63 00 08 */ lwz r3, 8(r3) /* 803A2620 0039F580 90 7E 00 04 */ stw r3, 4(r30) /* 803A2624 0039F584 90 1E 00 0C */ stw r0, 0xc(r30) -/* 803A2628 0039F588 80 6D AE B4 */ lwz r3, lbl_805A9A74@sda21(r13) +/* 803A2628 0039F588 80 6D AE B4 */ lwz r3, "sheader$733"@sda21(r13) /* 803A262C 0039F58C 80 03 00 08 */ lwz r0, 8(r3) /* 803A2630 0039F590 90 1E 00 14 */ stw r0, 0x14(r30) -/* 803A2634 0039F594 80 6D AE B4 */ lwz r3, lbl_805A9A74@sda21(r13) +/* 803A2634 0039F594 80 6D AE B4 */ lwz r3, "sheader$733"@sda21(r13) /* 803A2638 0039F598 80 03 00 04 */ lwz r0, 4(r3) /* 803A263C 0039F59C 54 00 02 3E */ clrlwi r0, r0, 8 /* 803A2640 0039F5A0 90 1E 00 10 */ stw r0, 0x10(r30) -/* 803A2644 0039F5A4 80 6D AE B4 */ lwz r3, lbl_805A9A74@sda21(r13) +/* 803A2644 0039F5A4 80 6D AE B4 */ lwz r3, "sheader$733"@sda21(r13) /* 803A2648 0039F5A8 80 03 00 0C */ lwz r0, 0xc(r3) /* 803A264C 0039F5AC 90 1E 00 18 */ stw r0, 0x18(r30) -/* 803A2650 0039F5B0 80 6D AE B4 */ lwz r3, lbl_805A9A74@sda21(r13) +/* 803A2650 0039F5B0 80 6D AE B4 */ lwz r3, "sheader$733"@sda21(r13) /* 803A2654 0039F5B4 80 03 00 04 */ lwz r0, 4(r3) /* 803A2658 0039F5B8 54 00 46 3E */ srwi r0, r0, 0x18 /* 803A265C 0039F5BC 98 1E 00 1C */ stb r0, 0x1c(r30) -/* 803A2660 0039F5C0 80 6D AE B8 */ lwz r3, lbl_805A9A78@sda21(r13) +/* 803A2660 0039F5C0 80 6D AE B8 */ lwz r3, "result$732"@sda21(r13) /* 803A2664 0039F5C4 80 83 00 1C */ lwz r4, 0x1c(r3) /* 803A2668 0039F5C8 28 04 00 00 */ cmplwi r4, 0 /* 803A266C 0039F5CC 41 82 00 1C */ beq lbl_803A2688 @@ -1964,7 +2000,7 @@ lbl_803A2690: /* 803A2690 0039F5F0 3B 7B 00 0C */ addi r27, r27, 0xc /* 803A2694 0039F5F4 3B FF 00 01 */ addi r31, r31, 1 lbl_803A2698: -/* 803A2698 0039F5F8 A0 0D AE DA */ lhz r0, lbl_805A9A9A@sda21(r13) +/* 803A2698 0039F5F8 A0 0D AE DA */ lhz r0, dataSmpSDirNum@sda21(r13) /* 803A269C 0039F5FC 7C 1F 00 00 */ cmpw r31, r0 /* 803A26A0 0039F600 41 80 FF 34 */ blt lbl_803A25D4 /* 803A26A4 0039F604 38 60 FF FF */ li r3, -1 @@ -1990,16 +2026,16 @@ dataGetCurve: /* 803A26D8 0039F638 3C 80 80 55 */ lis r4, lbl_805540F8@ha /* 803A26DC 0039F63C 3C C0 80 3A */ lis r6, sub_803a26c0@ha /* 803A26E0 0039F640 90 01 00 14 */ stw r0, 0x14(r1) -/* 803A26E4 0039F644 38 AD AE AC */ addi r5, r13, lbl_805A9A6C@sda21 +/* 803A26E4 0039F644 38 AD AE AC */ addi r5, r13, "key$759"@sda21 /* 803A26E8 0039F648 38 E6 26 C0 */ addi r7, r6, sub_803a26c0@l /* 803A26EC 0039F64C 38 84 40 F8 */ addi r4, r4, lbl_805540F8@l /* 803A26F0 0039F650 B0 65 00 04 */ sth r3, 4(r5) -/* 803A26F4 0039F654 38 6D AE AC */ addi r3, r13, lbl_805A9A6C@sda21 -/* 803A26F8 0039F658 A0 AD AE D8 */ lhz r5, lbl_805A9A98@sda21(r13) +/* 803A26F4 0039F654 38 6D AE AC */ addi r3, r13, "key$759"@sda21 +/* 803A26F8 0039F658 A0 AD AE D8 */ lhz r5, dataCurveNum@sda21(r13) /* 803A26FC 0039F65C 38 C0 00 08 */ li r6, 8 /* 803A2700 0039F660 48 01 07 49 */ bl sndBSearch /* 803A2704 0039F664 28 03 00 00 */ cmplwi r3, 0 -/* 803A2708 0039F668 90 6D AE A8 */ stw r3, lbl_805A9A68@sda21(r13) +/* 803A2708 0039F668 90 6D AE A8 */ stw r3, "result$760"@sda21(r13) /* 803A270C 0039F66C 41 82 00 0C */ beq lbl_803A2718 /* 803A2710 0039F670 80 63 00 00 */ lwz r3, 0(r3) /* 803A2714 0039F674 48 00 00 08 */ b lbl_803A271C @@ -2018,16 +2054,16 @@ sub_803a272c: /* 803A2734 0039F694 3C 80 80 55 */ lis r4, lbl_80552CF8@ha /* 803A2738 0039F698 3C C0 80 3A */ lis r6, sub_803a26c0@ha /* 803A273C 0039F69C 90 01 00 14 */ stw r0, 0x14(r1) -/* 803A2740 0039F6A0 38 AD AE A0 */ addi r5, r13, lbl_805A9A60@sda21 +/* 803A2740 0039F6A0 38 AD AE A0 */ addi r5, r13, "key$767"@sda21 /* 803A2744 0039F6A4 38 E6 26 C0 */ addi r7, r6, sub_803a26c0@l /* 803A2748 0039F6A8 38 84 2C F8 */ addi r4, r4, lbl_80552CF8@l /* 803A274C 0039F6AC B0 65 00 04 */ sth r3, 4(r5) -/* 803A2750 0039F6B0 38 6D AE A0 */ addi r3, r13, lbl_805A9A60@sda21 -/* 803A2754 0039F6B4 A0 AD AE D6 */ lhz r5, lbl_805A9A96@sda21(r13) +/* 803A2750 0039F6B0 38 6D AE A0 */ addi r3, r13, "key$767"@sda21 +/* 803A2754 0039F6B4 A0 AD AE D6 */ lhz r5, dataKeymapNum@sda21(r13) /* 803A2758 0039F6B8 38 C0 00 08 */ li r6, 8 /* 803A275C 0039F6BC 48 01 06 ED */ bl sndBSearch /* 803A2760 0039F6C0 28 03 00 00 */ cmplwi r3, 0 -/* 803A2764 0039F6C4 90 6D AE 9C */ stw r3, lbl_805A9A5C@sda21(r13) +/* 803A2764 0039F6C4 90 6D AE 9C */ stw r3, "result$768"@sda21(r13) /* 803A2768 0039F6C8 41 82 00 0C */ beq lbl_803A2774 /* 803A276C 0039F6CC 80 63 00 00 */ lwz r3, 0(r3) /* 803A2770 0039F6D0 48 00 00 08 */ b lbl_803A2778 @@ -2062,15 +2098,15 @@ dataGetLayer: /* 803A27C4 0039F724 7C 04 03 78 */ mr r4, r0 /* 803A27C8 0039F728 B0 68 00 04 */ sth r3, 4(r8) /* 803A27CC 0039F72C 7D 03 43 78 */ mr r3, r8 -/* 803A27D0 0039F730 A0 AD AE D4 */ lhz r5, lbl_805A9A94@sda21(r13) +/* 803A27D0 0039F730 A0 AD AE D4 */ lhz r5, dataLayerNum@sda21(r13) /* 803A27D4 0039F734 38 C0 00 0C */ li r6, 0xc /* 803A27D8 0039F738 48 01 06 71 */ bl sndBSearch /* 803A27DC 0039F73C 28 03 00 00 */ cmplwi r3, 0 -/* 803A27E0 0039F740 90 6D AE 98 */ stw r3, lbl_805A9A58@sda21(r13) +/* 803A27E0 0039F740 90 6D AE 98 */ stw r3, "result$494"@sda21(r13) /* 803A27E4 0039F744 41 82 00 18 */ beq lbl_803A27FC /* 803A27E8 0039F748 A0 03 00 06 */ lhz r0, 6(r3) /* 803A27EC 0039F74C B0 1F 00 00 */ sth r0, 0(r31) -/* 803A27F0 0039F750 80 6D AE 98 */ lwz r3, lbl_805A9A58@sda21(r13) +/* 803A27F0 0039F750 80 6D AE 98 */ lwz r3, "result$494"@sda21(r13) /* 803A27F4 0039F754 80 63 00 00 */ lwz r3, 0(r3) /* 803A27F8 0039F758 48 00 00 08 */ b lbl_803A2800 lbl_803A27FC: @@ -2121,7 +2157,7 @@ lbl_803A2888: /* 803A2888 0039F7E8 3B BD 00 08 */ addi r29, r29, 8 /* 803A288C 0039F7EC 3B 9C 00 01 */ addi r28, r28, 1 lbl_803A2890: -/* 803A2890 0039F7F0 A0 0D AE D0 */ lhz r0, lbl_805A9A90@sda21(r13) +/* 803A2890 0039F7F0 A0 0D AE D0 */ lhz r0, dataFXGroupNum@sda21(r13) /* 803A2894 0039F7F4 7C 1C 00 00 */ cmpw r28, r0 /* 803A2898 0039F7F8 41 80 FF CC */ blt lbl_803A2864 /* 803A289C 0039F7FC 38 60 00 00 */ li r3, 0 @@ -2143,12 +2179,12 @@ dataInit: /* 803A28CC 0039F82C 90 01 00 14 */ stw r0, 0x14(r1) /* 803A28D0 0039F830 38 00 00 00 */ li r0, 0 /* 803A28D4 0039F834 2C 05 02 00 */ cmpwi r5, 0x200 -/* 803A28D8 0039F838 B0 0D AE DA */ sth r0, lbl_805A9A9A@sda21(r13) -/* 803A28DC 0039F83C B0 0D AE D8 */ sth r0, lbl_805A9A98@sda21(r13) -/* 803A28E0 0039F840 B0 0D AE D6 */ sth r0, lbl_805A9A96@sda21(r13) -/* 803A28E4 0039F844 B0 0D AE D4 */ sth r0, lbl_805A9A94@sda21(r13) -/* 803A28E8 0039F848 B0 0D AE D0 */ sth r0, lbl_805A9A90@sda21(r13) -/* 803A28EC 0039F84C B0 0D AE D2 */ sth r0, lbl_805A9A92@sda21(r13) +/* 803A28D8 0039F838 B0 0D AE DA */ sth r0, dataSmpSDirNum@sda21(r13) +/* 803A28DC 0039F83C B0 0D AE D8 */ sth r0, dataCurveNum@sda21(r13) +/* 803A28E0 0039F840 B0 0D AE D6 */ sth r0, dataKeymapNum@sda21(r13) +/* 803A28E4 0039F844 B0 0D AE D4 */ sth r0, dataLayerNum@sda21(r13) +/* 803A28E8 0039F848 B0 0D AE D0 */ sth r0, dataFXGroupNum@sda21(r13) +/* 803A28EC 0039F84C B0 0D AE D2 */ sth r0, dataMacTotal@sda21(r13) /* 803A28F0 0039F850 40 80 00 A0 */ bge lbl_803A2990 /* 803A28F4 0039F854 3C A0 80 56 */ lis r5, lbl_80558AF8@ha /* 803A28F8 0039F858 38 00 00 20 */ li r0, 0x20 diff --git a/asm/musyx/synthmacros.s b/asm/musyx/synthmacros.s index 57cc5cba..4d1f838d 100644 --- a/asm/musyx/synthmacros.s +++ b/asm/musyx/synthmacros.s @@ -1,6 +1,16 @@ .include "macros.inc" - +.section .sbss +"cstep$1643": + .skip 0x8 +macRealTime: + .skip 0x8 +macTimeQueueRoot: + .skip 0x4 +macActiveMacroRoot: + .skip 0x4 +DebugMacroSteps: + .skip 0x8 .section .text, "ax" @@ -136,9 +146,9 @@ lbl_803A2B6C: /* 803A2B98 0039FAF8 90 1E 00 98 */ stw r0, 0x98(r30) /* 803A2B9C 0039FAFC 48 00 00 60 */ b lbl_803A2BFC lbl_803A2BA0: -/* 803A2BA0 0039FB00 80 8D AE EC */ lwz r4, lbl_805A9AAC@sda21(r13) +/* 803A2BA0 0039FB00 80 8D AE EC */ lwz r4, macRealTime+4@sda21(r13) /* 803A2BA4 0039FB04 80 01 00 08 */ lwz r0, 8(r1) -/* 803A2BA8 0039FB08 80 6D AE E8 */ lwz r3, lbl_805A9AA8@sda21(r13) +/* 803A2BA8 0039FB08 80 6D AE E8 */ lwz r3, macRealTime@sda21(r13) /* 803A2BAC 0039FB0C 7C 04 00 14 */ addc r0, r4, r0 /* 803A2BB0 0039FB10 90 1E 00 9C */ stw r0, 0x9c(r30) /* 803A2BB4 0039FB14 7C 03 01 94 */ addze r0, r3 @@ -163,9 +173,9 @@ lbl_803A2BE0: /* 803A2BF8 0039FB58 90 1E 00 98 */ stw r0, 0x98(r30) lbl_803A2BFC: /* 803A2BFC 0039FB5C 80 BE 00 9C */ lwz r5, 0x9c(r30) -/* 803A2C00 0039FB60 80 0D AE EC */ lwz r0, lbl_805A9AAC@sda21(r13) +/* 803A2C00 0039FB60 80 0D AE EC */ lwz r0, macRealTime+4@sda21(r13) /* 803A2C04 0039FB64 80 9E 00 98 */ lwz r4, 0x98(r30) -/* 803A2C08 0039FB68 80 6D AE E8 */ lwz r3, lbl_805A9AA8@sda21(r13) +/* 803A2C08 0039FB68 80 6D AE E8 */ lwz r3, macRealTime@sda21(r13) /* 803A2C0C 0039FB6C 7C 05 00 10 */ subfc r0, r5, r0 /* 803A2C10 0039FB70 7C 04 19 10 */ subfe r0, r4, r3 /* 803A2C14 0039FB74 7C 1D E9 10 */ subfe r0, r29, r29 @@ -260,7 +270,7 @@ lbl_803A2D3C: /* 803A2D54 0039FCB4 48 00 00 18 */ b lbl_803A2D6C lbl_803A2D58: /* 803A2D58 0039FCB8 7F C3 F3 78 */ mr r3, r30 -/* 803A2D5C 0039FCBC 48 00 49 E5 */ bl sub_803a7740 +/* 803A2D5C 0039FCBC 48 00 49 E5 */ bl vidRemoveVoiceReferences /* 803A2D60 0039FCC0 7F C3 F3 78 */ mr r3, r30 /* 803A2D64 0039FCC4 48 00 55 41 */ bl voiceFree /* 803A2D68 0039FCC8 38 60 00 01 */ li r3, 1 @@ -433,13 +443,13 @@ lbl_803A2F2C: /* 803A2FBC 0039FF1C 98 9F 01 1C */ stb r4, 0x11c(r31) /* 803A2FC0 0039FF20 41 82 00 88 */ beq lbl_803A3048 /* 803A2FC4 0039FF24 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A2FC8 0039FF28 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 803A2FC8 0039FF28 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 803A2FCC 0039FF2C 1C C0 04 04 */ mulli r6, r0, 0x404 /* 803A2FD0 0039FF30 7C 84 32 14 */ add r4, r4, r6 /* 803A2FD4 0039FF34 80 84 00 F8 */ lwz r4, 0xf8(r4) /* 803A2FD8 0039FF38 80 04 00 08 */ lwz r0, 8(r4) /* 803A2FDC 0039FF3C 90 1F 01 08 */ stw r0, 0x108(r31) -/* 803A2FE0 0039FF40 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A2FE0 0039FF40 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A2FE4 0039FF44 80 BF 00 F4 */ lwz r5, 0xf4(r31) /* 803A2FE8 0039FF48 7C 80 32 14 */ add r4, r0, r6 /* 803A2FEC 0039FF4C 90 A4 00 F0 */ stw r5, 0xf0(r4) @@ -447,11 +457,11 @@ lbl_803A2F2C: /* 803A2FF4 0039FF54 3C 05 00 01 */ addis r0, r5, 1 /* 803A2FF8 0039FF58 28 00 FF FF */ cmplwi r0, 0xffff /* 803A2FFC 0039FF5C 41 82 00 28 */ beq lbl_803A3024 -/* 803A3000 0039FF60 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A3000 0039FF60 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A3004 0039FF64 7C 80 32 14 */ add r4, r0, r6 /* 803A3008 0039FF68 90 A4 00 EC */ stw r5, 0xec(r4) /* 803A300C 0039FF6C 80 1F 00 EC */ lwz r0, 0xec(r31) -/* 803A3010 0039FF70 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 803A3010 0039FF70 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 803A3014 0039FF74 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 803A3018 0039FF78 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A301C 0039FF7C 7C 84 02 14 */ add r4, r4, r0 @@ -461,7 +471,7 @@ lbl_803A3024: /* 803A3028 0039FF88 88 1F 01 1D */ lbz r0, 0x11d(r31) /* 803A302C 0039FF8C 28 00 00 00 */ cmplwi r0, 0 /* 803A3030 0039FF90 41 82 00 20 */ beq lbl_803A3050 -/* 803A3034 0039FF94 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A3034 0039FF94 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A3038 0039FF98 7F E4 FB 78 */ mr r4, r31 /* 803A303C 0039FF9C 7C 60 32 14 */ add r3, r0, r6 /* 803A3040 0039FFA0 4B FF 82 9D */ bl synthFXCloneMidiSetup @@ -1147,7 +1157,7 @@ mcmdSetPitchADSR: /* 803A39DC 003A093C 7C 08 02 A6 */ mflr r0 /* 803A39E0 003A0940 90 01 00 54 */ stw r0, 0x54(r1) /* 803A39E4 003A0944 39 61 00 50 */ addi r11, r1, 0x50 -/* 803A39E8 003A0948 4B FE 60 95 */ bl sub_80389a7c +/* 803A39E8 003A0948 4B FE 60 95 */ bl _savegpr_27 /* 803A39EC 003A094C 80 04 00 00 */ lwz r0, 0(r4) /* 803A39F0 003A0950 7C 7F 1B 78 */ mr r31, r3 /* 803A39F4 003A0954 7C 9B 23 78 */ mr r27, r4 @@ -1488,7 +1498,7 @@ mcmdEnvelope: /* 803A3EC4 003A0E24 7C 08 02 A6 */ mflr r0 /* 803A3EC8 003A0E28 90 01 00 34 */ stw r0, 0x34(r1) /* 803A3ECC 003A0E2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 803A3ED0 003A0E30 4B FE 5B AD */ bl sub_80389a7c +/* 803A3ED0 003A0E30 4B FE 5B AD */ bl _savegpr_27 /* 803A3ED4 003A0E34 80 04 00 04 */ lwz r0, 4(r4) /* 803A3ED8 003A0E38 7C 9B 23 78 */ mr r27, r4 /* 803A3EDC 003A0E3C 83 C3 01 54 */ lwz r30, 0x154(r3) @@ -1661,7 +1671,7 @@ mcmdRandomKey: /* 803A4130 003A1090 7C 08 02 A6 */ mflr r0 /* 803A4134 003A1094 90 01 00 24 */ stw r0, 0x24(r1) /* 803A4138 003A1098 39 61 00 20 */ addi r11, r1, 0x20 -/* 803A413C 003A109C 4B FE 59 41 */ bl sub_80389a7c +/* 803A413C 003A109C 4B FE 59 41 */ bl _savegpr_27 /* 803A4140 003A10A0 80 A4 00 04 */ lwz r5, 4(r4) /* 803A4144 003A10A4 7C 9D 23 78 */ mr r29, r4 /* 803A4148 003A10A8 7C 7C 1B 78 */ mr r28, r3 @@ -3054,7 +3064,7 @@ mcmdVarCalculation: /* 803A54C4 003A2424 7C 08 02 A6 */ mflr r0 /* 803A54C8 003A2428 90 01 00 24 */ stw r0, 0x24(r1) /* 803A54CC 003A242C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803A54D0 003A2430 4B FE 45 AD */ bl sub_80389a7c +/* 803A54D0 003A2430 4B FE 45 AD */ bl _savegpr_27 /* 803A54D4 003A2434 80 04 00 00 */ lwz r0, 0(r4) /* 803A54D8 003A2438 7C 9C 23 78 */ mr r28, r4 /* 803A54DC 003A243C 80 84 00 04 */ lwz r4, 4(r4) @@ -3217,7 +3227,7 @@ mcmdIfVarCompare: /* 803A56E4 003A2644 7C 08 02 A6 */ mflr r0 /* 803A56E8 003A2648 90 01 00 24 */ stw r0, 0x24(r1) /* 803A56EC 003A264C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803A56F0 003A2650 4B FE 43 8D */ bl sub_80389a7c +/* 803A56F0 003A2650 4B FE 43 8D */ bl _savegpr_27 /* 803A56F4 003A2654 7C 9D 23 78 */ mr r29, r4 /* 803A56F8 003A2658 80 84 00 00 */ lwz r4, 0(r4) /* 803A56FC 003A265C 7C 7C 1B 78 */ mr r28, r3 @@ -3344,7 +3354,7 @@ lbl_803A587C: /* 803A58A0 003A2800 48 00 00 C0 */ b lbl_803A5960 lbl_803A58A4: /* 803A58A4 003A2804 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 803A58A8 003A2808 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A58A8 003A2808 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A58AC 003A280C 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A58B0 003A2810 7C 63 02 14 */ add r3, r3, r0 /* 803A58B4 003A2814 80 03 00 34 */ lwz r0, 0x34(r3) @@ -3360,7 +3370,7 @@ lbl_803A58A4: /* 803A58DC 003A283C 28 00 FF FF */ cmplwi r0, 0xffff /* 803A58E0 003A2840 41 82 00 7C */ beq lbl_803A595C /* 803A58E4 003A2844 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A58E8 003A2848 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A58E8 003A2848 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A58EC 003A284C 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A58F0 003A2850 7C 63 02 14 */ add r3, r3, r0 /* 803A58F4 003A2854 88 83 03 EC */ lbz r4, 0x3ec(r3) @@ -3398,7 +3408,7 @@ lbl_803A5960: /* 803A596C 003A28CC 41 80 FF 38 */ blt lbl_803A58A4 /* 803A5970 003A28D0 48 00 00 E0 */ b lbl_803A5A50 lbl_803A5974: -/* 803A5974 003A28D4 81 8D AE 7C */ lwz r12, lbl_805A9A3C@sda21(r13) +/* 803A5974 003A28D4 81 8D AE 7C */ lwz r12, synthMessageCallback@sda21(r13) /* 803A5978 003A28D8 28 0C 00 00 */ cmplwi r12, 0 /* 803A597C 003A28DC 41 82 00 D4 */ beq lbl_803A5A50 /* 803A5980 003A28E0 80 63 00 F8 */ lwz r3, 0xf8(r3) @@ -3427,7 +3437,7 @@ lbl_803A59C8: /* 803A59D0 003A2930 28 00 FF FF */ cmplwi r0, 0xffff /* 803A59D4 003A2934 41 82 00 7C */ beq lbl_803A5A50 /* 803A59D8 003A2938 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A59DC 003A293C 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A59DC 003A293C 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A59E0 003A2940 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A59E4 003A2944 7C 63 02 14 */ add r3, r3, r0 /* 803A59E8 003A2948 88 83 03 EC */ lbz r4, 0x3ec(r3) @@ -3526,7 +3536,7 @@ mcmdSetKeyGroup: /* 803A5B34 003A2A94 3B E3 00 50 */ addi r31, r3, synthInfo@l /* 803A5B38 003A2A98 48 00 00 6C */ b lbl_803A5BA4 lbl_803A5B3C: -/* 803A5B3C 003A2A9C 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A5B3C 003A2A9C 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A5B40 003A2AA0 7C 60 F2 14 */ add r3, r0, r30 /* 803A5B44 003A2AA4 80 03 00 34 */ lwz r0, 0x34(r3) /* 803A5B48 003A2AA8 28 00 00 00 */ cmplwi r0, 0 @@ -3714,38 +3724,38 @@ lbl_803A5D40: /* 803A5DF0 003A2D50 60 00 30 00 */ ori r0, r0, 0x3000 /* 803A5DF4 003A2D54 90 1F 01 14 */ stw r0, 0x114(r31) /* 803A5DF8 003A2D58 4B C5 D5 B1 */ bl memset -/* 803A5DFC 003A2D5C 80 0D AE E8 */ lwz r0, lbl_805A9AA8@sda21(r13) +/* 803A5DFC 003A2D5C 80 0D AE E8 */ lwz r0, macRealTime@sda21(r13) /* 803A5E00 003A2D60 7F E3 FB 78 */ mr r3, r31 -/* 803A5E04 003A2D64 80 8D AE EC */ lwz r4, lbl_805A9AAC@sda21(r13) +/* 803A5E04 003A2D64 80 8D AE EC */ lwz r4, macRealTime+4@sda21(r13) /* 803A5E08 003A2D68 90 9F 00 A4 */ stw r4, 0xa4(r31) /* 803A5E0C 003A2D6C 90 1F 00 A0 */ stw r0, 0xa0(r31) -/* 803A5E10 003A2D70 80 0D AE E8 */ lwz r0, lbl_805A9AA8@sda21(r13) -/* 803A5E14 003A2D74 80 8D AE EC */ lwz r4, lbl_805A9AAC@sda21(r13) +/* 803A5E10 003A2D70 80 0D AE E8 */ lwz r0, macRealTime@sda21(r13) +/* 803A5E14 003A2D74 80 8D AE EC */ lwz r4, macRealTime+4@sda21(r13) /* 803A5E18 003A2D78 90 9F 00 94 */ stw r4, 0x94(r31) /* 803A5E1C 003A2D7C 90 1F 00 90 */ stw r0, 0x90(r31) /* 803A5E20 003A2D80 4B FF 4C 19 */ bl synthStartSynthJobHandling lbl_803A5E24: /* 803A5E24 003A2D84 38 00 00 00 */ li r0, 0 /* 803A5E28 003A2D88 3C 60 80 55 */ lis r3, synthInfo@ha -/* 803A5E2C 003A2D8C 98 0D AE F8 */ stb r0, lbl_805A9AB8@sda21(r13) +/* 803A5E2C 003A2D8C 98 0D AE F8 */ stb r0, DebugMacroSteps@sda21(r13) /* 803A5E30 003A2D90 3B A3 00 50 */ addi r29, r3, synthInfo@l -/* 803A5E34 003A2D94 3B 8D AE E0 */ addi r28, r13, lbl_805A9AA0@sda21 +/* 803A5E34 003A2D94 3B 8D AE E0 */ addi r28, r13, "cstep$1643"@sda21 lbl_803A5E38: -/* 803A5E38 003A2D98 88 6D AE F8 */ lbz r3, lbl_805A9AB8@sda21(r13) +/* 803A5E38 003A2D98 88 6D AE F8 */ lbz r3, DebugMacroSteps@sda21(r13) /* 803A5E3C 003A2D9C 38 63 00 01 */ addi r3, r3, 1 /* 803A5E40 003A2DA0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A5E44 003A2DA4 98 6D AE F8 */ stb r3, lbl_805A9AB8@sda21(r13) +/* 803A5E44 003A2DA4 98 6D AE F8 */ stb r3, DebugMacroSteps@sda21(r13) /* 803A5E48 003A2DA8 28 00 00 20 */ cmplwi r0, 0x20 /* 803A5E4C 003A2DAC 41 81 0C C0 */ bgt lbl_803A6B0C /* 803A5E50 003A2DB0 80 9F 00 38 */ lwz r4, 0x38(r31) /* 803A5E54 003A2DB4 3B C0 00 00 */ li r30, 0 /* 803A5E58 003A2DB8 80 64 00 00 */ lwz r3, 0(r4) /* 803A5E5C 003A2DBC 38 04 00 08 */ addi r0, r4, 8 -/* 803A5E60 003A2DC0 90 6D AE E0 */ stw r3, lbl_805A9AA0@sda21(r13) +/* 803A5E60 003A2DC0 90 6D AE E0 */ stw r3, "cstep$1643"@sda21(r13) /* 803A5E64 003A2DC4 80 64 00 04 */ lwz r3, 4(r4) /* 803A5E68 003A2DC8 90 7C 00 04 */ stw r3, 4(r28) /* 803A5E6C 003A2DCC 90 1F 00 38 */ stw r0, 0x38(r31) -/* 803A5E70 003A2DD0 83 4D AE E0 */ lwz r26, lbl_805A9AA0@sda21(r13) +/* 803A5E70 003A2DD0 83 4D AE E0 */ lwz r26, "cstep$1643"@sda21(r13) /* 803A5E74 003A2DD4 57 40 06 7E */ clrlwi r0, r26, 0x19 /* 803A5E78 003A2DD8 28 00 00 71 */ cmplwi r0, 0x71 /* 803A5E7C 003A2DDC 41 81 0C 88 */ bgt lbl_803A6B04 @@ -3756,13 +3766,13 @@ lbl_803A5E38: /* 803A5E90 003A2DF0 7C 09 03 A6 */ mtctr r0 /* 803A5E94 003A2DF4 4E 80 04 20 */ bctr /* 803A5E98 003A2DF8 7F E3 FB 78 */ mr r3, r31 -/* 803A5E9C 003A2DFC 48 00 18 A5 */ bl sub_803a7740 +/* 803A5E9C 003A2DFC 48 00 18 A5 */ bl vidRemoveVoiceReferences /* 803A5EA0 003A2E00 7F E3 FB 78 */ mr r3, r31 /* 803A5EA4 003A2E04 48 00 24 01 */ bl voiceFree /* 803A5EA8 003A2E08 3B C0 00 01 */ li r30, 1 /* 803A5EAC 003A2E0C 48 00 0C 58 */ b lbl_803A6B04 /* 803A5EB0 003A2E10 7F E3 FB 78 */ mr r3, r31 -/* 803A5EB4 003A2E14 48 00 18 8D */ bl sub_803a7740 +/* 803A5EB4 003A2E14 48 00 18 8D */ bl vidRemoveVoiceReferences /* 803A5EB8 003A2E18 7F E3 FB 78 */ mr r3, r31 /* 803A5EBC 003A2E1C 48 00 23 E9 */ bl voiceFree /* 803A5EC0 003A2E20 3B C0 00 01 */ li r30, 1 @@ -3797,12 +3807,12 @@ lbl_803A5E38: /* 803A5F34 003A2E94 90 1F 00 38 */ stw r0, 0x38(r31) /* 803A5F38 003A2E98 48 00 0B CC */ b lbl_803A6B04 /* 803A5F3C 003A2E9C 7F E3 FB 78 */ mr r3, r31 -/* 803A5F40 003A2EA0 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A5F40 003A2EA0 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A5F44 003A2EA4 4B FF CA 81 */ bl mcmdWait /* 803A5F48 003A2EA8 7C 7E 1B 78 */ mr r30, r3 /* 803A5F4C 003A2EAC 48 00 0B B8 */ b lbl_803A6B04 /* 803A5F50 003A2EB0 7F E3 FB 78 */ mr r3, r31 -/* 803A5F54 003A2EB4 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A5F54 003A2EB4 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A5F58 003A2EB8 4B FF CE 2D */ bl mcmdLoop /* 803A5F5C 003A2EBC 48 00 0B A8 */ b lbl_803A6B04 /* 803A5F60 003A2EC0 57 43 84 3E */ srwi r3, r26, 0x10 @@ -3818,7 +3828,7 @@ lbl_803A5E38: /* 803A5F88 003A2EE8 48 00 00 18 */ b lbl_803A5FA0 lbl_803A5F8C: /* 803A5F8C 003A2EEC 7F E3 FB 78 */ mr r3, r31 -/* 803A5F90 003A2EF0 48 00 17 B1 */ bl sub_803a7740 +/* 803A5F90 003A2EF0 48 00 17 B1 */ bl vidRemoveVoiceReferences /* 803A5F94 003A2EF4 7F E3 FB 78 */ mr r3, r31 /* 803A5F98 003A2EF8 48 00 23 0D */ bl voiceFree /* 803A5F9C 003A2EFC 38 80 00 01 */ li r4, 1 @@ -3828,12 +3838,12 @@ lbl_803A5FA0: /* 803A5FA8 003A2F08 38 00 00 01 */ li r0, 1 /* 803A5FAC 003A2F0C 7F E3 FB 78 */ mr r3, r31 /* 803A5FB0 003A2F10 98 1C 00 06 */ stb r0, 6(r28) -/* 803A5FB4 003A2F14 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A5FB4 003A2F14 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A5FB8 003A2F18 4B FF CA 0D */ bl mcmdWait /* 803A5FBC 003A2F1C 7C 7E 1B 78 */ mr r30, r3 /* 803A5FC0 003A2F20 48 00 0B 44 */ b lbl_803A6B04 /* 803A5FC4 003A2F24 7F E3 FB 78 */ mr r3, r31 -/* 803A5FC8 003A2F28 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A5FC8 003A2F28 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A5FCC 003A2F2C 4B FF CF 0D */ bl sub_803a2ed8 /* 803A5FD0 003A2F30 48 00 0B 34 */ b lbl_803A6B04 /* 803A5FD4 003A2F34 88 9F 01 2F */ lbz r4, 0x12f(r31) @@ -3846,7 +3856,7 @@ lbl_803A5FA0: /* 803A5FF0 003A2F50 7F 5A 03 78 */ or r26, r26, r0 /* 803A5FF4 003A2F54 48 00 00 4C */ b lbl_803A6040 lbl_803A5FF8: -/* 803A5FF8 003A2F58 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A5FF8 003A2F58 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A5FFC 003A2F5C 38 19 00 F4 */ addi r0, r25, 0xf4 /* 803A6000 003A2F60 7F 44 DB 78 */ or r4, r26, r27 /* 803A6004 003A2F64 7C 03 00 2E */ lwzx r0, r3, r0 @@ -3875,7 +3885,7 @@ lbl_803A6040: /* 803A6058 003A2FB8 41 82 0A AC */ beq lbl_803A6B04 /* 803A605C 003A2FBC 7F E3 FB 78 */ mr r3, r31 /* 803A6060 003A2FC0 48 00 C4 0D */ bl sub_803b246c -/* 803A6064 003A2FC4 80 8D AE E0 */ lwz r4, lbl_805A9AA0@sda21(r13) +/* 803A6064 003A2FC4 80 8D AE E0 */ lwz r4, "cstep$1643"@sda21(r13) /* 803A6068 003A2FC8 54 63 CE 3E */ rlwinm r3, r3, 0x19, 0x18, 0x1f /* 803A606C 003A2FCC 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f /* 803A6070 003A2FD0 7C 03 00 40 */ cmplw r3, r0 @@ -3913,23 +3923,23 @@ lbl_803A60E4: /* 803A60E8 003A3048 90 1F 01 70 */ stw r0, 0x170(r31) /* 803A60EC 003A304C 48 00 0A 18 */ b lbl_803A6B04 /* 803A60F0 003A3050 7F E3 FB 78 */ mr r3, r31 -/* 803A60F4 003A3054 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A60F4 003A3054 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A60F8 003A3058 4B FF D5 5D */ bl mcmdSetADSR /* 803A60FC 003A305C 48 00 0A 08 */ b lbl_803A6B04 /* 803A6100 003A3060 7F E3 FB 78 */ mr r3, r31 -/* 803A6104 003A3064 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6104 003A3064 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6108 003A3068 4B FF DC 85 */ bl mcmdScaleVolume /* 803A610C 003A306C 48 00 09 F8 */ b lbl_803A6B04 /* 803A6110 003A3070 7F E3 FB 78 */ mr r3, r31 -/* 803A6114 003A3074 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6114 003A3074 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6118 003A3078 4B FF DB 3D */ bl sub_803a3c54 /* 803A611C 003A307C 48 00 09 E8 */ b lbl_803A6B04 /* 803A6120 003A3080 7F E3 FB 78 */ mr r3, r31 -/* 803A6124 003A3084 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6124 003A3084 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6128 003A3088 4B FF DD 99 */ bl mcmdEnvelope /* 803A612C 003A308C 48 00 09 D8 */ b lbl_803A6B04 /* 803A6130 003A3090 7F E3 FB 78 */ mr r3, r31 -/* 803A6134 003A3094 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6134 003A3094 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6138 003A3098 4B FF D0 05 */ bl sub_803a313c /* 803A613C 003A309C 48 00 09 C8 */ b lbl_803A6B04 /* 803A6140 003A30A0 80 1F 00 F4 */ lwz r0, 0xf4(r31) @@ -3943,7 +3953,7 @@ lbl_803A60E4: /* 803A6160 003A30C0 4B FF 49 81 */ bl sub_8039aae0 /* 803A6164 003A30C4 48 00 09 A0 */ b lbl_803A6B04 /* 803A6168 003A30C8 48 00 CC 39 */ bl sndRand -/* 803A616C 003A30CC 80 8D AE E0 */ lwz r4, lbl_805A9AA0@sda21(r13) +/* 803A616C 003A30CC 80 8D AE E0 */ lwz r4, "cstep$1643"@sda21(r13) /* 803A6170 003A30D0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 803A6174 003A30D4 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f /* 803A6178 003A30D8 7C 03 00 40 */ cmplw r3, r0 @@ -3959,30 +3969,30 @@ lbl_803A60E4: /* 803A61A0 003A3100 90 1F 00 38 */ stw r0, 0x38(r31) /* 803A61A4 003A3104 48 00 09 60 */ b lbl_803A6B04 /* 803A61A8 003A3108 7F E3 FB 78 */ mr r3, r31 -/* 803A61AC 003A310C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A61AC 003A310C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A61B0 003A3110 4B FF DE 41 */ bl mcmdFadeIn /* 803A61B4 003A3114 48 00 09 50 */ b lbl_803A6B04 /* 803A61B8 003A3118 7F E3 FB 78 */ mr r3, r31 -/* 803A61BC 003A311C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A61BC 003A311C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A61C0 003A3120 4B FF DB 31 */ bl mcmdSetPanning /* 803A61C4 003A3124 48 00 09 40 */ b lbl_803A6B04 /* 803A61C8 003A3128 7F E3 FB 78 */ mr r3, r31 -/* 803A61CC 003A312C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A61CC 003A312C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A61D0 003A3130 4B FF D6 DD */ bl mcmdSetADSRFromCtrl /* 803A61D4 003A3134 48 00 09 30 */ b lbl_803A6B04 /* 803A61D8 003A3138 7F E3 FB 78 */ mr r3, r31 -/* 803A61DC 003A313C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A61DC 003A313C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A61E0 003A3140 4B FF DF 4D */ bl mcmdRandomKey /* 803A61E4 003A3144 48 00 09 20 */ b lbl_803A6B04 /* 803A61E8 003A3148 7F E3 FB 78 */ mr r3, r31 -/* 803A61EC 003A314C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A61EC 003A314C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A61F0 003A3150 4B FF CE 75 */ bl mcmdAddKey /* 803A61F4 003A3154 7C 7E 1B 78 */ mr r30, r3 /* 803A61F8 003A3158 48 00 09 0C */ b lbl_803A6B04 /* 803A61FC 003A315C 57 40 C6 7E */ rlwinm r0, r26, 0x18, 0x19, 0x1f /* 803A6200 003A3160 7F E3 FB 78 */ mr r3, r31 /* 803A6204 003A3164 B0 1F 01 2C */ sth r0, 0x12c(r31) -/* 803A6208 003A3168 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6208 003A3168 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A620C 003A316C 54 00 84 3E */ srwi r0, r0, 0x10 /* 803A6210 003A3170 98 1F 01 2E */ stb r0, 0x12e(r31) /* 803A6214 003A3174 48 00 2C 5D */ bl voiceIsLastStarted @@ -3996,8 +4006,8 @@ lbl_803A60E4: lbl_803A6234: /* 803A6234 003A3194 38 00 00 04 */ li r0, 4 /* 803A6238 003A3198 7F E3 FB 78 */ mr r3, r31 -/* 803A623C 003A319C 90 0D AE E0 */ stw r0, lbl_805A9AA0@sda21(r13) -/* 803A6240 003A31A0 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A623C 003A319C 90 0D AE E0 */ stw r0, "cstep$1643"@sda21(r13) +/* 803A6240 003A31A0 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6244 003A31A4 4B FF C7 81 */ bl mcmdWait /* 803A6248 003A31A8 7C 7E 1B 78 */ mr r30, r3 /* 803A624C 003A31AC 48 00 08 B8 */ b lbl_803A6B04 @@ -4018,7 +4028,7 @@ lbl_803A6278: /* 803A6284 003A31E4 7C 60 1B 78 */ mr r0, r3 lbl_803A6288: /* 803A6288 003A31E8 B0 1F 01 2C */ sth r0, 0x12c(r31) -/* 803A628C 003A31EC 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A628C 003A31EC 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6290 003A31F0 54 00 84 3E */ srwi r0, r0, 0x10 /* 803A6294 003A31F4 98 1F 01 2E */ stb r0, 0x12e(r31) /* 803A6298 003A31F8 88 7F 01 21 */ lbz r3, 0x121(r31) @@ -4031,28 +4041,28 @@ lbl_803A6288: lbl_803A62B4: /* 803A62B4 003A3214 38 00 00 04 */ li r0, 4 /* 803A62B8 003A3218 7F E3 FB 78 */ mr r3, r31 -/* 803A62BC 003A321C 90 0D AE E0 */ stw r0, lbl_805A9AA0@sda21(r13) -/* 803A62C0 003A3220 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A62BC 003A321C 90 0D AE E0 */ stw r0, "cstep$1643"@sda21(r13) +/* 803A62C0 003A3220 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A62C4 003A3224 4B FF C7 01 */ bl mcmdWait /* 803A62C8 003A3228 7C 7E 1B 78 */ mr r30, r3 /* 803A62CC 003A322C 48 00 08 38 */ b lbl_803A6B04 /* 803A62D0 003A3230 7F E3 FB 78 */ mr r3, r31 -/* 803A62D4 003A3234 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A62D4 003A3234 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A62D8 003A3238 4B FF F0 1D */ bl mcmdPortamento /* 803A62DC 003A323C 48 00 08 28 */ b lbl_803A6B04 /* 803A62E0 003A3240 7F E3 FB 78 */ mr r3, r31 -/* 803A62E4 003A3244 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A62E4 003A3244 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A62E8 003A3248 4B FF D0 51 */ bl mcmdVibrato /* 803A62EC 003A324C 48 00 08 18 */ b lbl_803A6B04 /* 803A62F0 003A3250 38 00 00 00 */ li r0, 0 /* 803A62F4 003A3254 90 1F 01 A0 */ stw r0, 0x1a0(r31) -/* 803A62F8 003A3258 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A62F8 003A3258 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A62FC 003A325C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f /* 803A6300 003A3260 98 1F 01 B8 */ stb r0, 0x1b8(r31) /* 803A6304 003A3264 88 1F 01 B8 */ lbz r0, 0x1b8(r31) /* 803A6308 003A3268 54 00 80 1E */ slwi r0, r0, 0x10 /* 803A630C 003A326C 90 1F 01 B0 */ stw r0, 0x1b0(r31) -/* 803A6310 003A3270 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6310 003A3270 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6314 003A3274 54 00 84 3E */ srwi r0, r0, 0x10 /* 803A6318 003A3278 7C 03 07 35 */ extsh. r3, r0 /* 803A631C 003A327C 41 80 00 0C */ blt lbl_803A6328 @@ -4067,20 +4077,20 @@ lbl_803A6334: /* 803A6338 003A3298 38 00 00 00 */ li r0, 0 /* 803A633C 003A329C 90 7F 01 A8 */ stw r3, 0x1a8(r31) /* 803A6340 003A32A0 7F E3 FB 78 */ mr r3, r31 -/* 803A6344 003A32A4 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 -/* 803A6348 003A32A8 90 0D AE E0 */ stw r0, lbl_805A9AA0@sda21(r13) +/* 803A6344 003A32A4 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 +/* 803A6348 003A32A8 90 0D AE E0 */ stw r0, "cstep$1643"@sda21(r13) /* 803A634C 003A32AC 4B FF C6 79 */ bl mcmdWait /* 803A6350 003A32B0 7C 7E 1B 78 */ mr r30, r3 /* 803A6354 003A32B4 48 00 07 B0 */ b lbl_803A6B04 /* 803A6358 003A32B8 38 00 00 00 */ li r0, 0 /* 803A635C 003A32BC 90 1F 01 A4 */ stw r0, 0x1a4(r31) -/* 803A6360 003A32C0 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6360 003A32C0 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6364 003A32C4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f /* 803A6368 003A32C8 98 1F 01 B9 */ stb r0, 0x1b9(r31) /* 803A636C 003A32CC 88 1F 01 B9 */ lbz r0, 0x1b9(r31) /* 803A6370 003A32D0 54 00 80 1E */ slwi r0, r0, 0x10 /* 803A6374 003A32D4 90 1F 01 B4 */ stw r0, 0x1b4(r31) -/* 803A6378 003A32D8 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6378 003A32D8 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A637C 003A32DC 54 00 84 3E */ srwi r0, r0, 0x10 /* 803A6380 003A32E0 7C 03 07 35 */ extsh. r3, r0 /* 803A6384 003A32E4 41 80 00 0C */ blt lbl_803A6390 @@ -4095,8 +4105,8 @@ lbl_803A639C: /* 803A63A0 003A3300 38 00 00 00 */ li r0, 0 /* 803A63A4 003A3304 90 7F 01 AC */ stw r3, 0x1ac(r31) /* 803A63A8 003A3308 7F E3 FB 78 */ mr r3, r31 -/* 803A63AC 003A330C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 -/* 803A63B0 003A3310 90 0D AE E0 */ stw r0, lbl_805A9AA0@sda21(r13) +/* 803A63AC 003A330C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 +/* 803A63B0 003A3310 90 0D AE E0 */ stw r0, "cstep$1643"@sda21(r13) /* 803A63B4 003A3314 4B FF C6 11 */ bl mcmdWait /* 803A63B8 003A3318 7C 7E 1B 78 */ mr r30, r3 /* 803A63BC 003A331C 48 00 07 48 */ b lbl_803A6B04 @@ -4115,7 +4125,7 @@ lbl_803A639C: /* 803A63F0 003A3350 4B FF D0 C5 */ bl DoSetPitch /* 803A63F4 003A3354 48 00 07 10 */ b lbl_803A6B04 /* 803A63F8 003A3358 7F E3 FB 78 */ mr r3, r31 -/* 803A63FC 003A335C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A63FC 003A335C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6400 003A3360 4B FF D5 D9 */ bl mcmdSetPitchADSR /* 803A6404 003A3364 48 00 07 00 */ b lbl_803A6B04 /* 803A6408 003A3368 57 40 46 3F */ rlwinm. r0, r26, 8, 0x18, 0x1f @@ -4151,7 +4161,7 @@ lbl_803A6454: /* 803A6474 003A33D4 A8 9F 01 50 */ lha r4, 0x150(r31) /* 803A6478 003A33D8 2C 04 00 00 */ cmpwi r4, 0 /* 803A647C 003A33DC 41 80 00 38 */ blt lbl_803A64B4 -/* 803A6480 003A33E0 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6480 003A33E0 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6484 003A33E4 3C 60 51 EC */ lis r3, 0x51EB851F@ha /* 803A6488 003A33E8 38 63 85 1F */ addi r3, r3, 0x51EB851F@l /* 803A648C 003A33EC 54 00 84 3E */ srwi r0, r0, 0x10 @@ -4165,7 +4175,7 @@ lbl_803A6454: /* 803A64AC 003A340C B0 1F 01 50 */ sth r0, 0x150(r31) /* 803A64B0 003A3410 48 00 06 54 */ b lbl_803A6B04 lbl_803A64B4: -/* 803A64B4 003A3414 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A64B4 003A3414 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A64B8 003A3418 3C 60 51 EC */ lis r3, 0x51EB851F@ha /* 803A64BC 003A341C 38 63 85 1F */ addi r3, r3, 0x51EB851F@l /* 803A64C0 003A3420 54 00 84 3E */ srwi r0, r0, 0x10 @@ -4207,7 +4217,7 @@ lbl_803A64B4: /* 803A6550 003A34B0 98 1F 00 8C */ stb r0, 0x8c(r31) /* 803A6554 003A34B4 48 00 05 B0 */ b lbl_803A6B04 /* 803A6558 003A34B8 7F E3 FB 78 */ mr r3, r31 -/* 803A655C 003A34BC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A655C 003A34BC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6560 003A34C0 4B FF C7 55 */ bl mcmdGosub /* 803A6564 003A34C4 7C 7E 1B 78 */ mr r30, r3 /* 803A6568 003A34C8 48 00 05 9C */ b lbl_803A6B04 @@ -4215,7 +4225,7 @@ lbl_803A64B4: /* 803A6570 003A34D0 4B FF BF 8D */ bl dataGetMacro /* 803A6574 003A34D4 28 03 00 00 */ cmplwi r3, 0 /* 803A6578 003A34D8 41 82 05 8C */ beq lbl_803A6B04 -/* 803A657C 003A34DC 80 AD AE E0 */ lwz r5, lbl_805A9AA0@sda21(r13) +/* 803A657C 003A34DC 80 AD AE E0 */ lwz r5, "cstep$1643"@sda21(r13) /* 803A6580 003A34E0 38 00 00 01 */ li r0, 1 /* 803A6584 003A34E4 54 A4 D5 BA */ rlwinm r4, r5, 0x1a, 0x16, 0x1d /* 803A6588 003A34E8 54 A5 C6 3F */ rlwinm. r5, r5, 0x18, 0x18, 0x1f @@ -4261,7 +4271,7 @@ lbl_803A6610: /* 803A6620 003A3580 98 1F 00 68 */ stb r0, 0x68(r31) /* 803A6624 003A3584 48 00 04 E0 */ b lbl_803A6B04 /* 803A6628 003A3588 7F E3 FB 78 */ mr r3, r31 -/* 803A662C 003A358C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A662C 003A358C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6630 003A3590 4B FF F1 FD */ bl mcmdSendMessage /* 803A6634 003A3594 48 00 04 D0 */ b lbl_803A6B04 /* 803A6638 003A3598 88 1F 03 EC */ lbz r0, 0x3ec(r31) @@ -4279,7 +4289,7 @@ lbl_803A6610: /* 803A6668 003A35C8 38 03 FF FF */ addi r0, r3, -1 /* 803A666C 003A35CC 98 1F 03 EC */ stb r0, 0x3ec(r31) lbl_803A6670: -/* 803A6670 003A35D0 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6670 003A35D0 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6674 003A35D4 54 00 C6 FE */ rlwinm r0, r0, 0x18, 0x1b, 0x1f /* 803A6678 003A35D8 28 00 00 10 */ cmplwi r0, 0x10 /* 803A667C 003A35DC 40 80 00 14 */ bge lbl_803A6690 @@ -4295,7 +4305,7 @@ lbl_803A6690: /* 803A66A0 003A3600 90 A3 FF C0 */ stw r5, -0x40(r3) /* 803A66A4 003A3604 48 00 04 60 */ b lbl_803A6B04 /* 803A66A8 003A3608 7F E3 FB 78 */ mr r3, r31 -/* 803A66AC 003A360C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A66AC 003A360C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A66B0 003A3610 4B FF F3 C1 */ bl mcmdGetVID /* 803A66B4 003A3614 48 00 04 50 */ b lbl_803A6B04 /* 803A66B8 003A3618 80 7F 01 10 */ lwz r3, 0x110(r31) @@ -4346,13 +4356,13 @@ lbl_803A6704: /* 803A6760 003A36C0 48 00 03 A4 */ b lbl_803A6B04 /* 803A6764 003A36C4 57 40 86 3E */ rlwinm r0, r26, 0x10, 0x18, 0x1f /* 803A6768 003A36C8 98 1F 01 D6 */ stb r0, 0x1d6(r31) -/* 803A676C 003A36CC 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A676C 003A36CC 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6770 003A36D0 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f /* 803A6774 003A36D4 98 1F 01 D7 */ stb r0, 0x1d7(r31) /* 803A6778 003A36D8 48 00 03 8C */ b lbl_803A6B04 /* 803A677C 003A36DC 57 40 C6 3E */ rlwinm r0, r26, 0x18, 0x18, 0x1f /* 803A6780 003A36E0 98 1F 01 90 */ stb r0, 0x190(r31) -/* 803A6784 003A36E4 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6784 003A36E4 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6788 003A36E8 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f /* 803A678C 003A36EC 98 1F 01 91 */ stb r0, 0x191(r31) /* 803A6790 003A36F0 48 00 03 74 */ b lbl_803A6B04 @@ -4418,63 +4428,63 @@ lbl_803A6854: /* 803A6870 003A37D0 48 00 C9 55 */ bl hwSetPriority /* 803A6874 003A37D4 48 00 02 90 */ b lbl_803A6B04 /* 803A6878 003A37D8 7F E3 FB 78 */ mr r3, r31 -/* 803A687C 003A37DC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A687C 003A37DC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6880 003A37E0 4B FF DA 49 */ bl sub_803a42c8 /* 803A6884 003A37E4 48 00 02 80 */ b lbl_803A6B04 /* 803A6888 003A37E8 7F E3 FB 78 */ mr r3, r31 -/* 803A688C 003A37EC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A688C 003A37EC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6890 003A37F0 4B FF DB 3D */ bl sub_803a43cc /* 803A6894 003A37F4 48 00 02 70 */ b lbl_803A6B04 /* 803A6898 003A37F8 7F E3 FB 78 */ mr r3, r31 -/* 803A689C 003A37FC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A689C 003A37FC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68A0 003A3800 4B FF DC 31 */ bl sub_803a44d0 /* 803A68A4 003A3804 48 00 02 60 */ b lbl_803A6B04 /* 803A68A8 003A3808 7F E3 FB 78 */ mr r3, r31 -/* 803A68AC 003A380C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68AC 003A380C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68B0 003A3810 4B FF DD 25 */ bl sub_803a45d4 /* 803A68B4 003A3814 48 00 02 50 */ b lbl_803A6B04 /* 803A68B8 003A3818 7F E3 FB 78 */ mr r3, r31 -/* 803A68BC 003A381C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68BC 003A381C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68C0 003A3820 4B FF DE 19 */ bl sub_803a46d8 /* 803A68C4 003A3824 48 00 02 40 */ b lbl_803A6B04 /* 803A68C8 003A3828 7F E3 FB 78 */ mr r3, r31 -/* 803A68CC 003A382C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68CC 003A382C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68D0 003A3830 4B FF DF 0D */ bl sub_803a47dc /* 803A68D4 003A3834 48 00 02 30 */ b lbl_803A6B04 /* 803A68D8 003A3838 7F E3 FB 78 */ mr r3, r31 -/* 803A68DC 003A383C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68DC 003A383C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68E0 003A3840 4B FF E0 01 */ bl sub_803a48e0 /* 803A68E4 003A3844 48 00 02 20 */ b lbl_803A6B04 /* 803A68E8 003A3848 7F E3 FB 78 */ mr r3, r31 -/* 803A68EC 003A384C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68EC 003A384C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A68F0 003A3850 4B FF E4 01 */ bl sub_803a4cf0 /* 803A68F4 003A3854 48 00 02 10 */ b lbl_803A6B04 /* 803A68F8 003A3858 7F E3 FB 78 */ mr r3, r31 -/* 803A68FC 003A385C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A68FC 003A385C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6900 003A3860 4B FF E4 F5 */ bl sub_803a4df4 /* 803A6904 003A3864 48 00 02 00 */ b lbl_803A6B04 /* 803A6908 003A3868 7F E3 FB 78 */ mr r3, r31 -/* 803A690C 003A386C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A690C 003A386C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6910 003A3870 4B FF E5 E9 */ bl sub_803a4ef8 /* 803A6914 003A3874 48 00 01 F0 */ b lbl_803A6B04 /* 803A6918 003A3878 7F E3 FB 78 */ mr r3, r31 -/* 803A691C 003A387C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A691C 003A387C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6920 003A3880 4B FF E0 C5 */ bl sub_803a49e4 /* 803A6924 003A3884 48 00 01 E0 */ b lbl_803A6B04 /* 803A6928 003A3888 7F E3 FB 78 */ mr r3, r31 -/* 803A692C 003A388C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A692C 003A388C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6930 003A3890 4B FF E1 B9 */ bl sub_803a4ae8 /* 803A6934 003A3894 48 00 01 D0 */ b lbl_803A6B04 /* 803A6938 003A3898 7F E3 FB 78 */ mr r3, r31 -/* 803A693C 003A389C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A693C 003A389C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6940 003A38A0 4B FF E2 AD */ bl mcmdVolumeSelect /* 803A6944 003A38A4 48 00 01 C0 */ b lbl_803A6B04 /* 803A6948 003A38A8 7F E3 FB 78 */ mr r3, r31 -/* 803A694C 003A38AC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A694C 003A38AC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6950 003A38B0 4B FF E6 AD */ bl sub_803a4ffc /* 803A6954 003A38B4 48 00 01 B0 */ b lbl_803A6B04 /* 803A6958 003A38B8 7F E3 FB 78 */ mr r3, r31 -/* 803A695C 003A38BC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A695C 003A38BC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6960 003A38C0 4B FF E8 19 */ bl mcmdAuxAFXSelect /* 803A6964 003A38C4 48 00 01 A0 */ b lbl_803A6B04 /* 803A6968 003A38C8 57 40 84 3E */ srwi r0, r26, 0x10 @@ -4503,21 +4513,21 @@ lbl_803A69AC: /* 803A69C0 003A3920 7C 00 1B 78 */ or r0, r0, r3 /* 803A69C4 003A3924 54 00 0F FE */ srwi r0, r0, 0x1f /* 803A69C8 003A3928 98 1F 01 92 */ stb r0, 0x192(r31) -/* 803A69CC 003A392C 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A69CC 003A392C 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A69D0 003A3930 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f /* 803A69D4 003A3934 7C 00 00 34 */ cntlzw r0, r0 /* 803A69D8 003A3938 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f /* 803A69DC 003A393C 98 1F 01 93 */ stb r0, 0x193(r31) /* 803A69E0 003A3940 48 00 01 24 */ b lbl_803A6B04 /* 803A69E4 003A3944 7F E3 FB 78 */ mr r3, r31 -/* 803A69E8 003A3948 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A69E8 003A3948 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A69EC 003A394C 4B FF F1 05 */ bl mcmdSetKeyGroup /* 803A69F0 003A3950 48 00 01 14 */ b lbl_803A6B04 /* 803A69F4 003A3954 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 803A69F8 003A3958 57 44 C6 3E */ rlwinm r4, r26, 0x18, 0x18, 0x1f /* 803A69FC 003A395C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 803A6A00 003A3960 48 00 CC D5 */ bl sub_803b36d4 -/* 803A6A04 003A3964 80 0D AE E0 */ lwz r0, lbl_805A9AA0@sda21(r13) +/* 803A6A04 003A3964 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6A08 003A3968 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 803A6A0C 003A396C 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f /* 803A6A10 003A3970 54 63 06 3E */ clrlwi r3, r3, 0x18 @@ -4527,27 +4537,27 @@ lbl_803A69AC: /* 803A6A20 003A3980 90 1F 01 14 */ stw r0, 0x114(r31) /* 803A6A24 003A3984 48 00 00 E0 */ b lbl_803A6B04 /* 803A6A28 003A3988 7F E3 FB 78 */ mr r3, r31 -/* 803A6A2C 003A398C 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6A2C 003A398C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6A30 003A3990 38 A0 00 00 */ li r5, 0 /* 803A6A34 003A3994 4B FF EA 8D */ bl mcmdVarCalculation /* 803A6A38 003A3998 48 00 00 CC */ b lbl_803A6B04 /* 803A6A3C 003A399C 7F E3 FB 78 */ mr r3, r31 -/* 803A6A40 003A39A0 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6A40 003A39A0 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6A44 003A39A4 38 A0 00 01 */ li r5, 1 /* 803A6A48 003A39A8 4B FF EA 79 */ bl mcmdVarCalculation /* 803A6A4C 003A39AC 48 00 00 B8 */ b lbl_803A6B04 /* 803A6A50 003A39B0 7F E3 FB 78 */ mr r3, r31 -/* 803A6A54 003A39B4 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6A54 003A39B4 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6A58 003A39B8 38 A0 00 02 */ li r5, 2 /* 803A6A5C 003A39BC 4B FF EA 65 */ bl mcmdVarCalculation /* 803A6A60 003A39C0 48 00 00 A4 */ b lbl_803A6B04 /* 803A6A64 003A39C4 7F E3 FB 78 */ mr r3, r31 -/* 803A6A68 003A39C8 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6A68 003A39C8 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6A6C 003A39CC 38 A0 00 03 */ li r5, 3 /* 803A6A70 003A39D0 4B FF EA 51 */ bl mcmdVarCalculation /* 803A6A74 003A39D4 48 00 00 90 */ b lbl_803A6B04 /* 803A6A78 003A39D8 7F E3 FB 78 */ mr r3, r31 -/* 803A6A7C 003A39DC 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6A7C 003A39DC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6A80 003A39E0 38 A0 00 04 */ li r5, 4 /* 803A6A84 003A39E4 4B FF EA 3D */ bl mcmdVarCalculation /* 803A6A88 003A39E8 48 00 00 7C */ b lbl_803A6B04 @@ -4575,12 +4585,12 @@ lbl_803A6AC8: /* 803A6AD8 003A3A38 90 A3 FF C0 */ stw r5, -0x40(r3) /* 803A6ADC 003A3A3C 48 00 00 28 */ b lbl_803A6B04 /* 803A6AE0 003A3A40 7F E3 FB 78 */ mr r3, r31 -/* 803A6AE4 003A3A44 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6AE4 003A3A44 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6AE8 003A3A48 38 A0 00 00 */ li r5, 0 /* 803A6AEC 003A3A4C 4B FF EB F5 */ bl mcmdIfVarCompare /* 803A6AF0 003A3A50 48 00 00 14 */ b lbl_803A6B04 /* 803A6AF4 003A3A54 7F E3 FB 78 */ mr r3, r31 -/* 803A6AF8 003A3A58 38 8D AE E0 */ addi r4, r13, lbl_805A9AA0@sda21 +/* 803A6AF8 003A3A58 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 /* 803A6AFC 003A3A5C 38 A0 00 01 */ li r5, 1 /* 803A6B00 003A3A60 4B FF EB E1 */ bl mcmdIfVarCompare lbl_803A6B04: @@ -4601,7 +4611,7 @@ sub_803a6b24: /* 803A6B2C 003A3A8C 90 01 00 24 */ stw r0, 0x24(r1) /* 803A6B30 003A3A90 39 61 00 20 */ addi r11, r1, 0x20 /* 803A6B34 003A3A94 4B FE 2F 45 */ bl _savegpr_26 -/* 803A6B38 003A3A98 83 6D AE F0 */ lwz r27, lbl_805A9AB0@sda21(r13) +/* 803A6B38 003A3A98 83 6D AE F0 */ lwz r27, macTimeQueueRoot@sda21(r13) /* 803A6B3C 003A3A9C 7C 7E 1B 78 */ mr r30, r3 /* 803A6B40 003A3AA0 48 00 00 1C */ b lbl_803A6B5C lbl_803A6B44: @@ -4615,16 +4625,16 @@ lbl_803A6B5C: /* 803A6B5C 003A3ABC 28 1B 00 00 */ cmplwi r27, 0 /* 803A6B60 003A3AC0 41 82 00 28 */ beq lbl_803A6B88 /* 803A6B64 003A3AC4 83 9B 00 9C */ lwz r28, 0x9c(r27) -/* 803A6B68 003A3AC8 80 0D AE EC */ lwz r0, lbl_805A9AAC@sda21(r13) +/* 803A6B68 003A3AC8 80 0D AE EC */ lwz r0, macRealTime+4@sda21(r13) /* 803A6B6C 003A3ACC 83 BB 00 98 */ lwz r29, 0x98(r27) -/* 803A6B70 003A3AD0 80 6D AE E8 */ lwz r3, lbl_805A9AA8@sda21(r13) +/* 803A6B70 003A3AD0 80 6D AE E8 */ lwz r3, macRealTime@sda21(r13) /* 803A6B74 003A3AD4 7C 1C 00 10 */ subfc r0, r28, r0 /* 803A6B78 003A3AD8 7C 1D 19 10 */ subfe r0, r29, r3 /* 803A6B7C 003A3ADC 7C 1F F9 10 */ subfe r0, r31, r31 /* 803A6B80 003A3AE0 7C 00 00 D1 */ neg. r0, r0 /* 803A6B84 003A3AE4 41 82 FF C0 */ beq lbl_803A6B44 lbl_803A6B88: -/* 803A6B88 003A3AE8 83 ED AE F4 */ lwz r31, lbl_805A9AB4@sda21(r13) +/* 803A6B88 003A3AE8 83 ED AE F4 */ lwz r31, macActiveMacroRoot@sda21(r13) /* 803A6B8C 003A3AEC 48 00 00 B0 */ b lbl_803A6C3C lbl_803A6B90: /* 803A6B90 003A3AF0 88 1F 00 68 */ lbz r0, 0x68(r31) @@ -4676,12 +4686,12 @@ lbl_803A6C30: lbl_803A6C3C: /* 803A6C3C 003A3B9C 28 1F 00 00 */ cmplwi r31, 0 /* 803A6C40 003A3BA0 40 82 FF 50 */ bne lbl_803A6B90 -/* 803A6C44 003A3BA4 80 6D AE EC */ lwz r3, lbl_805A9AAC@sda21(r13) -/* 803A6C48 003A3BA8 80 0D AE E8 */ lwz r0, lbl_805A9AA8@sda21(r13) +/* 803A6C44 003A3BA4 80 6D AE EC */ lwz r3, macRealTime+4@sda21(r13) +/* 803A6C48 003A3BA8 80 0D AE E8 */ lwz r0, macRealTime@sda21(r13) /* 803A6C4C 003A3BAC 7C 63 F0 14 */ addc r3, r3, r30 /* 803A6C50 003A3BB0 7C 00 01 94 */ addze r0, r0 -/* 803A6C54 003A3BB4 90 6D AE EC */ stw r3, lbl_805A9AAC@sda21(r13) -/* 803A6C58 003A3BB8 90 0D AE E8 */ stw r0, lbl_805A9AA8@sda21(r13) +/* 803A6C54 003A3BB4 90 6D AE EC */ stw r3, macRealTime+4@sda21(r13) +/* 803A6C58 003A3BB8 90 0D AE E8 */ stw r0, macRealTime@sda21(r13) /* 803A6C5C 003A3BBC 39 61 00 20 */ addi r11, r1, 0x20 /* 803A6C60 003A3BC0 4B FE 2E 65 */ bl _restgpr_26 /* 803A6C64 003A3BC4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4881,7 +4891,7 @@ lbl_803A6F04: .global TimeQueueAdd TimeQueueAdd: -/* 803A6F18 003A3E78 80 ED AE F0 */ lwz r7, lbl_805A9AB0@sda21(r13) +/* 803A6F18 003A3E78 80 ED AE F0 */ lwz r7, macTimeQueueRoot@sda21(r13) /* 803A6F1C 003A3E7C 39 00 00 00 */ li r8, 0 /* 803A6F20 003A3E80 48 00 00 0C */ b lbl_803A6F2C lbl_803A6F24: @@ -4904,7 +4914,7 @@ lbl_803A6F58: /* 803A6F5C 003A3EBC 40 82 00 34 */ bne lbl_803A6F90 /* 803A6F60 003A3EC0 28 08 00 00 */ cmplwi r8, 0 /* 803A6F64 003A3EC4 40 82 00 18 */ bne lbl_803A6F7C -/* 803A6F68 003A3EC8 90 6D AE F0 */ stw r3, lbl_805A9AB0@sda21(r13) +/* 803A6F68 003A3EC8 90 6D AE F0 */ stw r3, macTimeQueueRoot@sda21(r13) /* 803A6F6C 003A3ECC 38 00 00 00 */ li r0, 0 /* 803A6F70 003A3ED0 90 03 00 44 */ stw r0, 0x44(r3) /* 803A6F74 003A3ED4 90 03 00 48 */ stw r0, 0x48(r3) @@ -4925,7 +4935,7 @@ lbl_803A6F90: /* 803A6FA8 003A3F08 90 64 00 44 */ stw r3, 0x44(r4) /* 803A6FAC 003A3F0C 48 00 00 08 */ b lbl_803A6FB4 lbl_803A6FB0: -/* 803A6FB0 003A3F10 90 6D AE F0 */ stw r3, lbl_805A9AB0@sda21(r13) +/* 803A6FB0 003A3F10 90 6D AE F0 */ stw r3, macTimeQueueRoot@sda21(r13) lbl_803A6FB4: /* 803A6FB4 003A3F14 90 67 00 48 */ stw r3, 0x48(r7) /* 803A6FB8 003A3F18 4E 80 00 20 */ blr @@ -4956,7 +4966,7 @@ macMakeActive: /* 803A7010 003A3F70 28 03 00 00 */ cmplwi r3, 0 /* 803A7014 003A3F74 40 82 00 10 */ bne lbl_803A7024 /* 803A7018 003A3F78 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 803A701C 003A3F7C 90 0D AE F0 */ stw r0, lbl_805A9AB0@sda21(r13) +/* 803A701C 003A3F7C 90 0D AE F0 */ stw r0, macTimeQueueRoot@sda21(r13) /* 803A7020 003A3F80 48 00 00 0C */ b lbl_803A702C lbl_803A7024: /* 803A7024 003A3F84 80 1F 00 44 */ lwz r0, 0x44(r31) @@ -4976,8 +4986,8 @@ lbl_803A7040: /* 803A7054 003A3FB4 38 03 FF FB */ addi r0, r3, 0xFFFBFFFB@l /* 803A7058 003A3FB8 38 60 FF FF */ li r3, -1 /* 803A705C 003A3FBC 90 9F 00 98 */ stw r4, 0x98(r31) -/* 803A7060 003A3FC0 80 8D AE E8 */ lwz r4, lbl_805A9AA8@sda21(r13) -/* 803A7064 003A3FC4 80 AD AE EC */ lwz r5, lbl_805A9AAC@sda21(r13) +/* 803A7060 003A3FC0 80 8D AE E8 */ lwz r4, macRealTime@sda21(r13) +/* 803A7064 003A3FC4 80 AD AE EC */ lwz r5, macRealTime+4@sda21(r13) /* 803A7068 003A3FC8 90 BF 00 A4 */ stw r5, 0xa4(r31) /* 803A706C 003A3FCC 90 9F 00 A0 */ stw r4, 0xa0(r31) /* 803A7070 003A3FD0 80 BF 01 18 */ lwz r5, 0x118(r31) @@ -4987,16 +4997,16 @@ lbl_803A7040: /* 803A7080 003A3FE0 7C 80 18 38 */ and r0, r4, r3 /* 803A7084 003A3FE4 90 1F 01 14 */ stw r0, 0x114(r31) lbl_803A7088: -/* 803A7088 003A3FE8 80 0D AE F4 */ lwz r0, lbl_805A9AB4@sda21(r13) +/* 803A7088 003A3FE8 80 0D AE F4 */ lwz r0, macActiveMacroRoot@sda21(r13) /* 803A708C 003A3FEC 28 00 00 00 */ cmplwi r0, 0 /* 803A7090 003A3FF0 90 1F 00 3C */ stw r0, 0x3c(r31) /* 803A7094 003A3FF4 41 82 00 0C */ beq lbl_803A70A0 -/* 803A7098 003A3FF8 80 6D AE F4 */ lwz r3, lbl_805A9AB4@sda21(r13) +/* 803A7098 003A3FF8 80 6D AE F4 */ lwz r3, macActiveMacroRoot@sda21(r13) /* 803A709C 003A3FFC 93 E3 00 40 */ stw r31, 0x40(r3) lbl_803A70A0: /* 803A70A0 003A4000 38 00 00 00 */ li r0, 0 /* 803A70A4 003A4004 90 1F 00 40 */ stw r0, 0x40(r31) -/* 803A70A8 003A4008 93 ED AE F4 */ stw r31, lbl_805A9AB4@sda21(r13) +/* 803A70A8 003A4008 93 ED AE F4 */ stw r31, macActiveMacroRoot@sda21(r13) /* 803A70AC 003A400C 90 1F 00 4C */ stw r0, 0x4c(r31) lbl_803A70B0: /* 803A70B0 003A4010 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5016,7 +5026,7 @@ macMakeInactive: /* 803A70DC 003A403C 28 05 00 00 */ cmplwi r5, 0 /* 803A70E0 003A4040 40 82 00 10 */ bne lbl_803A70F0 /* 803A70E4 003A4044 80 03 00 3C */ lwz r0, 0x3c(r3) -/* 803A70E8 003A4048 90 0D AE F4 */ stw r0, lbl_805A9AB4@sda21(r13) +/* 803A70E8 003A4048 90 0D AE F4 */ stw r0, macActiveMacroRoot@sda21(r13) /* 803A70EC 003A404C 48 00 00 0C */ b lbl_803A70F8 lbl_803A70F0: /* 803A70F0 003A4050 80 03 00 3C */ lwz r0, 0x3c(r3) @@ -5046,7 +5056,7 @@ lbl_803A710C: /* 803A7148 003A40A8 28 05 00 00 */ cmplwi r5, 0 /* 803A714C 003A40AC 40 82 00 10 */ bne lbl_803A715C /* 803A7150 003A40B0 80 03 00 44 */ lwz r0, 0x44(r3) -/* 803A7154 003A40B4 90 0D AE F0 */ stw r0, lbl_805A9AB0@sda21(r13) +/* 803A7154 003A40B4 90 0D AE F0 */ stw r0, macTimeQueueRoot@sda21(r13) /* 803A7158 003A40B8 48 00 00 0C */ b lbl_803A7164 lbl_803A715C: /* 803A715C 003A40BC 80 03 00 44 */ lwz r0, 0x44(r3) @@ -5064,8 +5074,8 @@ lbl_803A7178: /* 803A7184 003A40E4 38 05 FF FB */ addi r0, r5, 0xFFFBFFFB@l /* 803A7188 003A40E8 38 A0 FF FF */ li r5, -1 /* 803A718C 003A40EC 90 C3 00 98 */ stw r6, 0x98(r3) -/* 803A7190 003A40F0 80 CD AE E8 */ lwz r6, lbl_805A9AA8@sda21(r13) -/* 803A7194 003A40F4 80 ED AE EC */ lwz r7, lbl_805A9AAC@sda21(r13) +/* 803A7190 003A40F0 80 CD AE E8 */ lwz r6, macRealTime@sda21(r13) +/* 803A7194 003A40F4 80 ED AE EC */ lwz r7, macRealTime+4@sda21(r13) /* 803A7198 003A40F8 90 E3 00 A4 */ stw r7, 0xa4(r3) /* 803A719C 003A40FC 90 C3 00 A0 */ stw r6, 0xa0(r3) /* 803A71A0 003A4100 80 E3 01 18 */ lwz r7, 0x118(r3) @@ -5119,16 +5129,16 @@ lbl_803A7240: /* 803A724C 003A41AC 7F 84 E3 78 */ mr r4, r28 /* 803A7250 003A41B0 54 06 0F FE */ srwi r6, r0, 0x1f /* 803A7254 003A41B4 7E 25 8B 78 */ mr r5, r17 -/* 803A7258 003A41B8 48 00 0B ED */ bl sub_803a7e44 +/* 803A7258 003A41B8 48 00 0B ED */ bl voiceAllocateFind /* 803A725C 003A41BC 7C 7D 1B 78 */ mr r29, r3 /* 803A7260 003A41C0 3C 1D 00 01 */ addis r0, r29, 1 /* 803A7264 003A41C4 28 00 FF FF */ cmplwi r0, 0xffff /* 803A7268 003A41C8 41 82 03 74 */ beq lbl_803A75DC /* 803A726C 003A41CC 1C 1D 04 04 */ mulli r0, r29, 0x404 -/* 803A7270 003A41D0 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A7270 003A41D0 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A7274 003A41D4 7F 83 02 14 */ add r28, r3, r0 /* 803A7278 003A41D8 7F 83 E3 78 */ mr r3, r28 -/* 803A727C 003A41DC 48 00 04 C5 */ bl sub_803a7740 +/* 803A727C 003A41DC 48 00 04 C5 */ bl vidRemoveVoiceReferences /* 803A7280 003A41E0 80 1C 00 4C */ lwz r0, 0x4c(r28) /* 803A7284 003A41E4 2C 00 00 02 */ cmpwi r0, 2 /* 803A7288 003A41E8 41 82 00 EC */ beq lbl_803A7374 @@ -5138,7 +5148,7 @@ lbl_803A7240: /* 803A7298 003A41F8 28 03 00 00 */ cmplwi r3, 0 /* 803A729C 003A41FC 40 82 00 10 */ bne lbl_803A72AC /* 803A72A0 003A4200 80 1C 00 3C */ lwz r0, 0x3c(r28) -/* 803A72A4 003A4204 90 0D AE F4 */ stw r0, lbl_805A9AB4@sda21(r13) +/* 803A72A4 003A4204 90 0D AE F4 */ stw r0, macActiveMacroRoot@sda21(r13) /* 803A72A8 003A4208 48 00 00 0C */ b lbl_803A72B4 lbl_803A72AC: /* 803A72AC 003A420C 80 1C 00 3C */ lwz r0, 0x3c(r28) @@ -5166,7 +5176,7 @@ lbl_803A72C8: /* 803A72FC 003A425C 28 03 00 00 */ cmplwi r3, 0 /* 803A7300 003A4260 40 82 00 10 */ bne lbl_803A7310 /* 803A7304 003A4264 80 1C 00 44 */ lwz r0, 0x44(r28) -/* 803A7308 003A4268 90 0D AE F0 */ stw r0, lbl_805A9AB0@sda21(r13) +/* 803A7308 003A4268 90 0D AE F0 */ stw r0, macTimeQueueRoot@sda21(r13) /* 803A730C 003A426C 48 00 00 0C */ b lbl_803A7318 lbl_803A7310: /* 803A7310 003A4270 80 1C 00 44 */ lwz r0, 0x44(r28) @@ -5184,8 +5194,8 @@ lbl_803A732C: /* 803A7338 003A4298 38 03 FF FB */ addi r0, r3, 0xFFFBFFFB@l /* 803A733C 003A429C 38 60 FF FF */ li r3, -1 /* 803A7340 003A42A0 90 9C 00 98 */ stw r4, 0x98(r28) -/* 803A7344 003A42A4 80 8D AE E8 */ lwz r4, lbl_805A9AA8@sda21(r13) -/* 803A7348 003A42A8 80 AD AE EC */ lwz r5, lbl_805A9AAC@sda21(r13) +/* 803A7344 003A42A4 80 8D AE E8 */ lwz r4, macRealTime@sda21(r13) +/* 803A7348 003A42A8 80 AD AE EC */ lwz r5, macRealTime+4@sda21(r13) /* 803A734C 003A42AC 90 BC 00 A4 */ stw r5, 0xa4(r28) /* 803A7350 003A42B0 90 9C 00 A0 */ stw r4, 0xa0(r28) /* 803A7354 003A42B4 80 BC 01 18 */ lwz r5, 0x118(r28) @@ -5229,7 +5239,7 @@ lbl_803A73B4: /* 803A73E0 003A4340 48 00 A4 3D */ bl inpResetMidiCtrl /* 803A73E4 003A4344 57 A3 06 3E */ clrlwi r3, r29, 0x18 /* 803A73E8 003A4348 38 80 00 FF */ li r4, 0xff -/* 803A73EC 003A434C 48 00 A8 19 */ bl sub_803b1c04 +/* 803A73EC 003A434C 48 00 A8 19 */ bl inpResetChannelDefaults /* 803A73F0 003A4350 9B BC 02 0A */ stb r29, 0x20a(r28) /* 803A73F4 003A4354 38 60 00 FF */ li r3, 0xff /* 803A73F8 003A4358 38 00 00 00 */ li r0, 0 @@ -5284,7 +5294,7 @@ lbl_803A7418: /* 803A74B4 003A4414 48 00 07 45 */ bl voiceSetPriority /* 803A74B8 003A4418 7F 83 E3 78 */ mr r3, r28 /* 803A74BC 003A441C 7F 44 D3 78 */ mr r4, r26 -/* 803A74C0 003A4420 48 00 05 E5 */ bl sub_803a7aa4 +/* 803A74C0 003A4420 48 00 05 E5 */ bl vidMakeNew /* 803A74C4 003A4424 7C 6E 1B 78 */ mr r14, r3 /* 803A74C8 003A4428 3C 0E 00 01 */ addis r0, r14, 1 /* 803A74CC 003A442C 28 00 FF FF */ cmplwi r0, 0xffff @@ -5308,7 +5318,7 @@ lbl_803A7418: /* 803A7514 003A4474 28 03 00 00 */ cmplwi r3, 0 /* 803A7518 003A4478 40 82 00 10 */ bne lbl_803A7528 /* 803A751C 003A447C 80 1C 00 44 */ lwz r0, 0x44(r28) -/* 803A7520 003A4480 90 0D AE F0 */ stw r0, lbl_805A9AB0@sda21(r13) +/* 803A7520 003A4480 90 0D AE F0 */ stw r0, macTimeQueueRoot@sda21(r13) /* 803A7524 003A4484 48 00 00 0C */ b lbl_803A7530 lbl_803A7528: /* 803A7528 003A4488 80 1C 00 44 */ lwz r0, 0x44(r28) @@ -5328,8 +5338,8 @@ lbl_803A7544: /* 803A7558 003A44B8 38 03 FF FB */ addi r0, r3, 0xFFFBFFFB@l /* 803A755C 003A44BC 38 60 FF FF */ li r3, -1 /* 803A7560 003A44C0 90 9C 00 98 */ stw r4, 0x98(r28) -/* 803A7564 003A44C4 80 8D AE E8 */ lwz r4, lbl_805A9AA8@sda21(r13) -/* 803A7568 003A44C8 80 AD AE EC */ lwz r5, lbl_805A9AAC@sda21(r13) +/* 803A7564 003A44C4 80 8D AE E8 */ lwz r4, macRealTime@sda21(r13) +/* 803A7568 003A44C8 80 AD AE EC */ lwz r5, macRealTime+4@sda21(r13) /* 803A756C 003A44CC 90 BC 00 A4 */ stw r5, 0xa4(r28) /* 803A7570 003A44D0 90 9C 00 A0 */ stw r4, 0xa0(r28) /* 803A7574 003A44D4 80 BC 01 18 */ lwz r5, 0x118(r28) @@ -5339,16 +5349,16 @@ lbl_803A7544: /* 803A7584 003A44E4 7C 80 18 38 */ and r0, r4, r3 /* 803A7588 003A44E8 90 1C 01 14 */ stw r0, 0x114(r28) lbl_803A758C: -/* 803A758C 003A44EC 80 0D AE F4 */ lwz r0, lbl_805A9AB4@sda21(r13) +/* 803A758C 003A44EC 80 0D AE F4 */ lwz r0, macActiveMacroRoot@sda21(r13) /* 803A7590 003A44F0 28 00 00 00 */ cmplwi r0, 0 /* 803A7594 003A44F4 90 1C 00 3C */ stw r0, 0x3c(r28) /* 803A7598 003A44F8 41 82 00 0C */ beq lbl_803A75A4 -/* 803A759C 003A44FC 80 6D AE F4 */ lwz r3, lbl_805A9AB4@sda21(r13) +/* 803A759C 003A44FC 80 6D AE F4 */ lwz r3, macActiveMacroRoot@sda21(r13) /* 803A75A0 003A4500 93 83 00 40 */ stw r28, 0x40(r3) lbl_803A75A4: /* 803A75A4 003A4504 38 00 00 00 */ li r0, 0 /* 803A75A8 003A4508 90 1C 00 40 */ stw r0, 0x40(r28) -/* 803A75AC 003A450C 93 8D AE F4 */ stw r28, lbl_805A9AB4@sda21(r13) +/* 803A75AC 003A450C 93 8D AE F4 */ stw r28, macActiveMacroRoot@sda21(r13) /* 803A75B0 003A4510 90 1C 00 4C */ stw r0, 0x4c(r28) lbl_803A75B4: /* 803A75B4 003A4514 7D C3 73 78 */ mr r3, r14 @@ -5377,26 +5387,26 @@ lbl_803A75E0: macInit: /* 803A75F8 003A4558 39 00 00 00 */ li r8, 0 /* 803A75FC 003A455C 3C 60 80 55 */ lis r3, synthInfo@ha -/* 803A7600 003A4560 91 0D AE F4 */ stw r8, lbl_805A9AB4@sda21(r13) +/* 803A7600 003A4560 91 0D AE F4 */ stw r8, macActiveMacroRoot@sda21(r13) /* 803A7604 003A4564 7D 09 43 78 */ mr r9, r8 /* 803A7608 003A4568 38 E3 00 50 */ addi r7, r3, synthInfo@l /* 803A760C 003A456C 39 40 00 00 */ li r10, 0 -/* 803A7610 003A4570 91 0D AE F0 */ stw r8, lbl_805A9AB0@sda21(r13) +/* 803A7610 003A4570 91 0D AE F0 */ stw r8, macTimeQueueRoot@sda21(r13) /* 803A7614 003A4574 38 A0 00 02 */ li r5, 2 -/* 803A7618 003A4578 91 0D AE EC */ stw r8, lbl_805A9AAC@sda21(r13) -/* 803A761C 003A457C 91 0D AE E8 */ stw r8, lbl_805A9AA8@sda21(r13) +/* 803A7618 003A4578 91 0D AE EC */ stw r8, macRealTime+4@sda21(r13) +/* 803A761C 003A457C 91 0D AE E8 */ stw r8, macRealTime@sda21(r13) /* 803A7620 003A4580 48 00 00 30 */ b lbl_803A7650 lbl_803A7624: -/* 803A7624 003A4584 80 CD AE 78 */ lwz r6, lbl_805A9A38@sda21(r13) +/* 803A7624 003A4584 80 CD AE 78 */ lwz r6, synthVoice@sda21(r13) /* 803A7628 003A4588 38 89 00 34 */ addi r4, r9, 0x34 /* 803A762C 003A458C 38 69 00 4C */ addi r3, r9, 0x4c /* 803A7630 003A4590 38 09 00 AA */ addi r0, r9, 0xaa /* 803A7634 003A4594 7D 06 21 2E */ stwx r8, r6, r4 /* 803A7638 003A4598 39 29 04 04 */ addi r9, r9, 0x404 /* 803A763C 003A459C 39 4A 00 01 */ addi r10, r10, 1 -/* 803A7640 003A45A0 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 803A7640 003A45A0 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 803A7644 003A45A4 7C A4 19 2E */ stwx r5, r4, r3 -/* 803A7648 003A45A8 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A7648 003A45A8 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A764C 003A45AC 7D 03 03 2E */ sthx r8, r3, r0 lbl_803A7650: /* 803A7650 003A45B0 88 07 02 10 */ lbz r0, 0x210(r7) diff --git a/asm/musyx/synthvoice.s b/asm/musyx/synthvoice.s index e55dfd7f..dc2c7098 100644 --- a/asm/musyx/synthvoice.s +++ b/asm/musyx/synthvoice.s @@ -1,18 +1,45 @@ .include "macros.inc" +.section .sbss +.balign 4 +.global vidFree +vidFree: + .skip 0x4 +.global vidRoot +vidRoot: + .skip 0x4 +.global vidCurrentId +vidCurrentId: + .skip 0x4 +.global voicePrioSortRootListRoot +voicePrioSortRootListRoot: + .skip 0x2 +.global voiceMusicRunning +voiceMusicRunning: + .skip 0x1 +.global voiceFxRunning +voiceFxRunning: + .skip 0x1 +.global voiceListInsert +voiceListInsert: + .skip 0x1 +.global voiceListRoot +voiceListRoot: + .skip 0x7 + .section .text, "ax" .global vidInit vidInit: -/* 803A7660 003A45C0 3C 60 80 56 */ lis r3, lbl_8055D350@ha +/* 803A7660 003A45C0 3C 60 80 56 */ lis r3, vidList@ha /* 803A7664 003A45C4 38 80 00 00 */ li r4, 0 -/* 803A7668 003A45C8 38 63 D3 50 */ addi r3, r3, lbl_8055D350@l +/* 803A7668 003A45C8 38 63 D3 50 */ addi r3, r3, vidList@l /* 803A766C 003A45CC 38 00 00 10 */ li r0, 0x10 -/* 803A7670 003A45D0 90 8D AF 08 */ stw r4, lbl_805A9AC8@sda21(r13) +/* 803A7670 003A45D0 90 8D AF 08 */ stw r4, vidCurrentId@sda21(r13) /* 803A7674 003A45D4 38 C0 00 00 */ li r6, 0 /* 803A7678 003A45D8 38 A0 00 00 */ li r5, 0 -/* 803A767C 003A45DC 90 8D AF 04 */ stw r4, lbl_805A9AC4@sda21(r13) -/* 803A7680 003A45E0 90 6D AF 00 */ stw r3, lbl_805A9AC0@sda21(r13) +/* 803A767C 003A45DC 90 8D AF 04 */ stw r4, vidRoot@sda21(r13) +/* 803A7680 003A45E0 90 6D AF 00 */ stw r3, vidFree@sda21(r13) /* 803A7684 003A45E4 7C 09 03 A6 */ mtctr r0 lbl_803A7688: /* 803A7688 003A45E8 28 06 00 00 */ cmplwi r6, 0 @@ -70,8 +97,8 @@ lbl_803A7724: /* 803A7738 003A4698 90 06 00 00 */ stw r0, 0(r6) /* 803A773C 003A469C 4E 80 00 20 */ blr -.global sub_803a7740 -sub_803a7740: +.global vidRemoveVoiceReferences +vidRemoveVoiceReferences: /* 803A7740 003A46A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A7744 003A46A4 7C 08 02 A6 */ mflr r0 /* 803A7748 003A46A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -87,7 +114,7 @@ sub_803a7740: /* 803A7770 003A46D0 28 00 FF FF */ cmplwi r0, 0xffff /* 803A7774 003A46D4 41 82 00 BC */ beq lbl_803A7830 /* 803A7778 003A46D8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A777C 003A46DC 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A777C 003A46DC 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A7780 003A46E0 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A7784 003A46E4 80 9F 00 EC */ lwz r4, 0xec(r31) /* 803A7788 003A46E8 7C 63 02 14 */ add r3, r3, r0 @@ -97,7 +124,7 @@ sub_803a7740: /* 803A7798 003A46F8 28 00 FF FF */ cmplwi r0, 0xffff /* 803A779C 003A46FC 41 82 00 1C */ beq lbl_803A77B8 /* 803A77A0 003A4700 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 803A77A4 003A4704 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A77A4 003A4704 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A77A8 003A4708 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A77AC 003A470C 80 9F 00 F0 */ lwz r4, 0xf0(r31) /* 803A77B0 003A4710 7C 63 02 14 */ add r3, r3, r0 @@ -112,7 +139,7 @@ lbl_803A77B8: /* 803A77D0 003A4730 48 00 00 0C */ b lbl_803A77DC lbl_803A77D4: /* 803A77D4 003A4734 80 03 00 00 */ lwz r0, 0(r3) -/* 803A77D8 003A4738 90 0D AF 04 */ stw r0, lbl_805A9AC4@sda21(r13) +/* 803A77D8 003A4738 90 0D AF 04 */ stw r0, vidRoot@sda21(r13) lbl_803A77DC: /* 803A77DC 003A473C 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A77E0 003A4740 80 83 00 00 */ lwz r4, 0(r3) @@ -121,10 +148,10 @@ lbl_803A77DC: /* 803A77EC 003A474C 80 03 00 04 */ lwz r0, 4(r3) /* 803A77F0 003A4750 90 04 00 04 */ stw r0, 4(r4) lbl_803A77F4: -/* 803A77F4 003A4754 80 0D AF 00 */ lwz r0, lbl_805A9AC0@sda21(r13) +/* 803A77F4 003A4754 80 0D AF 00 */ lwz r0, vidFree@sda21(r13) /* 803A77F8 003A4758 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A77FC 003A475C 90 03 00 00 */ stw r0, 0(r3) -/* 803A7800 003A4760 80 6D AF 00 */ lwz r3, lbl_805A9AC0@sda21(r13) +/* 803A7800 003A4760 80 6D AF 00 */ lwz r3, vidFree@sda21(r13) /* 803A7804 003A4764 28 03 00 00 */ cmplwi r3, 0 /* 803A7808 003A4768 41 82 00 0C */ beq lbl_803A7814 /* 803A780C 003A476C 80 1F 00 F8 */ lwz r0, 0xf8(r31) @@ -134,7 +161,7 @@ lbl_803A7814: /* 803A7818 003A4778 38 80 00 00 */ li r4, 0 /* 803A781C 003A477C 90 83 00 04 */ stw r4, 4(r3) /* 803A7820 003A4780 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 803A7824 003A4784 90 0D AF 00 */ stw r0, lbl_805A9AC0@sda21(r13) +/* 803A7824 003A4784 90 0D AF 00 */ stw r0, vidFree@sda21(r13) /* 803A7828 003A4788 90 9F 00 F8 */ stw r4, 0xf8(r31) /* 803A782C 003A478C 48 00 02 50 */ b lbl_803A7A7C lbl_803A7830: @@ -146,13 +173,13 @@ lbl_803A7830: /* 803A7844 003A47A4 38 80 FF FF */ li r4, -1 /* 803A7848 003A47A8 90 A3 00 0C */ stw r5, 0xc(r3) /* 803A784C 003A47AC 80 1F 00 EC */ lwz r0, 0xec(r31) -/* 803A7850 003A47B0 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A7850 003A47B0 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A7854 003A47B4 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 803A7858 003A47B8 1C 00 04 04 */ mulli r0, r0, 0x404 /* 803A785C 003A47BC 7C 63 02 14 */ add r3, r3, r0 /* 803A7860 003A47C0 90 83 00 F0 */ stw r4, 0xf0(r3) /* 803A7864 003A47C4 80 1F 00 EC */ lwz r0, 0xec(r31) -/* 803A7868 003A47C8 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A7868 003A47C8 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A786C 003A47CC 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 803A7870 003A47D0 80 9F 00 FC */ lwz r4, 0xfc(r31) /* 803A7874 003A47D4 1C 00 04 04 */ mulli r0, r0, 0x404 @@ -170,7 +197,7 @@ lbl_803A7830: /* 803A78A4 003A4804 48 00 00 0C */ b lbl_803A78B0 lbl_803A78A8: /* 803A78A8 003A4808 80 03 00 00 */ lwz r0, 0(r3) -/* 803A78AC 003A480C 90 0D AF 04 */ stw r0, lbl_805A9AC4@sda21(r13) +/* 803A78AC 003A480C 90 0D AF 04 */ stw r0, vidRoot@sda21(r13) lbl_803A78B0: /* 803A78B0 003A4810 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A78B4 003A4814 80 83 00 00 */ lwz r4, 0(r3) @@ -179,10 +206,10 @@ lbl_803A78B0: /* 803A78C0 003A4820 80 03 00 04 */ lwz r0, 4(r3) /* 803A78C4 003A4824 90 04 00 04 */ stw r0, 4(r4) lbl_803A78C8: -/* 803A78C8 003A4828 80 0D AF 00 */ lwz r0, lbl_805A9AC0@sda21(r13) +/* 803A78C8 003A4828 80 0D AF 00 */ lwz r0, vidFree@sda21(r13) /* 803A78CC 003A482C 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A78D0 003A4830 90 03 00 00 */ stw r0, 0(r3) -/* 803A78D4 003A4834 80 6D AF 00 */ lwz r3, lbl_805A9AC0@sda21(r13) +/* 803A78D4 003A4834 80 6D AF 00 */ lwz r3, vidFree@sda21(r13) /* 803A78D8 003A4838 28 03 00 00 */ cmplwi r3, 0 /* 803A78DC 003A483C 41 82 00 0C */ beq lbl_803A78E8 /* 803A78E0 003A4840 80 1F 00 F8 */ lwz r0, 0xf8(r31) @@ -192,7 +219,7 @@ lbl_803A78E8: /* 803A78EC 003A484C 38 80 00 00 */ li r4, 0 /* 803A78F0 003A4850 90 83 00 04 */ stw r4, 4(r3) /* 803A78F4 003A4854 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 803A78F8 003A4858 90 0D AF 00 */ stw r0, lbl_805A9AC0@sda21(r13) +/* 803A78F8 003A4858 90 0D AF 00 */ stw r0, vidFree@sda21(r13) /* 803A78FC 003A485C 90 9F 00 F8 */ stw r4, 0xf8(r31) lbl_803A7900: /* 803A7900 003A4860 38 00 00 00 */ li r0, 0 @@ -212,7 +239,7 @@ lbl_803A7910: /* 803A7934 003A4894 48 00 00 0C */ b lbl_803A7940 lbl_803A7938: /* 803A7938 003A4898 80 03 00 00 */ lwz r0, 0(r3) -/* 803A793C 003A489C 90 0D AF 04 */ stw r0, lbl_805A9AC4@sda21(r13) +/* 803A793C 003A489C 90 0D AF 04 */ stw r0, vidRoot@sda21(r13) lbl_803A7940: /* 803A7940 003A48A0 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A7944 003A48A4 80 83 00 00 */ lwz r4, 0(r3) @@ -221,10 +248,10 @@ lbl_803A7940: /* 803A7950 003A48B0 80 03 00 04 */ lwz r0, 4(r3) /* 803A7954 003A48B4 90 04 00 04 */ stw r0, 4(r4) lbl_803A7958: -/* 803A7958 003A48B8 80 0D AF 00 */ lwz r0, lbl_805A9AC0@sda21(r13) +/* 803A7958 003A48B8 80 0D AF 00 */ lwz r0, vidFree@sda21(r13) /* 803A795C 003A48BC 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A7960 003A48C0 90 03 00 00 */ stw r0, 0(r3) -/* 803A7964 003A48C4 80 6D AF 00 */ lwz r3, lbl_805A9AC0@sda21(r13) +/* 803A7964 003A48C4 80 6D AF 00 */ lwz r3, vidFree@sda21(r13) /* 803A7968 003A48C8 28 03 00 00 */ cmplwi r3, 0 /* 803A796C 003A48CC 41 82 00 0C */ beq lbl_803A7978 /* 803A7970 003A48D0 80 1F 00 F8 */ lwz r0, 0xf8(r31) @@ -234,7 +261,7 @@ lbl_803A7978: /* 803A797C 003A48DC 38 80 00 00 */ li r4, 0 /* 803A7980 003A48E0 90 83 00 04 */ stw r4, 4(r3) /* 803A7984 003A48E4 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 803A7988 003A48E8 90 0D AF 00 */ stw r0, lbl_805A9AC0@sda21(r13) +/* 803A7988 003A48E8 90 0D AF 00 */ stw r0, vidFree@sda21(r13) /* 803A798C 003A48EC 90 9F 00 F8 */ stw r4, 0xf8(r31) /* 803A7990 003A48F0 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 803A7994 003A48F4 80 83 00 04 */ lwz r4, 4(r3) @@ -245,7 +272,7 @@ lbl_803A7978: /* 803A79A8 003A4908 48 00 00 0C */ b lbl_803A79B4 lbl_803A79AC: /* 803A79AC 003A490C 80 03 00 00 */ lwz r0, 0(r3) -/* 803A79B0 003A4910 90 0D AF 04 */ stw r0, lbl_805A9AC4@sda21(r13) +/* 803A79B0 003A4910 90 0D AF 04 */ stw r0, vidRoot@sda21(r13) lbl_803A79B4: /* 803A79B4 003A4914 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 803A79B8 003A4918 80 83 00 00 */ lwz r4, 0(r3) @@ -254,10 +281,10 @@ lbl_803A79B4: /* 803A79C4 003A4924 80 03 00 04 */ lwz r0, 4(r3) /* 803A79C8 003A4928 90 04 00 04 */ stw r0, 4(r4) lbl_803A79CC: -/* 803A79CC 003A492C 80 0D AF 00 */ lwz r0, lbl_805A9AC0@sda21(r13) +/* 803A79CC 003A492C 80 0D AF 00 */ lwz r0, vidFree@sda21(r13) /* 803A79D0 003A4930 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 803A79D4 003A4934 90 03 00 00 */ stw r0, 0(r3) -/* 803A79D8 003A4938 80 6D AF 00 */ lwz r3, lbl_805A9AC0@sda21(r13) +/* 803A79D8 003A4938 80 6D AF 00 */ lwz r3, vidFree@sda21(r13) /* 803A79DC 003A493C 28 03 00 00 */ cmplwi r3, 0 /* 803A79E0 003A4940 41 82 00 0C */ beq lbl_803A79EC /* 803A79E4 003A4944 80 1F 00 FC */ lwz r0, 0xfc(r31) @@ -267,7 +294,7 @@ lbl_803A79EC: /* 803A79F0 003A4950 38 80 00 00 */ li r4, 0 /* 803A79F4 003A4954 90 83 00 04 */ stw r4, 4(r3) /* 803A79F8 003A4958 80 1F 00 FC */ lwz r0, 0xfc(r31) -/* 803A79FC 003A495C 90 0D AF 00 */ stw r0, lbl_805A9AC0@sda21(r13) +/* 803A79FC 003A495C 90 0D AF 00 */ stw r0, vidFree@sda21(r13) /* 803A7A00 003A4960 90 9F 00 FC */ stw r4, 0xfc(r31) /* 803A7A04 003A4964 48 00 00 78 */ b lbl_803A7A7C lbl_803A7A08: @@ -279,7 +306,7 @@ lbl_803A7A08: /* 803A7A1C 003A497C 48 00 00 0C */ b lbl_803A7A28 lbl_803A7A20: /* 803A7A20 003A4980 80 03 00 00 */ lwz r0, 0(r3) -/* 803A7A24 003A4984 90 0D AF 04 */ stw r0, lbl_805A9AC4@sda21(r13) +/* 803A7A24 003A4984 90 0D AF 04 */ stw r0, vidRoot@sda21(r13) lbl_803A7A28: /* 803A7A28 003A4988 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A7A2C 003A498C 80 83 00 00 */ lwz r4, 0(r3) @@ -288,10 +315,10 @@ lbl_803A7A28: /* 803A7A38 003A4998 80 03 00 04 */ lwz r0, 4(r3) /* 803A7A3C 003A499C 90 04 00 04 */ stw r0, 4(r4) lbl_803A7A40: -/* 803A7A40 003A49A0 80 0D AF 00 */ lwz r0, lbl_805A9AC0@sda21(r13) +/* 803A7A40 003A49A0 80 0D AF 00 */ lwz r0, vidFree@sda21(r13) /* 803A7A44 003A49A4 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 803A7A48 003A49A8 90 03 00 00 */ stw r0, 0(r3) -/* 803A7A4C 003A49AC 80 6D AF 00 */ lwz r3, lbl_805A9AC0@sda21(r13) +/* 803A7A4C 003A49AC 80 6D AF 00 */ lwz r3, vidFree@sda21(r13) /* 803A7A50 003A49B0 28 03 00 00 */ cmplwi r3, 0 /* 803A7A54 003A49B4 41 82 00 0C */ beq lbl_803A7A60 /* 803A7A58 003A49B8 80 1F 00 F8 */ lwz r0, 0xf8(r31) @@ -301,7 +328,7 @@ lbl_803A7A60: /* 803A7A64 003A49C4 38 80 00 00 */ li r4, 0 /* 803A7A68 003A49C8 90 83 00 04 */ stw r4, 4(r3) /* 803A7A6C 003A49CC 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 803A7A70 003A49D0 90 0D AF 00 */ stw r0, lbl_805A9AC0@sda21(r13) +/* 803A7A70 003A49D0 90 0D AF 00 */ stw r0, vidFree@sda21(r13) /* 803A7A74 003A49D4 90 9F 00 F8 */ stw r4, 0xf8(r31) /* 803A7A78 003A49D8 90 9F 00 FC */ stw r4, 0xfc(r31) lbl_803A7A7C: @@ -319,18 +346,18 @@ vidMakeRoot: /* 803A7A9C 003A49FC 80 63 00 08 */ lwz r3, 8(r3) /* 803A7AA0 003A4A00 4E 80 00 20 */ blr -.global sub_803a7aa4 -sub_803a7aa4: -/* 803A7AA4 003A4A04 80 CD AF 08 */ lwz r6, lbl_805A9AC8@sda21(r13) +.global vidMakeNew +vidMakeNew: +/* 803A7AA4 003A4A04 80 CD AF 08 */ lwz r6, vidCurrentId@sda21(r13) lbl_803A7AA8: /* 803A7AA8 003A4A08 3C 06 00 01 */ addis r0, r6, 1 /* 803A7AAC 003A4A0C 7C C5 33 78 */ mr r5, r6 /* 803A7AB0 003A4A10 28 00 FF FF */ cmplwi r0, 0xffff /* 803A7AB4 003A4A14 38 C6 00 01 */ addi r6, r6, 1 /* 803A7AB8 003A4A18 41 82 FF F0 */ beq lbl_803A7AA8 -/* 803A7ABC 003A4A1C 90 CD AF 08 */ stw r6, lbl_805A9AC8@sda21(r13) +/* 803A7ABC 003A4A1C 90 CD AF 08 */ stw r6, vidCurrentId@sda21(r13) /* 803A7AC0 003A4A20 7C A6 2B 78 */ mr r6, r5 -/* 803A7AC4 003A4A24 80 ED AF 04 */ lwz r7, lbl_805A9AC4@sda21(r13) +/* 803A7AC4 003A4A24 80 ED AF 04 */ lwz r7, vidRoot@sda21(r13) /* 803A7AC8 003A4A28 39 00 00 00 */ li r8, 0 /* 803A7ACC 003A4A2C 48 00 00 3C */ b lbl_803A7B08 lbl_803A7AD0: @@ -338,14 +365,14 @@ lbl_803A7AD0: /* 803A7AD4 003A4A34 7C 00 30 40 */ cmplw r0, r6 /* 803A7AD8 003A4A38 41 81 00 38 */ bgt lbl_803A7B10 /* 803A7ADC 003A4A3C 40 82 00 24 */ bne lbl_803A7B00 -/* 803A7AE0 003A4A40 80 CD AF 08 */ lwz r6, lbl_805A9AC8@sda21(r13) +/* 803A7AE0 003A4A40 80 CD AF 08 */ lwz r6, vidCurrentId@sda21(r13) lbl_803A7AE4: /* 803A7AE4 003A4A44 3C 06 00 01 */ addis r0, r6, 1 /* 803A7AE8 003A4A48 7C C5 33 78 */ mr r5, r6 /* 803A7AEC 003A4A4C 28 00 FF FF */ cmplwi r0, 0xffff /* 803A7AF0 003A4A50 38 C6 00 01 */ addi r6, r6, 1 /* 803A7AF4 003A4A54 41 82 FF F0 */ beq lbl_803A7AE4 -/* 803A7AF8 003A4A58 90 CD AF 08 */ stw r6, lbl_805A9AC8@sda21(r13) +/* 803A7AF8 003A4A58 90 CD AF 08 */ stw r6, vidCurrentId@sda21(r13) /* 803A7AFC 003A4A5C 7C A6 2B 78 */ mr r6, r5 lbl_803A7B00: /* 803A7B00 003A4A60 7C E8 3B 78 */ mr r8, r7 @@ -354,7 +381,7 @@ lbl_803A7B08: /* 803A7B08 003A4A68 28 07 00 00 */ cmplwi r7, 0 /* 803A7B0C 003A4A6C 40 82 FF C4 */ bne lbl_803A7AD0 lbl_803A7B10: -/* 803A7B10 003A4A70 80 AD AF 00 */ lwz r5, lbl_805A9AC0@sda21(r13) +/* 803A7B10 003A4A70 80 AD AF 00 */ lwz r5, vidFree@sda21(r13) /* 803A7B14 003A4A74 28 05 00 00 */ cmplwi r5, 0 /* 803A7B18 003A4A78 7C A9 2B 78 */ mr r9, r5 /* 803A7B1C 003A4A7C 40 82 00 0C */ bne lbl_803A7B28 @@ -363,14 +390,14 @@ lbl_803A7B10: lbl_803A7B28: /* 803A7B28 003A4A88 80 A5 00 00 */ lwz r5, 0(r5) /* 803A7B2C 003A4A8C 28 05 00 00 */ cmplwi r5, 0 -/* 803A7B30 003A4A90 90 AD AF 00 */ stw r5, lbl_805A9AC0@sda21(r13) +/* 803A7B30 003A4A90 90 AD AF 00 */ stw r5, vidFree@sda21(r13) /* 803A7B34 003A4A94 41 82 00 0C */ beq lbl_803A7B40 /* 803A7B38 003A4A98 38 00 00 00 */ li r0, 0 /* 803A7B3C 003A4A9C 90 05 00 04 */ stw r0, 4(r5) lbl_803A7B40: /* 803A7B40 003A4AA0 28 08 00 00 */ cmplwi r8, 0 /* 803A7B44 003A4AA4 40 82 00 0C */ bne lbl_803A7B50 -/* 803A7B48 003A4AA8 91 2D AF 04 */ stw r9, lbl_805A9AC4@sda21(r13) +/* 803A7B48 003A4AA8 91 2D AF 04 */ stw r9, vidRoot@sda21(r13) /* 803A7B4C 003A4AAC 48 00 00 08 */ b lbl_803A7B54 lbl_803A7B50: /* 803A7B50 003A4AB0 91 28 00 00 */ stw r9, 0(r8) @@ -406,7 +433,7 @@ vidGetInternalId: /* 803A7BA8 003A4B08 3C 03 00 01 */ addis r0, r3, 1 /* 803A7BAC 003A4B0C 28 00 FF FF */ cmplwi r0, 0xffff /* 803A7BB0 003A4B10 41 82 00 40 */ beq lbl_803A7BF0 -/* 803A7BB4 003A4B14 80 8D AF 04 */ lwz r4, lbl_805A9AC4@sda21(r13) +/* 803A7BB4 003A4B14 80 8D AF 04 */ lwz r4, vidRoot@sda21(r13) /* 803A7BB8 003A4B18 48 00 00 1C */ b lbl_803A7BD4 lbl_803A7BBC: /* 803A7BBC 003A4B1C 80 04 00 08 */ lwz r0, 8(r4) @@ -434,9 +461,9 @@ lbl_803A7BF0: voiceSetPriority: /* 803A7BF8 003A4B58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A7BFC 003A4B5C 7C 08 02 A6 */ mflr r0 -/* 803A7C00 003A4B60 3C A0 80 56 */ lis r5, lbl_8055D350@ha +/* 803A7C00 003A4B60 3C A0 80 56 */ lis r5, vidList@ha /* 803A7C04 003A4B64 90 01 00 14 */ stw r0, 0x14(r1) -/* 803A7C08 003A4B68 38 A5 D3 50 */ addi r5, r5, lbl_8055D350@l +/* 803A7C08 003A4B68 38 A5 D3 50 */ addi r5, r5, vidList@l /* 803A7C0C 003A4B6C 39 25 08 00 */ addi r9, r5, 0x800 /* 803A7C10 003A4B70 93 E1 00 0C */ stw r31, 0xc(r1) /* 803A7C14 003A4B74 80 03 00 F4 */ lwz r0, 0xf4(r3) @@ -495,7 +522,7 @@ lbl_803A7CA4: /* 803A7CDC 003A4C3C 48 00 00 0C */ b lbl_803A7CE8 lbl_803A7CE0: /* 803A7CE0 003A4C40 A0 EC 00 00 */ lhz r7, 0(r12) -/* 803A7CE4 003A4C44 B0 ED AF 0C */ sth r7, lbl_805A9ACC@sda21(r13) +/* 803A7CE4 003A4C44 B0 ED AF 0C */ sth r7, voicePrioSortRootListRoot@sda21(r13) lbl_803A7CE8: /* 803A7CE8 003A4C48 A0 EC 00 00 */ lhz r7, 0(r12) /* 803A7CEC 003A4C4C 28 07 FF FF */ cmplwi r7, 0xffff @@ -524,7 +551,7 @@ lbl_803A7D10: /* 803A7D40 003A4CA0 7C 05 41 AE */ stbx r0, r5, r8 /* 803A7D44 003A4CA4 48 00 00 CC */ b lbl_803A7E10 lbl_803A7D48: -/* 803A7D48 003A4CA8 A1 2D AF 0C */ lhz r9, lbl_805A9ACC@sda21(r13) +/* 803A7D48 003A4CA8 A1 2D AF 0C */ lhz r9, voicePrioSortRootListRoot@sda21(r13) /* 803A7D4C 003A4CAC 28 09 FF FF */ cmplwi r9, 0xffff /* 803A7D50 003A4CB0 41 82 00 A0 */ beq lbl_803A7DF0 /* 803A7D54 003A4CB4 7C 07 48 00 */ cmpw r7, r9 @@ -568,13 +595,13 @@ lbl_803A7DC4: /* 803A7DDC 003A4D3C 7C A8 53 2E */ sthx r5, r8, r10 /* 803A7DE0 003A4D40 55 25 13 BA */ rlwinm r5, r9, 2, 0xe, 0x1d /* 803A7DE4 003A4D44 7C E8 2B 2E */ sthx r7, r8, r5 -/* 803A7DE8 003A4D48 B0 ED AF 0C */ sth r7, lbl_805A9ACC@sda21(r13) +/* 803A7DE8 003A4D48 B0 ED AF 0C */ sth r7, voicePrioSortRootListRoot@sda21(r13) /* 803A7DEC 003A4D4C 48 00 00 24 */ b lbl_803A7E10 lbl_803A7DF0: /* 803A7DF0 003A4D50 3D 00 00 01 */ lis r8, 0x0000FFFF@ha /* 803A7DF4 003A4D54 54 E9 10 3A */ slwi r9, r7, 2 /* 803A7DF8 003A4D58 38 A5 0A 00 */ addi r5, r5, 0xa00 -/* 803A7DFC 003A4D5C B0 ED AF 0C */ sth r7, lbl_805A9ACC@sda21(r13) +/* 803A7DFC 003A4D5C B0 ED AF 0C */ sth r7, voicePrioSortRootListRoot@sda21(r13) /* 803A7E00 003A4D60 39 08 FF FF */ addi r8, r8, 0x0000FFFF@l /* 803A7E04 003A4D64 7D 05 4B 2E */ sthx r8, r5, r9 /* 803A7E08 003A4D68 7C A5 4A 14 */ add r5, r5, r9 @@ -595,22 +622,22 @@ lbl_803A7E30: /* 803A7E3C 003A4D9C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A7E40 003A4DA0 4E 80 00 20 */ blr -.global sub_803a7e44 -sub_803a7e44: +.global voiceAllocateFind +voiceAllocateFind: /* 803A7E44 003A4DA4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803A7E48 003A4DA8 7C 08 02 A6 */ mflr r0 /* 803A7E4C 003A4DAC 90 01 00 34 */ stw r0, 0x34(r1) /* 803A7E50 003A4DB0 39 61 00 30 */ addi r11, r1, 0x30 /* 803A7E54 003A4DB4 4B FE 1C 15 */ bl sub_80389a68 -/* 803A7E58 003A4DB8 88 0D AE 80 */ lbz r0, lbl_805A9A40@sda21(r13) -/* 803A7E5C 003A4DBC 3C E0 80 56 */ lis r7, lbl_8055D350@ha -/* 803A7E60 003A4DC0 39 07 D3 50 */ addi r8, r7, lbl_8055D350@l +/* 803A7E58 003A4DB8 88 0D AE 80 */ lbz r0, synthIdleWaitActive@sda21(r13) +/* 803A7E5C 003A4DBC 3C E0 80 56 */ lis r7, vidList@ha +/* 803A7E60 003A4DC0 39 07 D3 50 */ addi r8, r7, vidList@l /* 803A7E64 003A4DC4 28 00 00 00 */ cmplwi r0, 0 /* 803A7E68 003A4DC8 40 82 04 20 */ bne lbl_803A8288 /* 803A7E6C 003A4DCC 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 803A7E70 003A4DD0 41 82 00 44 */ beq lbl_803A7EB4 /* 803A7E74 003A4DD4 3C E0 80 55 */ lis r7, synthInfo@ha -/* 803A7E78 003A4DD8 88 0D AF 0F */ lbz r0, lbl_805A9ACF@sda21(r13) +/* 803A7E78 003A4DD8 88 0D AF 0F */ lbz r0, voiceFxRunning@sda21(r13) /* 803A7E7C 003A4DDC 38 E7 00 50 */ addi r7, r7, synthInfo@l /* 803A7E80 003A4DE0 39 20 00 00 */ li r9, 0 /* 803A7E84 003A4DE4 89 47 02 12 */ lbz r10, 0x212(r7) @@ -628,7 +655,7 @@ lbl_803A7EA0: /* 803A7EB0 003A4E10 48 00 00 40 */ b lbl_803A7EF0 lbl_803A7EB4: /* 803A7EB4 003A4E14 3C E0 80 55 */ lis r7, synthInfo@ha -/* 803A7EB8 003A4E18 88 0D AF 0E */ lbz r0, lbl_805A9ACE@sda21(r13) +/* 803A7EB8 003A4E18 88 0D AF 0E */ lbz r0, voiceMusicRunning@sda21(r13) /* 803A7EBC 003A4E1C 38 E7 00 50 */ addi r7, r7, synthInfo@l /* 803A7EC0 003A4E20 39 20 00 00 */ li r9, 0 /* 803A7EC4 003A4E24 89 47 02 11 */ lbz r10, 0x211(r7) @@ -644,9 +671,9 @@ lbl_803A7EE0: /* 803A7EE8 003A4E48 7C 0A 00 40 */ cmplw r10, r0 /* 803A7EEC 003A4E4C 40 81 01 7C */ ble lbl_803A8068 lbl_803A7EF0: -/* 803A7EF0 003A4E50 A2 CD AF 0C */ lhz r22, lbl_805A9ACC@sda21(r13) +/* 803A7EF0 003A4E50 A2 CD AF 0C */ lhz r22, voicePrioSortRootListRoot@sda21(r13) /* 803A7EF4 003A4E54 54 69 06 3E */ clrlwi r9, r3, 0x18 -/* 803A7EF8 003A4E58 81 8D AE 78 */ lwz r12, lbl_805A9A38@sda21(r13) +/* 803A7EF8 003A4E58 81 8D AE 78 */ lwz r12, synthVoice@sda21(r13) /* 803A7EFC 003A4E5C 54 A0 04 3E */ clrlwi r0, r5, 0x10 /* 803A7F00 003A4E60 3B 48 08 00 */ addi r26, r8, 0x800 /* 803A7F04 003A4E64 38 E8 09 00 */ addi r7, r8, 0x900 @@ -753,7 +780,7 @@ lbl_803A8060: /* 803A8060 003A4FC0 7C 1E 58 00 */ cmpw r30, r11 /* 803A8064 003A4FC4 40 80 01 3C */ bge lbl_803A81A0 lbl_803A8068: -/* 803A8068 003A4FC8 88 0D AF 11 */ lbz r0, lbl_805A9AD1@sda21(r13) +/* 803A8068 003A4FC8 88 0D AF 11 */ lbz r0, voiceListRoot@sda21(r13) /* 803A806C 003A4FCC 28 00 00 FF */ cmplwi r0, 0xff /* 803A8070 003A4FD0 41 82 00 14 */ beq lbl_803A8084 /* 803A8074 003A4FD4 28 1C 00 00 */ cmplwi r28, 0 @@ -761,14 +788,14 @@ lbl_803A8068: /* 803A807C 003A4FDC 7C 1D 03 78 */ mr r29, r0 /* 803A8080 003A4FE0 48 00 01 20 */ b lbl_803A81A0 lbl_803A8084: -/* 803A8084 003A4FE4 A1 4D AF 0C */ lhz r10, lbl_805A9ACC@sda21(r13) +/* 803A8084 003A4FE4 A1 4D AF 0C */ lhz r10, voicePrioSortRootListRoot@sda21(r13) /* 803A8088 003A4FE8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803A808C 003A4FEC 7C 00 50 00 */ cmpw r0, r10 /* 803A8090 003A4FF0 40 80 00 0C */ bge lbl_803A809C /* 803A8094 003A4FF4 38 60 FF FF */ li r3, -1 /* 803A8098 003A4FF8 48 00 01 F4 */ b lbl_803A828C lbl_803A809C: -/* 803A809C 003A4FFC 80 ED AE 78 */ lwz r7, lbl_805A9A38@sda21(r13) +/* 803A809C 003A4FFC 80 ED AE 78 */ lwz r7, synthVoice@sda21(r13) /* 803A80A0 003A5000 39 68 08 00 */ addi r11, r8, 0x800 /* 803A80A4 003A5004 38 88 09 00 */ addi r4, r8, 0x900 /* 803A80A8 003A5008 39 28 0A 00 */ addi r9, r8, 0xa00 @@ -861,7 +888,7 @@ lbl_803A81A0: /* 803A81DC 003A513C 48 00 00 0C */ b lbl_803A81E8 lbl_803A81E0: /* 803A81E0 003A5140 88 05 00 01 */ lbz r0, 1(r5) -/* 803A81E4 003A5144 98 0D AF 11 */ stb r0, lbl_805A9AD1@sda21(r13) +/* 803A81E4 003A5144 98 0D AF 11 */ stb r0, voiceListRoot@sda21(r13) lbl_803A81E8: /* 803A81E8 003A5148 88 05 00 01 */ lbz r0, 1(r5) /* 803A81EC 003A514C 2C 00 00 FF */ cmpwi r0, 0xff @@ -871,42 +898,42 @@ lbl_803A81E8: /* 803A81FC 003A515C 38 68 0E 00 */ addi r3, r8, 0xe00 /* 803A8200 003A5160 7C 83 01 AE */ stbx r4, r3, r0 lbl_803A8204: -/* 803A8204 003A5164 88 0D AF 10 */ lbz r0, lbl_805A9AD0@sda21(r13) +/* 803A8204 003A5164 88 0D AF 10 */ lbz r0, voiceListInsert@sda21(r13) /* 803A8208 003A5168 7C 1D 00 00 */ cmpw r29, r0 /* 803A820C 003A516C 40 82 00 0C */ bne lbl_803A8218 /* 803A8210 003A5170 88 05 00 00 */ lbz r0, 0(r5) -/* 803A8214 003A5174 98 0D AF 10 */ stb r0, lbl_805A9AD0@sda21(r13) +/* 803A8214 003A5174 98 0D AF 10 */ stb r0, voiceListInsert@sda21(r13) lbl_803A8218: /* 803A8218 003A5178 38 00 00 00 */ li r0, 0 /* 803A821C 003A517C B0 05 00 02 */ sth r0, 2(r5) /* 803A8220 003A5180 48 00 00 38 */ b lbl_803A8258 lbl_803A8224: /* 803A8224 003A5184 1C 1D 04 04 */ mulli r0, r29, 0x404 -/* 803A8228 003A5188 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A8228 003A5188 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A822C 003A518C 7C 63 02 14 */ add r3, r3, r0 /* 803A8230 003A5190 88 03 01 1D */ lbz r0, 0x11d(r3) /* 803A8234 003A5194 28 00 00 00 */ cmplwi r0, 0 /* 803A8238 003A5198 41 82 00 14 */ beq lbl_803A824C -/* 803A823C 003A519C 88 6D AF 0F */ lbz r3, lbl_805A9ACF@sda21(r13) +/* 803A823C 003A519C 88 6D AF 0F */ lbz r3, voiceFxRunning@sda21(r13) /* 803A8240 003A51A0 38 03 FF FF */ addi r0, r3, -1 -/* 803A8244 003A51A4 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) +/* 803A8244 003A51A4 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) /* 803A8248 003A51A8 48 00 00 10 */ b lbl_803A8258 lbl_803A824C: -/* 803A824C 003A51AC 88 6D AF 0E */ lbz r3, lbl_805A9ACE@sda21(r13) +/* 803A824C 003A51AC 88 6D AF 0E */ lbz r3, voiceMusicRunning@sda21(r13) /* 803A8250 003A51B0 38 03 FF FF */ addi r0, r3, -1 -/* 803A8254 003A51B4 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A8254 003A51B4 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) lbl_803A8258: /* 803A8258 003A51B8 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 803A825C 003A51BC 41 82 00 10 */ beq lbl_803A826C -/* 803A8260 003A51C0 88 6D AF 0F */ lbz r3, lbl_805A9ACF@sda21(r13) +/* 803A8260 003A51C0 88 6D AF 0F */ lbz r3, voiceFxRunning@sda21(r13) /* 803A8264 003A51C4 38 03 00 01 */ addi r0, r3, 1 -/* 803A8268 003A51C8 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) +/* 803A8268 003A51C8 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) lbl_803A826C: /* 803A826C 003A51CC 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 803A8270 003A51D0 40 82 00 10 */ bne lbl_803A8280 -/* 803A8274 003A51D4 88 6D AF 0E */ lbz r3, lbl_805A9ACE@sda21(r13) +/* 803A8274 003A51D4 88 6D AF 0E */ lbz r3, voiceMusicRunning@sda21(r13) /* 803A8278 003A51D8 38 03 00 01 */ addi r0, r3, 1 -/* 803A827C 003A51DC 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A827C 003A51DC 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) lbl_803A8280: /* 803A8280 003A51E0 7F A3 EB 78 */ mr r3, r29 /* 803A8284 003A51E4 48 00 00 08 */ b lbl_803A828C @@ -924,10 +951,10 @@ lbl_803A828C: voiceFree: /* 803A82A4 003A5204 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A82A8 003A5208 7C 08 02 A6 */ mflr r0 -/* 803A82AC 003A520C 3C 80 80 56 */ lis r4, lbl_8055D350@ha +/* 803A82AC 003A520C 3C 80 80 56 */ lis r4, vidList@ha /* 803A82B0 003A5210 90 01 00 14 */ stw r0, 0x14(r1) /* 803A82B4 003A5214 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803A82B8 003A5218 3B E4 D3 50 */ addi r31, r4, lbl_8055D350@l +/* 803A82B8 003A5218 3B E4 D3 50 */ addi r31, r4, vidList@l /* 803A82BC 003A521C 38 80 00 02 */ li r4, 2 /* 803A82C0 003A5220 93 C1 00 08 */ stw r30, 8(r1) /* 803A82C4 003A5224 7C 7E 1B 78 */ mr r30, r3 @@ -980,7 +1007,7 @@ lbl_803A833C: /* 803A8374 003A52D4 48 00 00 0C */ b lbl_803A8380 lbl_803A8378: /* 803A8378 003A52D8 A0 06 00 00 */ lhz r0, 0(r6) -/* 803A837C 003A52DC B0 0D AF 0C */ sth r0, lbl_805A9ACC@sda21(r13) +/* 803A837C 003A52DC B0 0D AF 0C */ sth r0, voicePrioSortRootListRoot@sda21(r13) lbl_803A8380: /* 803A8380 003A52E0 A0 06 00 00 */ lhz r0, 0(r6) /* 803A8384 003A52E4 28 00 FF FF */ cmplwi r0, 0xffff @@ -1005,13 +1032,13 @@ lbl_803A83A8: /* 803A83C8 003A5328 A0 06 00 02 */ lhz r0, 2(r6) /* 803A83CC 003A532C 28 00 00 00 */ cmplwi r0, 0 /* 803A83D0 003A5330 40 82 00 78 */ bne lbl_803A8448 -/* 803A83D4 003A5334 88 0D AF 11 */ lbz r0, lbl_805A9AD1@sda21(r13) +/* 803A83D4 003A5334 88 0D AF 11 */ lbz r0, voiceListRoot@sda21(r13) /* 803A83D8 003A5338 38 60 00 01 */ li r3, 1 /* 803A83DC 003A533C B0 66 00 02 */ sth r3, 2(r6) /* 803A83E0 003A5340 28 00 00 FF */ cmplwi r0, 0xff /* 803A83E4 003A5344 41 82 00 28 */ beq lbl_803A840C /* 803A83E8 003A5348 38 00 00 FF */ li r0, 0xff -/* 803A83EC 003A534C 88 8D AF 10 */ lbz r4, lbl_805A9AD0@sda21(r13) +/* 803A83EC 003A534C 88 8D AF 10 */ lbz r4, voiceListInsert@sda21(r13) /* 803A83F0 003A5350 98 06 00 01 */ stb r0, 1(r6) /* 803A83F4 003A5354 38 7F 0E 00 */ addi r3, r31, 0xe00 /* 803A83F8 003A5358 54 80 10 3A */ slwi r0, r4, 2 @@ -1021,22 +1048,22 @@ lbl_803A83A8: /* 803A8408 003A5368 48 00 00 14 */ b lbl_803A841C lbl_803A840C: /* 803A840C 003A536C 38 00 00 FF */ li r0, 0xff -/* 803A8410 003A5370 98 AD AF 11 */ stb r5, lbl_805A9AD1@sda21(r13) +/* 803A8410 003A5370 98 AD AF 11 */ stb r5, voiceListRoot@sda21(r13) /* 803A8414 003A5374 98 06 00 01 */ stb r0, 1(r6) /* 803A8418 003A5378 98 06 00 00 */ stb r0, 0(r6) lbl_803A841C: -/* 803A841C 003A537C 98 AD AF 10 */ stb r5, lbl_805A9AD0@sda21(r13) +/* 803A841C 003A537C 98 AD AF 10 */ stb r5, voiceListInsert@sda21(r13) /* 803A8420 003A5380 88 1E 01 1D */ lbz r0, 0x11d(r30) /* 803A8424 003A5384 28 00 00 00 */ cmplwi r0, 0 /* 803A8428 003A5388 41 82 00 14 */ beq lbl_803A843C -/* 803A842C 003A538C 88 6D AF 0F */ lbz r3, lbl_805A9ACF@sda21(r13) +/* 803A842C 003A538C 88 6D AF 0F */ lbz r3, voiceFxRunning@sda21(r13) /* 803A8430 003A5390 38 03 FF FF */ addi r0, r3, -1 -/* 803A8434 003A5394 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) +/* 803A8434 003A5394 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) /* 803A8438 003A5398 48 00 00 10 */ b lbl_803A8448 lbl_803A843C: -/* 803A843C 003A539C 88 6D AF 0E */ lbz r3, lbl_805A9ACE@sda21(r13) +/* 803A843C 003A539C 88 6D AF 0E */ lbz r3, voiceMusicRunning@sda21(r13) /* 803A8440 003A53A0 38 03 FF FF */ addi r0, r3, -1 -/* 803A8444 003A53A4 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A8444 003A53A4 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) lbl_803A8448: /* 803A8448 003A53A8 38 00 FF FF */ li r0, -1 /* 803A844C 003A53AC 90 1E 00 F4 */ stw r0, 0xf4(r30) @@ -1052,10 +1079,10 @@ synthInitAllocationAids: /* 803A8468 003A53C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A846C 003A53CC 3C 60 80 55 */ lis r3, synthInfo@ha /* 803A8470 003A53D0 39 83 00 50 */ addi r12, r3, synthInfo@l -/* 803A8474 003A53D4 3C 80 80 56 */ lis r4, lbl_8055D350@ha +/* 803A8474 003A53D4 3C 80 80 56 */ lis r4, vidList@ha /* 803A8478 003A53D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 803A847C 003A53DC 3B E0 00 00 */ li r31, 0 -/* 803A8480 003A53E0 38 64 D3 50 */ addi r3, r4, lbl_8055D350@l +/* 803A8480 003A53E0 38 64 D3 50 */ addi r3, r4, vidList@l /* 803A8484 003A53E4 93 C1 00 08 */ stw r30, 8(r1) /* 803A8488 003A53E8 88 AC 02 10 */ lbz r5, 0x210(r12) /* 803A848C 003A53EC 28 05 00 00 */ cmplwi r5, 0 @@ -1136,10 +1163,10 @@ lbl_803A8590: /* 803A85A8 003A5508 7C A6 2A 14 */ add r5, r6, r5 /* 803A85AC 003A550C 38 08 FF FF */ addi r0, r8, -1 /* 803A85B0 003A5510 28 08 00 00 */ cmplwi r8, 0 -/* 803A85B4 003A5514 98 8D AF 11 */ stb r4, lbl_805A9AD1@sda21(r13) +/* 803A85B4 003A5514 98 8D AF 11 */ stb r4, voiceListRoot@sda21(r13) /* 803A85B8 003A5518 7C 86 23 78 */ mr r6, r4 /* 803A85BC 003A551C 98 E5 FF FD */ stb r7, -3(r5) -/* 803A85C0 003A5520 98 0D AF 10 */ stb r0, lbl_805A9AD0@sda21(r13) +/* 803A85C0 003A5520 98 0D AF 10 */ stb r0, voiceListInsert@sda21(r13) /* 803A85C4 003A5524 40 81 00 84 */ ble lbl_803A8648 /* 803A85C8 003A5528 28 08 00 08 */ cmplwi r8, 8 /* 803A85CC 003A552C 38 A8 FF F8 */ addi r5, r8, -8 @@ -1219,16 +1246,16 @@ lbl_803A8658: /* 803A86E0 003A5640 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 803A86E4 003A5644 38 00 00 00 */ li r0, 0 /* 803A86E8 003A5648 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l -/* 803A86EC 003A564C 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) -/* 803A86F0 003A5650 B0 6D AF 0C */ sth r3, lbl_805A9ACC@sda21(r13) -/* 803A86F4 003A5654 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A86EC 003A564C 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) +/* 803A86F0 003A5650 B0 6D AF 0C */ sth r3, voicePrioSortRootListRoot@sda21(r13) +/* 803A86F4 003A5654 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) /* 803A86F8 003A5658 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A86FC 003A565C 83 C1 00 08 */ lwz r30, 8(r1) /* 803A8700 003A5660 38 21 00 10 */ addi r1, r1, 0x10 /* 803A8704 003A5664 4E 80 00 20 */ blr -.global sub_803a8708 -sub_803a8708: +.global voiceBlock +voiceBlock: /* 803A8708 003A5668 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A870C 003A566C 7C 08 02 A6 */ mflr r0 /* 803A8710 003A5670 3C 80 00 01 */ lis r4, 0x0000FFFF@ha @@ -1240,28 +1267,28 @@ sub_803a8708: /* 803A8728 003A5688 93 C1 00 18 */ stw r30, 0x18(r1) /* 803A872C 003A568C 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A8730 003A5690 7C 7D 1B 78 */ mr r29, r3 -/* 803A8734 003A5694 4B FF F7 11 */ bl sub_803a7e44 +/* 803A8734 003A5694 4B FF F7 11 */ bl voiceAllocateFind /* 803A8738 003A5698 7C 7E 1B 78 */ mr r30, r3 /* 803A873C 003A569C 3C 1E 00 01 */ addis r0, r30, 1 /* 803A8740 003A56A0 28 00 FF FF */ cmplwi r0, 0xffff /* 803A8744 003A56A4 41 82 00 A0 */ beq lbl_803A87E4 /* 803A8748 003A56A8 1F FE 04 04 */ mulli r31, r30, 0x404 -/* 803A874C 003A56AC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A874C 003A56AC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8750 003A56B0 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 803A8754 003A56B4 38 C0 00 01 */ li r6, 1 /* 803A8758 003A56B8 7C A0 FA 14 */ add r5, r0, r31 /* 803A875C 003A56BC 38 83 FF FF */ addi r4, r3, 0x0000FFFF@l /* 803A8760 003A56C0 98 C5 01 1C */ stb r6, 0x11c(r5) -/* 803A8764 003A56C4 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8764 003A56C4 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8768 003A56C8 7C 60 FA 14 */ add r3, r0, r31 /* 803A876C 003A56CC 98 C3 01 1D */ stb r6, 0x11d(r3) -/* 803A8770 003A56D0 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8770 003A56D0 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8774 003A56D4 7C 60 FA 14 */ add r3, r0, r31 /* 803A8778 003A56D8 B0 83 01 00 */ sth r4, 0x100(r3) -/* 803A877C 003A56DC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A877C 003A56DC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8780 003A56E0 7C 60 FA 14 */ add r3, r0, r31 -/* 803A8784 003A56E4 4B FF EF BD */ bl sub_803a7740 -/* 803A8788 003A56E8 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8784 003A56E4 4B FF EF BD */ bl vidRemoveVoiceReferences +/* 803A8788 003A56E8 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A878C 003A56EC 67 C5 FF FF */ oris r5, r30, 0xffff /* 803A8790 003A56F0 60 A5 FF 00 */ ori r5, r5, 0xff00 /* 803A8794 003A56F4 7F C3 F3 78 */ mr r3, r30 @@ -1273,16 +1300,16 @@ sub_803a8708: /* 803A87AC 003A570C 7F C3 F3 78 */ mr r3, r30 /* 803A87B0 003A5710 48 00 AB DD */ bl hwBreak lbl_803A87B4: -/* 803A87B4 003A5714 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A87B4 003A5714 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A87B8 003A5718 38 80 00 02 */ li r4, 2 /* 803A87BC 003A571C 7C 60 FA 14 */ add r3, r0, r31 /* 803A87C0 003A5720 4B FF E9 05 */ bl macMakeInactive -/* 803A87C4 003A5724 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A87C4 003A5724 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A87C8 003A5728 38 A0 00 00 */ li r5, 0 /* 803A87CC 003A572C 7F A4 EB 78 */ mr r4, r29 /* 803A87D0 003A5730 7C 60 FA 14 */ add r3, r0, r31 /* 803A87D4 003A5734 90 A3 00 34 */ stw r5, 0x34(r3) -/* 803A87D8 003A5738 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A87D8 003A5738 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A87DC 003A573C 7C 60 FA 14 */ add r3, r0, r31 /* 803A87E0 003A5740 4B FF F4 19 */ bl voiceSetPriority lbl_803A87E4: @@ -1299,10 +1326,10 @@ lbl_803A87E4: voiceUnblock: /* 803A8804 003A5764 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A8808 003A5768 7C 08 02 A6 */ mflr r0 -/* 803A880C 003A576C 3C 80 80 56 */ lis r4, lbl_8055D350@ha +/* 803A880C 003A576C 3C 80 80 56 */ lis r4, vidList@ha /* 803A8810 003A5770 90 01 00 24 */ stw r0, 0x24(r1) /* 803A8814 003A5774 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803A8818 003A5778 3B E4 D3 50 */ addi r31, r4, lbl_8055D350@l +/* 803A8818 003A5778 3B E4 D3 50 */ addi r31, r4, vidList@l /* 803A881C 003A577C 93 C1 00 18 */ stw r30, 0x18(r1) /* 803A8820 003A5780 7C 7E 1B 78 */ mr r30, r3 /* 803A8824 003A5784 3C 1E 00 01 */ addis r0, r30, 1 @@ -1316,11 +1343,11 @@ voiceUnblock: /* 803A8844 003A57A4 48 00 AB 49 */ bl hwBreak lbl_803A8848: /* 803A8848 003A57A8 1F BE 04 04 */ mulli r29, r30, 0x404 -/* 803A884C 003A57AC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A884C 003A57AC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8850 003A57B0 38 80 00 02 */ li r4, 2 /* 803A8854 003A57B4 7C 60 EA 14 */ add r3, r0, r29 /* 803A8858 003A57B8 93 C3 00 F4 */ stw r30, 0xf4(r3) -/* 803A885C 003A57BC 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A885C 003A57BC 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8860 003A57C0 7F C0 EA 14 */ add r30, r0, r29 /* 803A8864 003A57C4 7F C3 F3 78 */ mr r3, r30 /* 803A8868 003A57C8 4B FF E8 5D */ bl macMakeInactive @@ -1372,7 +1399,7 @@ lbl_803A88DC: /* 803A8914 003A5874 48 00 00 0C */ b lbl_803A8920 lbl_803A8918: /* 803A8918 003A5878 A0 06 00 00 */ lhz r0, 0(r6) -/* 803A891C 003A587C B0 0D AF 0C */ sth r0, lbl_805A9ACC@sda21(r13) +/* 803A891C 003A587C B0 0D AF 0C */ sth r0, voicePrioSortRootListRoot@sda21(r13) lbl_803A8920: /* 803A8920 003A5880 A0 06 00 00 */ lhz r0, 0(r6) /* 803A8924 003A5884 28 00 FF FF */ cmplwi r0, 0xffff @@ -1397,13 +1424,13 @@ lbl_803A8948: /* 803A8968 003A58C8 A0 05 00 02 */ lhz r0, 2(r5) /* 803A896C 003A58CC 28 00 00 00 */ cmplwi r0, 0 /* 803A8970 003A58D0 40 82 00 78 */ bne lbl_803A89E8 -/* 803A8974 003A58D4 88 0D AF 11 */ lbz r0, lbl_805A9AD1@sda21(r13) +/* 803A8974 003A58D4 88 0D AF 11 */ lbz r0, voiceListRoot@sda21(r13) /* 803A8978 003A58D8 38 60 00 01 */ li r3, 1 /* 803A897C 003A58DC B0 65 00 02 */ sth r3, 2(r5) /* 803A8980 003A58E0 28 00 00 FF */ cmplwi r0, 0xff /* 803A8984 003A58E4 41 82 00 28 */ beq lbl_803A89AC /* 803A8988 003A58E8 38 00 00 FF */ li r0, 0xff -/* 803A898C 003A58EC 88 8D AF 10 */ lbz r4, lbl_805A9AD0@sda21(r13) +/* 803A898C 003A58EC 88 8D AF 10 */ lbz r4, voiceListInsert@sda21(r13) /* 803A8990 003A58F0 98 05 00 01 */ stb r0, 1(r5) /* 803A8994 003A58F4 38 7F 0E 00 */ addi r3, r31, 0xe00 /* 803A8998 003A58F8 54 80 10 3A */ slwi r0, r4, 2 @@ -1413,27 +1440,27 @@ lbl_803A8948: /* 803A89A8 003A5908 48 00 00 14 */ b lbl_803A89BC lbl_803A89AC: /* 803A89AC 003A590C 38 00 00 FF */ li r0, 0xff -/* 803A89B0 003A5910 98 CD AF 11 */ stb r6, lbl_805A9AD1@sda21(r13) +/* 803A89B0 003A5910 98 CD AF 11 */ stb r6, voiceListRoot@sda21(r13) /* 803A89B4 003A5914 98 05 00 01 */ stb r0, 1(r5) /* 803A89B8 003A5918 98 05 00 00 */ stb r0, 0(r5) lbl_803A89BC: -/* 803A89BC 003A591C 98 CD AF 10 */ stb r6, lbl_805A9AD0@sda21(r13) +/* 803A89BC 003A591C 98 CD AF 10 */ stb r6, voiceListInsert@sda21(r13) /* 803A89C0 003A5920 88 1E 01 1D */ lbz r0, 0x11d(r30) /* 803A89C4 003A5924 28 00 00 00 */ cmplwi r0, 0 /* 803A89C8 003A5928 41 82 00 14 */ beq lbl_803A89DC -/* 803A89CC 003A592C 88 6D AF 0F */ lbz r3, lbl_805A9ACF@sda21(r13) +/* 803A89CC 003A592C 88 6D AF 0F */ lbz r3, voiceFxRunning@sda21(r13) /* 803A89D0 003A5930 38 03 FF FF */ addi r0, r3, -1 -/* 803A89D4 003A5934 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) +/* 803A89D4 003A5934 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) /* 803A89D8 003A5938 48 00 00 10 */ b lbl_803A89E8 lbl_803A89DC: -/* 803A89DC 003A593C 88 6D AF 0E */ lbz r3, lbl_805A9ACE@sda21(r13) +/* 803A89DC 003A593C 88 6D AF 0E */ lbz r3, voiceMusicRunning@sda21(r13) /* 803A89E0 003A5940 38 03 FF FF */ addi r0, r3, -1 -/* 803A89E4 003A5944 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A89E4 003A5944 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) lbl_803A89E8: /* 803A89E8 003A5948 38 00 FF FF */ li r0, -1 /* 803A89EC 003A594C 38 80 00 00 */ li r4, 0 /* 803A89F0 003A5950 90 1E 00 F4 */ stw r0, 0xf4(r30) -/* 803A89F4 003A5954 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A89F4 003A5954 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A89F8 003A5958 7C 60 EA 14 */ add r3, r0, r29 /* 803A89FC 003A595C 98 83 01 1C */ stb r4, 0x11c(r3) lbl_803A8A00: @@ -1449,21 +1476,21 @@ lbl_803A8A00: voiceKill: /* 803A8A1C 003A597C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A8A20 003A5980 7C 08 02 A6 */ mflr r0 -/* 803A8A24 003A5984 3C 80 80 56 */ lis r4, lbl_8055D350@ha +/* 803A8A24 003A5984 3C 80 80 56 */ lis r4, vidList@ha /* 803A8A28 003A5988 90 01 00 24 */ stw r0, 0x24(r1) /* 803A8A2C 003A598C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803A8A30 003A5990 3B E4 D3 50 */ addi r31, r4, lbl_8055D350@l +/* 803A8A30 003A5990 3B E4 D3 50 */ addi r31, r4, vidList@l /* 803A8A34 003A5994 93 C1 00 18 */ stw r30, 0x18(r1) /* 803A8A38 003A5998 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A8A3C 003A599C 7C 7D 1B 78 */ mr r29, r3 /* 803A8A40 003A59A0 1C 1D 04 04 */ mulli r0, r29, 0x404 -/* 803A8A44 003A59A4 80 6D AE 78 */ lwz r3, lbl_805A9A38@sda21(r13) +/* 803A8A44 003A59A4 80 6D AE 78 */ lwz r3, synthVoice@sda21(r13) /* 803A8A48 003A59A8 7F C3 02 14 */ add r30, r3, r0 /* 803A8A4C 003A59AC 80 1E 00 34 */ lwz r0, 0x34(r30) /* 803A8A50 003A59B0 28 00 00 00 */ cmplwi r0, 0 /* 803A8A54 003A59B4 41 82 01 C4 */ beq lbl_803A8C18 /* 803A8A58 003A59B8 7F C3 F3 78 */ mr r3, r30 -/* 803A8A5C 003A59BC 4B FF EC E5 */ bl sub_803a7740 +/* 803A8A5C 003A59BC 4B FF EC E5 */ bl vidRemoveVoiceReferences /* 803A8A60 003A59C0 80 7E 01 18 */ lwz r3, 0x118(r30) /* 803A8A64 003A59C4 38 00 FF FC */ li r0, -4 /* 803A8A68 003A59C8 80 BE 01 14 */ lwz r5, 0x114(r30) @@ -1525,7 +1552,7 @@ lbl_803A8B04: /* 803A8B3C 003A5A9C 48 00 00 0C */ b lbl_803A8B48 lbl_803A8B40: /* 803A8B40 003A5AA0 A0 06 00 00 */ lhz r0, 0(r6) -/* 803A8B44 003A5AA4 B0 0D AF 0C */ sth r0, lbl_805A9ACC@sda21(r13) +/* 803A8B44 003A5AA4 B0 0D AF 0C */ sth r0, voicePrioSortRootListRoot@sda21(r13) lbl_803A8B48: /* 803A8B48 003A5AA8 A0 06 00 00 */ lhz r0, 0(r6) /* 803A8B4C 003A5AAC 28 00 FF FF */ cmplwi r0, 0xffff @@ -1550,13 +1577,13 @@ lbl_803A8B70: /* 803A8B90 003A5AF0 A0 05 00 02 */ lhz r0, 2(r5) /* 803A8B94 003A5AF4 28 00 00 00 */ cmplwi r0, 0 /* 803A8B98 003A5AF8 40 82 00 78 */ bne lbl_803A8C10 -/* 803A8B9C 003A5AFC 88 0D AF 11 */ lbz r0, lbl_805A9AD1@sda21(r13) +/* 803A8B9C 003A5AFC 88 0D AF 11 */ lbz r0, voiceListRoot@sda21(r13) /* 803A8BA0 003A5B00 38 60 00 01 */ li r3, 1 /* 803A8BA4 003A5B04 B0 65 00 02 */ sth r3, 2(r5) /* 803A8BA8 003A5B08 28 00 00 FF */ cmplwi r0, 0xff /* 803A8BAC 003A5B0C 41 82 00 28 */ beq lbl_803A8BD4 /* 803A8BB0 003A5B10 38 00 00 FF */ li r0, 0xff -/* 803A8BB4 003A5B14 88 8D AF 10 */ lbz r4, lbl_805A9AD0@sda21(r13) +/* 803A8BB4 003A5B14 88 8D AF 10 */ lbz r4, voiceListInsert@sda21(r13) /* 803A8BB8 003A5B18 98 05 00 01 */ stb r0, 1(r5) /* 803A8BBC 003A5B1C 38 7F 0E 00 */ addi r3, r31, 0xe00 /* 803A8BC0 003A5B20 54 80 10 3A */ slwi r0, r4, 2 @@ -1566,22 +1593,22 @@ lbl_803A8B70: /* 803A8BD0 003A5B30 48 00 00 14 */ b lbl_803A8BE4 lbl_803A8BD4: /* 803A8BD4 003A5B34 38 00 00 FF */ li r0, 0xff -/* 803A8BD8 003A5B38 98 CD AF 11 */ stb r6, lbl_805A9AD1@sda21(r13) +/* 803A8BD8 003A5B38 98 CD AF 11 */ stb r6, voiceListRoot@sda21(r13) /* 803A8BDC 003A5B3C 98 05 00 01 */ stb r0, 1(r5) /* 803A8BE0 003A5B40 98 05 00 00 */ stb r0, 0(r5) lbl_803A8BE4: -/* 803A8BE4 003A5B44 98 CD AF 10 */ stb r6, lbl_805A9AD0@sda21(r13) +/* 803A8BE4 003A5B44 98 CD AF 10 */ stb r6, voiceListInsert@sda21(r13) /* 803A8BE8 003A5B48 88 1E 01 1D */ lbz r0, 0x11d(r30) /* 803A8BEC 003A5B4C 28 00 00 00 */ cmplwi r0, 0 /* 803A8BF0 003A5B50 41 82 00 14 */ beq lbl_803A8C04 -/* 803A8BF4 003A5B54 88 6D AF 0F */ lbz r3, lbl_805A9ACF@sda21(r13) +/* 803A8BF4 003A5B54 88 6D AF 0F */ lbz r3, voiceFxRunning@sda21(r13) /* 803A8BF8 003A5B58 38 03 FF FF */ addi r0, r3, -1 -/* 803A8BFC 003A5B5C 98 0D AF 0F */ stb r0, lbl_805A9ACF@sda21(r13) +/* 803A8BFC 003A5B5C 98 0D AF 0F */ stb r0, voiceFxRunning@sda21(r13) /* 803A8C00 003A5B60 48 00 00 10 */ b lbl_803A8C10 lbl_803A8C04: -/* 803A8C04 003A5B64 88 6D AF 0E */ lbz r3, lbl_805A9ACE@sda21(r13) +/* 803A8C04 003A5B64 88 6D AF 0E */ lbz r3, voiceMusicRunning@sda21(r13) /* 803A8C08 003A5B68 38 03 FF FF */ addi r0, r3, -1 -/* 803A8C0C 003A5B6C 98 0D AF 0E */ stb r0, lbl_805A9ACE@sda21(r13) +/* 803A8C0C 003A5B6C 98 0D AF 0E */ stb r0, voiceMusicRunning@sda21(r13) lbl_803A8C10: /* 803A8C10 003A5B70 38 00 FF FF */ li r0, -1 /* 803A8C14 003A5B74 90 1E 00 F4 */ stw r0, 0xf4(r30) @@ -1609,13 +1636,13 @@ voiceKillSound: /* 803A8C58 003A5BB8 38 A0 FF FF */ li r5, -1 /* 803A8C5C 003A5BBC 90 01 00 14 */ stw r0, 0x14(r1) /* 803A8C60 003A5BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803A8C64 003A5BC4 88 0D AE 48 */ lbz r0, lbl_805A9A08@sda21(r13) +/* 803A8C64 003A5BC4 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803A8C68 003A5BC8 28 00 00 00 */ cmplwi r0, 0 /* 803A8C6C 003A5BCC 41 82 00 90 */ beq lbl_803A8CFC /* 803A8C70 003A5BD0 3C 03 00 01 */ addis r0, r3, 1 /* 803A8C74 003A5BD4 28 00 FF FF */ cmplwi r0, 0xffff /* 803A8C78 003A5BD8 41 82 00 40 */ beq lbl_803A8CB8 -/* 803A8C7C 003A5BDC 80 8D AF 04 */ lwz r4, lbl_805A9AC4@sda21(r13) +/* 803A8C7C 003A5BDC 80 8D AF 04 */ lwz r4, vidRoot@sda21(r13) /* 803A8C80 003A5BE0 48 00 00 1C */ b lbl_803A8C9C lbl_803A8C84: /* 803A8C84 003A5BE4 80 04 00 08 */ lwz r0, 8(r4) @@ -1642,7 +1669,7 @@ lbl_803A8CBC: /* 803A8CC0 003A5C20 48 00 00 30 */ b lbl_803A8CF0 lbl_803A8CC4: /* 803A8CC4 003A5C24 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 803A8CC8 003A5C28 80 8D AE 78 */ lwz r4, lbl_805A9A38@sda21(r13) +/* 803A8CC8 003A5C28 80 8D AE 78 */ lwz r4, synthVoice@sda21(r13) /* 803A8CCC 003A5C2C 1C 03 04 04 */ mulli r0, r3, 0x404 /* 803A8CD0 003A5C30 7C 84 02 14 */ add r4, r4, r0 /* 803A8CD4 003A5C34 80 04 00 F4 */ lwz r0, 0xf4(r4) @@ -1679,7 +1706,7 @@ synthKillVoicesByMacroReferences: /* 803A8D38 003A5C98 3B A0 00 00 */ li r29, 0 /* 803A8D3C 003A5C9C 48 00 00 34 */ b lbl_803A8D70 lbl_803A8D40: -/* 803A8D40 003A5CA0 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8D40 003A5CA0 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8D44 003A5CA4 7C 60 EA 14 */ add r3, r0, r29 /* 803A8D48 003A5CA8 80 03 00 34 */ lwz r0, 0x34(r3) /* 803A8D4C 003A5CAC 28 00 00 00 */ cmplwi r0, 0 @@ -1709,7 +1736,7 @@ lbl_803A8D94: /* 803A8D9C 003A5CFC 7F 7C DB 78 */ mr r28, r27 /* 803A8DA0 003A5D00 48 00 00 34 */ b lbl_803A8DD4 lbl_803A8DA4: -/* 803A8DA4 003A5D04 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8DA4 003A5D04 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8DA8 003A5D08 7C 60 E2 14 */ add r3, r0, r28 /* 803A8DAC 003A5D0C 80 03 00 34 */ lwz r0, 0x34(r3) /* 803A8DB0 003A5D10 28 00 00 00 */ cmplwi r0, 0 @@ -1739,7 +1766,7 @@ lbl_803A8DFC: /* 803A8E00 003A5D60 7F BC EB 78 */ mr r28, r29 /* 803A8E04 003A5D64 48 00 00 38 */ b lbl_803A8E3C lbl_803A8E08: -/* 803A8E08 003A5D68 80 0D AE 78 */ lwz r0, lbl_805A9A38@sda21(r13) +/* 803A8E08 003A5D68 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803A8E0C 003A5D6C 7C 80 E2 14 */ add r4, r0, r28 /* 803A8E10 003A5D70 80 04 00 34 */ lwz r0, 0x34(r4) /* 803A8E14 003A5D74 28 00 00 00 */ cmplwi r0, 0 @@ -1782,8 +1809,8 @@ voiceIsLastStarted: /* 803A8E90 003A5DF0 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 803A8E94 003A5DF4 28 00 00 FF */ cmplwi r0, 0xff /* 803A8E98 003A5DF8 40 82 00 20 */ bne lbl_803A8EB8 -/* 803A8E9C 003A5DFC 3C 60 80 56 */ lis r3, lbl_8055E250@ha -/* 803A8EA0 003A5E00 38 63 E2 50 */ addi r3, r3, lbl_8055E250@l +/* 803A8E9C 003A5DFC 3C 60 80 56 */ lis r3, synth_last_fxstarted@ha +/* 803A8EA0 003A5E00 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A8EA4 003A5E04 7C 03 30 AE */ lbzx r0, r3, r6 /* 803A8EA8 003A5E08 7C 00 30 40 */ cmplw r0, r6 /* 803A8EAC 003A5E0C 40 82 00 30 */ bne lbl_803A8EDC @@ -1816,8 +1843,8 @@ voiceSetLastStarted: /* 803A8F04 003A5E64 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 803A8F08 003A5E68 28 00 00 FF */ cmplwi r0, 0xff /* 803A8F0C 003A5E6C 40 82 00 14 */ bne lbl_803A8F20 -/* 803A8F10 003A5E70 3C 60 80 56 */ lis r3, lbl_8055E250@ha -/* 803A8F14 003A5E74 38 63 E2 50 */ addi r3, r3, lbl_8055E250@l +/* 803A8F10 003A5E70 3C 60 80 56 */ lis r3, synth_last_fxstarted@ha +/* 803A8F14 003A5E74 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A8F18 003A5E78 7C C3 31 AE */ stbx r6, r3, r6 /* 803A8F1C 003A5E7C 4E 80 00 20 */ blr lbl_803A8F20: @@ -1841,8 +1868,8 @@ voiceResetLastStarted: /* 803A8F58 003A5EB8 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 803A8F5C 003A5EBC 28 00 00 FF */ cmplwi r0, 0xff /* 803A8F60 003A5EC0 40 82 00 24 */ bne lbl_803A8F84 -/* 803A8F64 003A5EC4 3C 60 80 56 */ lis r3, lbl_8055E250@ha -/* 803A8F68 003A5EC8 38 63 E2 50 */ addi r3, r3, lbl_8055E250@l +/* 803A8F64 003A5EC4 3C 60 80 56 */ lis r3, synth_last_fxstarted@ha +/* 803A8F68 003A5EC8 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A8F6C 003A5ECC 7C 03 30 AE */ lbzx r0, r3, r6 /* 803A8F70 003A5ED0 7C 00 30 40 */ cmplw r0, r6 /* 803A8F74 003A5ED4 4C 82 00 20 */ bnelr @@ -1906,9 +1933,9 @@ lbl_803A8FC0: /* 803A9048 003A5FA8 98 85 00 0F */ stb r4, 0xf(r5) /* 803A904C 003A5FAC 38 A5 00 10 */ addi r5, r5, 0x10 /* 803A9050 003A5FB0 42 00 FF 70 */ bdnz lbl_803A8FC0 -/* 803A9054 003A5FB4 3C 60 80 56 */ lis r3, lbl_8055E250@ha +/* 803A9054 003A5FB4 3C 60 80 56 */ lis r3, synth_last_fxstarted@ha /* 803A9058 003A5FB8 38 00 00 02 */ li r0, 2 -/* 803A905C 003A5FBC 38 63 E2 50 */ addi r3, r3, lbl_8055E250@l +/* 803A905C 003A5FBC 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A9060 003A5FC0 7C 09 03 A6 */ mtctr r0 lbl_803A9064: /* 803A9064 003A5FC4 98 83 00 00 */ stb r4, 0(r3) diff --git a/asm/rodata.s b/asm/rodata.s index 2945fd20..bc61ae3f 100644 --- a/asm/rodata.s +++ b/asm/rodata.s @@ -1697,11 +1697,3 @@ lbl_803D8560: .global lbl_803D8568 lbl_803D8568: .incbin "baserom.dol", 0x3D5568, 0x8 - - - - - - - - diff --git a/asm/sbss.s b/asm/sbss.s index c882d42f..b4c4bfa7 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -2350,33 +2350,3 @@ lbl_805A9924: .global lbl_805A9928 lbl_805A9928: .skip 0x8 -.global lbl_805A9930 -lbl_805A9930: - .skip 0x4 -.global lbl_805A9934 -lbl_805A9934: - .skip 0x4 -.global lbl_805A9938 -lbl_805A9938: - .skip 0x4 -.global lbl_805A993C -lbl_805A993C: - .skip 0x4 -.global lbl_805A9940 -lbl_805A9940: - .skip 0x4 -.global lbl_805A9944 -lbl_805A9944: - .skip 0x4 -.global lbl_805A9948 -lbl_805A9948: - .skip 0x4 -.global lbl_805A994C -lbl_805A994C: - .skip 0x4 -.global lbl_805A9950 -lbl_805A9950: - .skip 0x4 -.global lbl_805A9954 -lbl_805A9954: - .skip 0x4 diff --git a/obj_files.mk b/obj_files.mk index f983896c..ff0f9244 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -93,7 +93,6 @@ VI_FILES :=\ $(BUILD_DIR)/asm/Dolphin/vi.o MSL_PPCEABI_BARE_H :=\ - $(BUILD_DIR)/asm/Runtime/sbss.o\ $(BUILD_DIR)/asm/Runtime/__va_arg.o\ $(BUILD_DIR)/asm/Runtime/global_destructor_chain.o\ $(BUILD_DIR)/asm/Runtime/CPlusLibPPC.o\ @@ -156,7 +155,6 @@ MSL_PPCEABI_BARE_H :=\ $(BUILD_DIR)/asm/Runtime/s_cosf.o\ MUSYX_FILES :=\ - $(BUILD_DIR)/asm/musyx/sbss.o\ $(BUILD_DIR)/asm/musyx/seq.o\ $(BUILD_DIR)/asm/musyx/synth.o\ $(BUILD_DIR)/asm/musyx/seq_api.o\ @@ -263,3 +261,6 @@ SDATA2_O_FILES :=\ SBSS2_O_FILES :=\ $(BUILD_DIR)/asm/sbss2.o + +BSS_SINIT_O_FILES :=\ + $(BUILD_DIR)/asm/bss_sinit.o