diff options
| author | Lucas Shaw <49287729+shawlucas@users.noreply.github.com> | 2021-03-27 14:17:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 16:17:41 -0500 |
| commit | 623b6d531855aecb3f64cdb678843e9d423ce415 (patch) | |
| tree | bfa2514d5320425eb74764290057f2a21155f4d7 /src/boot_O2_g3/viconfig.c | |
| parent | fee7a49abc84fbe91116f969a90570cff15decde (diff) | |
Some OOT transfers, some renaming, etc (#75)
* Progress on various files
* gfxprint stuff
* split some rodata, add iconv for rodata string parsing
* z_std_dma rodata
* 2 nonmatchings in gfxprint
* mtxuty-cvt ok
* more
* match a function in idle.c
* progress
* Cleanup
* Rename BgPolygon to CollisionPoly
* progress
* some effect stuff
* more effect progress
* updates
* made suggested changes
* z_effect_soft_sprite_old_init mostly ok
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Diffstat (limited to 'src/boot_O2_g3/viconfig.c')
| -rw-r--r-- | src/boot_O2_g3/viconfig.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/boot_O2_g3/viconfig.c b/src/boot_O2_g3/viconfig.c index c36f9b2e2..64f3d4ec9 100644 --- a/src/boot_O2_g3/viconfig.c +++ b/src/boot_O2_g3/viconfig.c @@ -1,9 +1,8 @@ #include <ultra64.h> #include <global.h> -#ifdef NON_MATCHING -void ViConfig_UpdateVi(u32 arg0) { - if (arg0 != 0) { +void ViConfig_UpdateVi(u32 mode) { + if (mode != 0) { switch (osTvType) { case 2: osViSetMode(&osViModeMpalLan1); @@ -17,7 +16,6 @@ void ViConfig_UpdateVi(u32 arg0) { break; } - // TODO v0 is used here instead of a0. Is this a 7.1 optimization? if (gViConfigFeatures != 0) { osViSetSpecialFeatures(gViConfigFeatures); } @@ -26,13 +24,12 @@ void ViConfig_UpdateVi(u32 arg0) { osViSetYScale(1); } } else { - osViSetMode(&D_8009B240); + osViSetMode(&gViConfigMode); if (gViConfigAdditionalScanLines != 0) { func_80087E00(gViConfigAdditionalScanLines); } - // TODO v0 is used here instead of a0. Is this a 7.1 optimization? if (gViConfigFeatures != 0) { osViSetSpecialFeatures(gViConfigFeatures); } @@ -46,11 +43,9 @@ void ViConfig_UpdateVi(u32 arg0) { } } - gViConfigUseDefault = arg0; + gViConfigUseDefault = mode; } -#else -#pragma GLOBAL_ASM("./asm/non_matchings/boot/viconfig/ViConfig_UpdateVi.asm") -#endif + void ViConfig_UpdateBlack(void) { if (gViConfigUseDefault != 0) { |