mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-28 03:50:07 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Match osViSetMode (#2404)

Browse source
This commit is contained in:
Tharo 2025-01-07 05:21:25 +00:00 • committed by GitHub
parent c6cceea85b
commit aaf9c939a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/variables.h
View file

@ -14,6 +14,8 @@ extern s32 osCicId;
extern u32 osMemSize; extern u32 osMemSize;
extern u8 osAppNMIBuffer[0x40]; extern u8 osAppNMIBuffer[0x40];
extern u32 __osBbIsBb;
extern s8 D_80009430; extern s8 D_80009430;
extern vu8 gViConfigBlack; extern vu8 gViConfigBlack;
extern u8 gViConfigAdditionalScanLines; extern u8 gViConfigAdditionalScanLines;

2
src/code/main.c
View file

@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
#endif #endif
#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
"ntsc-1.0:142 ntsc-1.1:142 ntsc-1.2:142 pal-1.0:140 pal-1.1:140" "ntsc-1.0:141 ntsc-1.1:141 ntsc-1.2:141 pal-1.0:139 pal-1.1:139"
extern u8 _buffersSegmentEnd[]; extern u8 _buffersSegmentEnd[];

2
src/code/z_camera.c
View file

@ -3639,7 +3639,7 @@ s32 Camera_KeepOn3(Camera* camera) {
} }
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ntsc-1.0:145 ntsc-1.1:145 ntsc-1.2:145 pal-1.0:143 pal-1.1:143" "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:142 pal-1.1:142"
s32 Camera_KeepOn4(Camera* camera) { s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50; static Vec3f D_8015BD50;

6
src/libultra/io/visetmode.c
View file

@ -4,6 +4,12 @@
void osViSetMode(OSViMode* mode) { void osViSetMode(OSViMode* mode) {
register u32 prevInt = __osDisableInt(); register u32 prevInt = __osDisableInt();
#ifdef BBPLAYER
if (__osBbIsBb) {
mode->comRegs.ctrl &= ~VI_CTRL_PIXEL_ADV(2);
}
#endif
__osViNext->modep = mode; __osViNext->modep = mode;
__osViNext->state = VI_STATE_MODE_SET; __osViNext->state = VI_STATE_MODE_SET;
__osViNext->features = __osViNext->modep->comRegs.ctrl; __osViNext->features = __osViNext->modep->comRegs.ctrl;