mirror of
https://github.com/n64decomp/mk64
synced 2026-07-09 13:17:15 -04:00
Match audio/external.c BSS segment (#470)
* Match audio/external.c BSS segment Also fix a misnamed function found in audio/heap, used in audio/load * Match audio/seqplayer .data section * Match func_800C76C0 That was the last function referencing some fake variables, so it should be possible to match audio/external's .data section as well * Match audio/external's .data section The only thing in src/audio left to be matched is audio/external's .text section. There's probably some beautifying that could be done to data/sound_data, but that is a future problem Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
@@ -1,422 +0,0 @@
|
||||
.include "macros.inc"
|
||||
|
||||
.section .data
|
||||
|
||||
glabel D_800E9A40
|
||||
.asciiz "Audio:Track:Warning: No Free Notetrack\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9A68
|
||||
.asciiz "SUBTRACK DIM\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9A78
|
||||
.asciiz "Audio:Track: Warning :SUBTRACK had been stolen by other Group.\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9AB8
|
||||
.asciiz "SEQID %d,BANKID %d\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9ACC
|
||||
.asciiz "ERR:SUBTRACK %d NOT ALLOCATED\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9AEC
|
||||
.asciiz "Error:Same List Add\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9B04
|
||||
.asciiz "Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9B20
|
||||
.asciiz "Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9B3C
|
||||
.asciiz "WARNING: NPRG: cannot change %d\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9B60
|
||||
.asciiz "Audio:Track:NOTE:UNDEFINED NOTE COM. %x\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9B8C
|
||||
.asciiz "Audio: Note:Velocity Error %d\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9BAC
|
||||
.asciiz "Error: Subtrack no prg.\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9BC8
|
||||
.asciiz "ERR %x\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9BD0
|
||||
.asciiz "Error: Your assignchannel is stolen.\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9BF8
|
||||
.asciiz "Audio:Track :Call Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9C24
|
||||
.asciiz "Audio:Track :Loops Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9C50
|
||||
.asciiz "SUB:ERR:BANK %d NOT CACHED.\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9C70
|
||||
.asciiz "SUB:ERR:BANK %d NOT CACHED.\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9C90
|
||||
.asciiz "Audio:Track: CTBLCALL Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9CC0
|
||||
.asciiz "[%2x] \n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9CC8
|
||||
.asciiz "Err :Sub %x ,address %x:Undefined SubTrack Function %x"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9D00
|
||||
.asciiz "Disappear Sequence or Bank %d\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9D20
|
||||
.asciiz "Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9D3C
|
||||
.asciiz "Macro Level Over Error!\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9D58
|
||||
.asciiz "Group:Undefine upper C0h command (%x)\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800E9D80
|
||||
.asciiz "Group:Undefined Command\n"
|
||||
.balign 4
|
||||
|
||||
.balign 0x10
|
||||
|
||||
glabel D_800E9DA0
|
||||
.byte 0x00
|
||||
|
||||
.balign 4
|
||||
|
||||
# TODO: unused?
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9DB4
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9DC4
|
||||
.float 1.0, 1.0, 1.0, 1.0
|
||||
|
||||
glabel D_800E9DD4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9DE4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9DF4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9E14
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E24
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E34
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E54
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E64
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E74
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E84
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9E94
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9EA4
|
||||
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800E9EB4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9EC4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9ED4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9EE4
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9EF4
|
||||
.float 1.0, 1.0, 1.0, 1.0
|
||||
|
||||
glabel D_800E9F04
|
||||
.float 1.0, 1.0, 1.0, 1.0
|
||||
|
||||
glabel D_800E9F14
|
||||
.float 1.0, 1.0, 1.0, 1.0
|
||||
|
||||
glabel D_800E9F24
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
glabel D_800E9F2C
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
glabel D_800E9F34
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9F54
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800E9F74
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
glabel D_800E9F78
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
glabel D_800E9F7C
|
||||
.float 0.0, 0.0, 0.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.byte 0x00
|
||||
.balign 4
|
||||
.float 3800.0, 3.4, 0.4
|
||||
.float -1.0, 0.4, 1100.0
|
||||
.float 630.0, 3600.0, 1.0
|
||||
|
||||
.float 0.0, 0.0, 0.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.byte 0x00
|
||||
.balign 4
|
||||
.float 3800.0, 3.4, 0.4
|
||||
.float -1.0, 0.4, 1100.0
|
||||
.float 630.0, 3600.0, 1.0
|
||||
|
||||
.float 0.0, 0.0, 0.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.byte 0x00
|
||||
.balign 4
|
||||
.float 3800.0, 3.4, 0.4
|
||||
.float -1.0, 0.4, 1100.0
|
||||
.float 630.0, 3600.0, 1.0
|
||||
|
||||
.float 0.0, 0.0, 0.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.byte 0x00
|
||||
.balign 4
|
||||
.float 3800.0, 3.4, 0.4
|
||||
.float -1.0, 0.4, 1100.0
|
||||
.float 630.0, 3600.0, 1.0
|
||||
|
||||
.macro Entry800EA06C f0, f1, f2, b0
|
||||
.float \f0, \f1, \f2
|
||||
.byte \b0, 0x00, 0x00, 0x00
|
||||
.endm
|
||||
|
||||
glabel D_800EA06C
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
Entry800EA06C 0.0, 1.0, 1.0, 0x0
|
||||
|
||||
glabel D_800EA0EC
|
||||
.byte 0x00
|
||||
glabel D_800EA0ED
|
||||
.byte 0x00
|
||||
glabel D_800EA0EE
|
||||
.byte 0x00
|
||||
glabel D_800EA0EF
|
||||
.byte 0x00
|
||||
|
||||
glabel D_800EA0F0
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
glabel D_800EA0F4
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.word 0x00000000, 0x00000000, 0x3f800000
|
||||
|
||||
glabel D_800EA104
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA108
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA10C
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA110
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800EA120
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800EA130
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
.float 0.0, 0.0, 0.0, 0.0
|
||||
|
||||
glabel D_800EA150
|
||||
.float 1.4
|
||||
|
||||
glabel D_800EA154
|
||||
.byte 0x02, 0x02, 0x58, 0x5a, 0x03, 0x30, 0x58, 0x30
|
||||
|
||||
glabel D_800EA15C
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA160
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA164
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA168
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA16C
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA170
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA174
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA178
|
||||
.word 0x3f800000
|
||||
|
||||
glabel D_800EA17C
|
||||
.word 0x3f59999a
|
||||
|
||||
glabel D_800EA180
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA184
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA188
|
||||
.byte 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x06, 0x02, 0x02, 0x02, 0x02, 0x01, 0x08, 0x02, 0x02, 0x00
|
||||
.byte 0x01, 0x01, 0x08, 0x02, 0x02, 0x00, 0x01, 0x01
|
||||
|
||||
glabel D_800EA1A0
|
||||
.byte 0x04, 0x01, 0x01, 0x02, 0x02, 0x01, 0x03, 0x01
|
||||
.byte 0x01, 0x02, 0x02, 0x01, 0x03, 0x01, 0x01, 0x00, 0x01, 0x01, 0x03, 0x01, 0x01, 0x00, 0x01, 0x01
|
||||
|
||||
glabel sSoundRequestCount
|
||||
.word 0x00000000
|
||||
|
||||
glabel sNumProcessedSoundRequests
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1C0
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1C4
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1C8
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800EA1D4
|
||||
.word 0x3f800000, 0x00000000
|
||||
|
||||
glabel D_800EA1DC
|
||||
.word 0x00000000, 0x00000000
|
||||
|
||||
glabel D_800EA1E4
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1E8
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1EC
|
||||
.word 0x00000000
|
||||
|
||||
glabel D_800EA1F0
|
||||
.byte 0x00, 0x01, 0x02, 0x03
|
||||
|
||||
glabel D_800EA1F4
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.asciiz "Error : Queue is not empty ( %x ) \n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "specchg error\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "***** CAM MAX %d *****\n"
|
||||
.balign 4
|
||||
|
||||
glabel D_800EA244
|
||||
.byte 0x00
|
||||
|
||||
.byte 0x00, 0x00, 0x00
|
||||
|
||||
.asciiz "entryout !!! %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "AFTER GOAL VOICE FLAME %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "*** Pause On ***\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "*** Pause Off ***\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "CALLED!! Na_ChangeSoundMode player %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "CALLED!! Na_ChangeSoundMode spec %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "Interfaced Spec Change player %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "Interfaced Spec Change spec %d\n"
|
||||
.balign 4
|
||||
|
||||
.word 0xff000000, 0xff000000, 0x00000000
|
||||
|
||||
.asciiz "FX MIX %d\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "************** Seq Fadeout ***************\n"
|
||||
.balign 4
|
||||
|
||||
.asciiz "SEQ FADE OUT TIME %d\n"
|
||||
.balign 4
|
||||
Reference in New Issue
Block a user