From 40b77f9c6c9fec8f016e7769d42139a883a12d3b Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 19 Oct 2023 21:34:30 -0700 Subject: [PATCH] CStaticAudio symbol fixes Former-commit-id: d352bde7348118430ee37dc262805ca90673402c --- config/GM8E01_00/symbols.txt | 21 +++++++++++---------- config/GM8E01_01/symbols.txt | 9 +++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 0bad99a0..35d2516d 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -15293,18 +15293,18 @@ fmult__Fii = .text:0x8036BB24; // type:function size:0xE0 scope:local quan__FiPsi = .text:0x8036BC04; // type:function size:0x30 scope:local SetVolume__18CStaticAudioPlayerFc = .text:0x8036BC34; // type:function size:0x28 scope:global DecodeMonoAndMix__18CStaticAudioPlayerCFv = .text:0x8036BC5C; // type:function size:0x194 scope:global -Decode__18CStaticAudioPlayerFv = .text:0x8036BDF0; // type:function size:0x124 scope:global -DoMix__18CStaticAudioPlayer = .text:0x8036BF14; // type:function size:0xBC scope:global +Decode__18CStaticAudioPlayerFPUsPUsUi = .text:0x8036BDF0; // type:function size:0x124 scope:global +DoMix__18CStaticAudioPlayerFv = .text:0x8036BF14; // type:function size:0xBC scope:global MixCallback__18CStaticAudioPlayerFv = .text:0x8036BFD0; // type:function size:0x24 scope:global StopMixOut__18CStaticAudioPlayerFv = .text:0x8036BFF4; // type:function size:0x3C scope:global StartMixOut__18CStaticAudioPlayerFv = .text:0x8036C030; // type:function size:0xD4 scope:global -IsReady__18CStaticAudioPlayer = .text:0x8036C104; // type:function size:0x54 scope:global -__dt__18CStaticAudioPlayer = .text:0x8036C158; // type:function size:0xB0 scope:global -fn_8036C208 = .text:0x8036C208; // type:function size:0xD0 -__ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii = .text:0x8036C2D8; // type:function size:0x30C scope:global -fn_8036C5E4 = .text:0x8036C5E4; // type:function size:0x120 -fn_8036C704 = .text:0x8036C704; // type:function size:0xD8 -RunDMACallback__18CStaticAudioPlayerFv = .text:0x8036C7DC; // type:function size:0xA0 scope:global +IsReady__18CStaticAudioPlayerCFv = .text:0x8036C104; // type:function size:0x54 scope:global +__dt__18CStaticAudioPlayerFv = .text:0x8036C158; // type:function size:0xB0 scope:global +__dt__Q24rstl67vector,Q24rstl17rmemory_allocator>Fv = .text:0x8036C208; // type:function size:0xD0 +__ct__18CStaticAudioPlayerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ii = .text:0x8036C2D8; // type:function size:0x30C scope:global +reserve__Q24rstl67vector,Q24rstl17rmemory_allocator>Fi = .text:0x8036C5E4; // type:function size:0x120 +CancelDMACallback__18CStaticAudioPlayerFPFv_v = .text:0x8036C704; // type:function size:0xD8 +RunDMACallback__18CStaticAudioPlayerFPFv_v = .text:0x8036C7DC; // type:function size:0xA0 scope:global fn_8036C87C = .text:0x8036C87C; // type:function size:0x74 fn_8036C8F0 = .text:0x8036C8F0; // type:function size:0xA4 __sinit_CStaticAudioPlayer_cpp = .text:0x8036C994; // type:function size:0x3C scope:local @@ -22084,7 +22084,8 @@ lbl_805A9690 = .sbss:0x805A9690; // type:object size:0x1 data:byte lbl_805A9694 = .sbss:0x805A9694; // type:object size:0x1 data:byte lbl_805A9698 = .sbss:0x805A9698; // type:object size:0x1 data:byte lbl_805A969C = .sbss:0x805A969C; // type:object size:0x1 data:byte -lbl_805A96A0 = .sbss:0x805A96A0; // type:object size:0x8 data:4byte +sCurrentPlayer = .sbss:0x805A96A0; // type:object size:0x4 scope:local data:4byte +lbl_805A96A4 = .sbss:0x805A96A4; // type:object size:0x4 data:byte lbl_805A96A8 = .sbss:0x805A96A8; // type:object size:0x1 data:byte lbl_805A96AC = .sbss:0x805A96AC; // type:object size:0x4 data:4byte lbl_805A96B0 = .sbss:0x805A96B0; // type:object size:0x8 data:4byte diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index 7d37d545..50419053 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -15309,12 +15309,12 @@ quan__FiPsi = .text:0x8036BDE0; // type:function size:0x30 scope:local SetVolume__18CStaticAudioPlayerFc = .text:0x8036BE10; // type:function size:0x28 scope:global DecodeMonoAndMix__18CStaticAudioPlayerCFv = .text:0x8036BE38; // type:function size:0x194 scope:global Decode__18CStaticAudioPlayerFPUsPUsUi = .text:0x8036BFCC; // type:function size:0x124 scope:global -DoMix__18CStaticAudioPlayerFv = .text:0x8036C0F0; // type:function size:0xBC scope:global +DoMix__18CStaticAudioPlayerFvFv = .text:0x8036C0F0; // type:function size:0xBC scope:global MixCallback__18CStaticAudioPlayerFv = .text:0x8036C1AC; // type:function size:0x24 scope:global StopMixOut__18CStaticAudioPlayerFv = .text:0x8036C1D0; // type:function size:0x3C scope:global StartMixOut__18CStaticAudioPlayerFv = .text:0x8036C20C; // type:function size:0xD4 scope:global -IsReady__18CStaticAudioPlayerCFv = .text:0x8036C2E0; // type:function size:0x54 scope:global -__dt__18CStaticAudioPlayerFv = .text:0x8036C334; // type:function size:0xB0 scope:global +IsReady__18CStaticAudioPlayerCFvCFv = .text:0x8036C2E0; // type:function size:0x54 scope:global +__dt__18CStaticAudioPlayerFvFv = .text:0x8036C334; // type:function size:0xB0 scope:global __dt__Q24rstl67vector,Q24rstl17rmemory_allocator>Fv = .text:0x8036C3E4; // type:function size:0xD0 scope:global __ct__18CStaticAudioPlayerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ii = .text:0x8036C4B4; // type:function size:0x30C scope:global reserve__Q24rstl67vector,Q24rstl17rmemory_allocator>Fi = .text:0x8036C7C0; // type:function size:0x120 scope:global @@ -22130,7 +22130,8 @@ lbl_805A9690 = .sbss:0x805A9870; // type:object size:0x1 scope:global data:byte lbl_805A9694 = .sbss:0x805A9874; // type:object size:0x1 scope:global data:byte lbl_805A9698 = .sbss:0x805A9878; // type:object size:0x1 scope:global data:byte lbl_805A969C = .sbss:0x805A987C; // type:object size:0x1 scope:global data:byte -sCurrentPlayer = .sbss:0x805A9880; // type:object size:0x8 scope:global data:4byte +sCurrentPlayer = .sbss:0x805A9880; // type:object size:0x4 scope:global data:4byte +lbl_805A96A4 = .sbss:0x805A9884; // type:object size:0x4 scope:global data:byte lbl_805A96A8 = .sbss:0x805A9888; // type:object size:0x1 scope:global data:byte lbl_805A96AC = .sbss:0x805A988C; // type:object size:0x4 scope:global data:4byte lbl_805A96B0 = .sbss:0x805A9890; // type:object size:0x8 scope:global data:4byte