diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2022-11-16 01:32:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 23:32:09 -0700 |
| commit | a4faefbc20186128b48e8e8e84b3bb4a455f7da4 (patch) | |
| tree | a5e7d9a23bfd05e19b8addd7b3041c4548b792fd /data | |
| parent | 5f88765dd4d2c4adeb59fa32fd3f5b38c7c9cc5a (diff) | |
Matches for audio/external (#273)
A lot of these matches come from observing the external audio
stuff in SM64 and realizing that a bunch a couple of the structs
in MK64 are just expanded version of their SM64 counterpart.
Presumably all the expansions are for handling the doppler effect,
although I can't say that with certainty
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_0DD0A0_2_1_1.s | 10 | ||||
| -rw-r--r-- | data/rodata_audio_2.s | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/data/data_0DD0A0_2_1_1.s b/data/data_0DD0A0_2_1_1.s index 694cc10ff..ed4dbe2a1 100644 --- a/data/data_0DD0A0_2_1_1.s +++ b/data/data_0DD0A0_2_1_1.s @@ -324,10 +324,10 @@ 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 D_800EA1B8 +glabel sSoundRequestCount .word 0x00000000 -glabel D_800EA1BC +glabel sNumProcessedSoundRequests .word 0x00000000 glabel D_800EA1C0 @@ -370,7 +370,9 @@ glabel D_800EA1F4 .balign 4 glabel D_800EA244 -.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00 + +.byte 0x00, 0x00, 0x00 .asciiz "entryout !!! %d\n" .balign 4 @@ -409,6 +411,8 @@ glabel D_800EA244 .word 0x00000000, 0x00000000, 0x00000000 +# Begin port_eu.c data + glabel D_800EA3A0 .byte 0x00, 0x00, 0x00, 0x00 diff --git a/data/rodata_audio_2.s b/data/rodata_audio_2.s index bcbf7b4a6..4182f7845 100644 --- a/data/rodata_audio_2.s +++ b/data/rodata_audio_2.s @@ -162,14 +162,20 @@ glabel jpt_800F35C4 .word L800C1A34, L800C1A34, L800C1A34, L800C1A34 .word L800C1AEC, L800C1A34 +# begin func_800C1E2C glabel D_800F35DC .float 0.1 +# end func_800C1E2C +#begin func_800C1F8C glabel D_800F35E0 .float 100000.0 +#end func_800C1F8C +#begin func_800C21E8 glabel D_800F35E4 .float 100000.0 +#end func_800C21E8 glabel D_800F35E8 .float 0.85 @@ -261,6 +267,7 @@ glabel D_800F3728 glabel D_800F372C .float 0.9 +# begin func_800C6758 glabel D_800F3730 .float 0.6 @@ -269,6 +276,7 @@ glabel D_800F3734 glabel D_800F3738 .float 0.95 +# end func_800C6758 glabel jpt_800F373C .word L800C69C8, L800C6A0C, L800C6910, L800C6C74 @@ -305,6 +313,7 @@ glabel jpt_800F3868 .word L800C7514, L800C75C8, L800C74D4, L800C75C4 .word L800C75C8, L800C75B4, L800C75BC +# begin func_800C8770 glabel D_800F3894 .float 0.7 @@ -322,6 +331,7 @@ glabel D_800F38A4 glabel D_800F38A8 .float 0.03 +# end func_800C8770 glabel D_800F38AC .float 0.012000 @@ -438,6 +448,7 @@ glabel D_800F3958 glabel D_800F395C .float 4805.0 +# start func_800C9A88 data glabel jpt_800F3960 .word L800C9B3C, L800C9B3C, L800C9B68, L800C9B94 .word L800C9BC0, L800C9BEC, L800C9B68, L800C9BEC @@ -471,6 +482,7 @@ glabel D_800F39A0 glabel D_800F39A4 .float 1922.0 +# end func_800C9A88 data glabel D_800F39A8 .float 0.55 |