diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-23 02:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-22 18:20:13 -0600 |
| commit | e135178097f416bc54e36058e10d9b1c013929fd (patch) | |
| tree | 0903c79b59ed716497e55618631d5e76611fe032 /src/audio | |
| parent | 3781ce2830a143df855003b65fe069d2e26215d9 (diff) | |
Update from decomp (#34)
* Update menus.c (#634)
* Update common_data.yml (#635)
* Renames for screenId and other changes (#636)
* screenId renames
* Rename surface map to collision mesh (#637)
* Rename some stack vars (#638)
* Fix syntax error (#639)
* Rename some stack vars
* Update collision.c
* Collision Documentation (#640)
* Collision related renames
* update doxygen (#649)
* change bool (#644)
* Update (#642)
* Delete trig_tables_bss.c (#650)
* fix typo audio (#656)
* fix typo src actor (#657)
* fix typo include (#658)
* fix course (#659)
* fix typo debug (#660)
* fix typo data (#661)
* Update common_structs.h
* replace number with const (#665)
* fix typo buffers (#655)
* fix typo buffers
* tweak ld file
* rename to sMemoryPool
* add a warning
---------
* fix typo src (#654)
* fix typo src
* fix non matcing
* Update code_80091750.c
---------
* fix typo racing (#653)
* fix typo racing
* get it match
* replace G_LINE3D to G_QUAD
---------
* fix typo src (#652)
* fix ending typo (#651)
* Action more info when it doesn't match and fix first diff (#662)
* Update linux-compile.yml
* fix first-diff
* Update first-diff.py
---------
* document texture of kart (#663)
* document texture of kart
* change screenPlayerId to screenId
* some documentation around object
* Revert "some documentation around object"
This reverts commit cbb39078e036bf2a417bed67359e910213acab28.
* more rename
---------
* Make evaluate_collision_players_palm_tree better (#667)
This matches just the same as before, but using those two casts instead of
shifts seems more likely to be accurate to the original source code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
* add fedora instruciton (#666)
* start documenting animation (#668)
* start documenting animation
* Update course_data.c
* change comment
* fix error of compilation
* fix error of compilation
* Update animation.c
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/data.c | 2 | ||||
| -rw-r--r-- | src/audio/data.h | 2 | ||||
| -rw-r--r-- | src/audio/heap.c | 4 | ||||
| -rw-r--r-- | src/audio/load.c | 4 | ||||
| -rw-r--r-- | src/audio/port_eu.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/audio/data.c b/src/audio/data.c index eac2a10ff..440b370d4 100644 --- a/src/audio/data.c +++ b/src/audio/data.c @@ -441,4 +441,4 @@ u16 D_803B7192; // unconfirmed u32 gAudioRandom; s32 gAudioErrorFlags; u32 D_803B71A0[4]; // unconfirmed -ALIGNED8 u8 D_803B71B0[4]; // unconfirmed +ALIGNED8 u8 gAudioHeap[4]; // unconfirmed diff --git a/src/audio/data.h b/src/audio/data.h index 563352ce0..9f6ac88fc 100644 --- a/src/audio/data.h +++ b/src/audio/data.h @@ -57,7 +57,7 @@ extern u16 D_803B7192; // unconfirmed extern u32 gAudioRandom; extern s32 gAudioErrorFlags; extern u32 D_803B71A0[]; // unconfirmed -extern u8 D_803B71B0[]; // unconfirmed +extern u8 gAudioHeap[]; // unconfirmed extern struct ReverbSettingsEU sReverbSettings[]; extern struct AudioSessionSettingsEU gAudioSessionPresets[]; diff --git a/src/audio/heap.c b/src/audio/heap.c index 1b04df782..e3cc92e33 100644 --- a/src/audio/heap.c +++ b/src/audio/heap.c @@ -195,8 +195,8 @@ void func_800B90E0(struct SoundAllocPool *pool) { // inspired by sound_init_main_pools in sm64 void sound_init_main_pools(s32 arg0) { - sound_alloc_pool_init(&gAudioInitPool, &D_803B71B0, arg0); - sound_alloc_pool_init(&gAudioSessionPool, D_803B71B0 + arg0, gAudioHeapSize - arg0); + sound_alloc_pool_init(&gAudioInitPool, &gAudioHeap, arg0); + sound_alloc_pool_init(&gAudioSessionPool, gAudioHeap + arg0, gAudioHeapSize - arg0); } // inspired by session_pools_init in sm64 diff --git a/src/audio/load.c b/src/audio/load.c index 08096203c..1b09fde17 100644 --- a/src/audio/load.c +++ b/src/audio/load.c @@ -787,10 +787,10 @@ void audio_init(void) { gAudioLoadLock = 0; // for (i = 0; i < gAudioHeapSize / 8; i++) { - // ((u64 *) D_803B71B0)[i] = 0; + // ((u64 *) gAudioHeap)[i] = 0; // } - memset(D_803B71B0, 0, gAudioHeapSize); + memset(gAudioHeap, 0, gAudioHeapSize); #ifdef TARGET_N64 // It seems boot.s doesn't clear the .bss area for audio, so do it here. diff --git a/src/audio/port_eu.c b/src/audio/port_eu.c index ceeaaddb4..38d229cbf 100644 --- a/src/audio/port_eu.c +++ b/src/audio/port_eu.c @@ -65,7 +65,7 @@ struct SPTask *create_next_audio_frame_task(void) { OSMesg audioMesg; // <-- new audioMesg.ptr = (void*)gAudioFrameCount; // <-- new - //osSendMesg(D_800EA3A8, (OSMesg) gAudioFrameCount, 0); <-- original + //osSendMesg(D_800EA3A8, (OSMesg) gAudioFrameCount, OS_MESG_NOBLOCK); <-- original osSendMesg(D_800EA3A8, audioMesg, OS_MESG_NOBLOCK); // <-- new gAudioTaskIndex ^= 1; |
