1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-22 21:35:27 +00:00
Commit Graph

12 Commits

Author SHA1 Message Date
zelda2774
4444c5ea35
audio_synthesis OK + partially documented (#920)
* Match func_800DDB64

* Match func_800DC910

* remove stack comments

* Move nop padding to ucode_disas

* Partially label audio_synthesis

To some extent copied from sm64.

* cleanup

* Reverb and ReverbBits have nothing to do with reverbs

* review

* naming

* Undo changes to permuter_settings.toml

Co-authored-by: zelda2774 <zelda2774@invalid>
2021-08-31 18:53:35 -04:00
zelda2774
37871e555f
Match func_800E4590 (#922)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-08-29 20:51:57 -04:00
zelda2774
a75c70358c
Match func_800EEA50 + some surrounding doc (#916)
* Match func_800EEA50

* Document some audio debug stuff

* more doc

* more doc

* formatting

* Fix enums, and some more bits of doc

* review

* LIM -> MAX

* missed review suggestion...

* more review

* ganon comments

* more review

* 🐍☠️

* more review

* Update functions.h

* quotes

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
2021-08-29 20:08:41 -04:00
louist103
556cdad7eb
Big cleanup (#775)
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-22 01:12:57 +02:00
zelda2774
a0d2cceeca
Match some audio functions (#896)
* cleanups

* Improve Audio_SequencePlayerProcessSequence

* cleanup

* labeling

* progress on func_800E5000

* func_800F6268

* func_800ECDF8

* Improve func_800F2464

* reorder variables

* labelling

* non-equivalent func_800EEA50

* minor doc

* func_800E6590

* minor doc

* Reformat abi.h

* Very slight improvements

* func_800DC384

* func_800E1618

* formatting

Co-authored-by: zelda2774 <zelda2774@invalid>
2021-08-12 15:37:37 -04:00
mzxrules
df5e1c63c0
z_en_ko OK (#869)
* .data OK

* Progress

* push some old stuff

* Finish a chain

* Progress

* Progress

* Run mathfixer.py

* Progress

* match one more

* Up to date

* Match func_80A97610

* func_80A96FD0

* most of the way through the mega switch

* small formatting thing. still stuck on the switch

* start a big switch function

* a little closer

* done with matching for now starting objects

* func_80A97738 OK!

* func_80A995CC OK!

* func_80A99864 OK!

* en_ko OK!

* Code clean-up pass

* more EnKo cleanups, object_fa and object_kw1 textures documented

* complete object_km1, more EnKo documentation

* More documentation

* delete asm

* Clean-up rebase issues

* bleh

* Implement Dragorn's suggestions

* fix spec, implement fig's suggestions

* whoops (ill leave it for the docs tho lol)

* whoops again

* i made an ouchie

* smile

* last one for real

Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-28 23:59:52 +02:00
krimtonz
d1a5ea5110
Audio WIP (#836)
* being code_800EC960

* wip

* wip

* more audio progress

* migrate data in code_800E11F0

* wip

* make ok

* remove asm

* wip

* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094

* more progress

* wip

* wip

* split code_800E11F0

* migrate rodata in code_800E11F0

* match functions that couldn't because of data issues

* move code_800E4FE0 asm files

* wip

* more wip

* fix global functions, and forward declarations

* wip

* wip

* wip

* ocarina wip

* match a couple functions

* some progress

* separate some bss

* match func_800EDA3C

* some matching

* more matches

* migrate audio rodata

* some matches

* more matchess

* start on synthesis

* work on synthesis

* fix function declaration

* Merge branch 'master' into audio

* match a few more functions

* wip

* wip

* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd

* name several audio functions, and audiocontext members

* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis

* audio wip

* match a few more functions.

* wip

* add missing NON_MATCHING directive

* wip

* some matching, data reogranization

* match cursed function

* wip

* wip

* formatting

* remove prefix from struct memebers

* missed function rename

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-07-27 19:44:58 -04:00
zelda2774
20206fba0d
Fix non-matching in audio_heap (#640)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-01-17 21:31:47 -05:00
Random
174af7384d
libultra cleanup (#215)
* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes
2020-10-03 11:22:44 -04:00
zelda2774
055d1d2bae
audio_heap: 1 non-matching (#381)
* Audio_AllocDmaMemory

* Audio_AllocDmaMemoryZeroed

* func_800DE238

* Audio_SessionPoolsInit

* func_800DE2B0

* func_800DE258

* Audio_DiscardSequence

* Audio_DiscardBank

* func_800DE12C

* Audio_ResetLoadStatus

* func_800DDE3C

* func_800DDE20

* Audio_InitMainPools

* Audio_SoundAllocPoolInit

* Audio_PersistentPoolClear

* Audio_TemporaryPoolClear

* func_800DE4A0

* Audio_PersistentPoolsInit

* Audio_TemporaryPoolsInit

* Formatting

* Audio_SeqAndBankPoolInit

* Audio_Alloc

* Audio_AllocZeroed

* func_800DE4B0

* func_800DF0CC

* func_800DF074

* func_800DF1D8

* func_800DF688

* func_800DF5DC, func_800DF630

* func_800DF7BC

* func_800DF7C4

* func_800DF888

* Fix AudioBufferParameters

* Audio_ResetStep

* Struct work

* oops

* structsss

* wip on func_800DFBF8

* func_800E04E8

* func_800E0540

* func_800E0964

* func_800E1148

* func_800DF5AC

* func_800E0E6C

* func_800E0E90

* func_800E0BF8

* func_800E0634

* func_800E05C4

* func_800E0CBC

* func_800E0C80

* naming

* func_800E0BB4

* func_800E0AD8

* func_800E0E0C

* func_800E0EB4

* func_800E06CC

* Audio_AllocBankOrSeq

* Use true/false macros

* fixup

* Format

* comments

* review

* unk instrument -> sfx

* Reword comment

* Change AVOID_UB to a comment

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-20 13:22:09 -04:00
zelda2774
c033b4b28e
audio_seqplayer, the easy half (#369)
* func_800E9340

* Audio_SequenceChannelDisable

* Audio_SeqChannelLayerFree

* Audio_SeqChannelLayerDisable

* Rename functions

* Audio_SeqChannelSetLayer

* Move gSequenceChannelNone into gAudioContext

* Audio_SequenceChannelInit

* Name functions

* Audio_M64ReadU8

* Audio_M64ReadS16

* Audio_M64ReadCompressedU16

* Audio_AudioListPopBack

* Audio_AudioListPushBack

* Audio_InitLayerFreelist

* Audio_SequencePlayerDisableAsFinished

* incomplete Audio_SequencePlayerDisable

* Audio_SequenceChannelEnable

* Audio_SequencePlayerDisableChannels

* Audio_SequencePlayerInitChannels

* struct fixes

* func_800E9ED8

* Name more functions

* Audio_SequenceChannelSetVolume

* Audio_SetInstrument

* Audio_GetInstrument

* confirm structs

* Audio_ResetSequencePlayer

* Audio_InitSequencePlayer

* Audio_InitSequencePlayers

* func_800EC734

* Find the right Audio_SoundAlloc

* Prune functions.h

* Move global vars into gAudioContext

* func_800EAEF4

* Audio_SeqChannelLayerProcessScript

* Audio_HandleScriptFlowControl

* func_800E9F64

* func_800EA0C0

* func_800EA440

* func_800EAAE0

* unbreak audio_effects

* Audio_ProcessSequence

* Audio_ProcessSequences

* Some audio_heap struct work and function naming

* Audio_SequencePlayerDisable

* ? instead of ! in z64audio.h

* Revert makefile change

* Formatting, player -> seqPlayerIndex

* Index -> Idx

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-01 17:23:30 -04:00
zelda2774
d68f9893fd
audio_playback, audio_effects OK (#313)
* audio_playback.c

* format.sh

* rename functions

* Audio_SequenceChannelProcessSound

* Audio_SequencePlayerProcessSound

* Audio_GetPortamentoFreqScale

* Audio_GetVibratoPitchChange

* Audio_GetVibratoFreqScale

* Audio_NoteVibratoInit, Audio_NoteVibratoUpdate

* Audio_NotePortamentoInit

* Audio_AdsrInit

* Audio_AdsrUpdate

* Common bitfield formatting

* format.sh

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-15 14:06:26 -04:00