diff options
| author | krimtonz <33664508+krimtonz@users.noreply.github.com> | 2021-07-27 18:44:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 19:44:58 -0400 |
| commit | d1a5ea5110ee3a8e7d2f0ed54921570fdccee65c (patch) | |
| tree | ad0a67c7adeb2df31be0476891ee5191ed30df7f /src/boot | |
| parent | cc9a04feb43cb5481e5a503259276af12a824dc1 (diff) | |
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>
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/idle.c | 6 | ||||
| -rw-r--r-- | src/boot/viconfig.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/boot/idle.c b/src/boot/idle.c index d9c35be0d..080fdcfb3 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -56,17 +56,17 @@ void Idle_ThreadEntry(void* arg) { gViConfigYScale = 1.0f; switch (osTvType) { - case 1: + case OS_TV_NTSC: D_80013960 = 2; gViConfigMode = osViModeNtscLan1; break; - case 2: + case OS_TV_MPAL: D_80013960 = 0x1E; gViConfigMode = osViModeMpalLan1; break; - case 0: + case OS_TV_PAL: D_80013960 = 0x2C; gViConfigMode = osViModeFpalLan1; gViConfigYScale = 0.833f; diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 5e0b7c908..4c6830c99 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -8,7 +8,7 @@ void ViConfig_UpdateVi(u32 mode) { if (mode != 0) { osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale1(%f);\n" VT_RST, 1.0f); - if (osTvType == 0) { + if (osTvType == OS_TV_PAL) { osViSetMode(&osViModePalLan1); } |