diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-27 13:44:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 16:44:35 -0400 |
| commit | c6160e1980d9ff5e048eb57ee8e55bd755bcb891 (patch) | |
| tree | f8ca33b65ea490dbaf57a04eb1b62ef486fc5687 /include | |
| parent | 86a146db24c1b226286e2bd93063c8a65413efc6 (diff) | |
[ntsc-1.0/1.1] Match PAL 1.0 viconfig changes (#2231)
* [ntsc-1.0/1.1] Match viconfig changes
* SREG(48) -> R_VI_MODE_EDIT_STATE
Diffstat (limited to 'include')
| -rw-r--r-- | include/gfx.h | 3 | ||||
| -rw-r--r-- | include/sched.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/gfx.h b/include/gfx.h index edc6217a3..2c3d2b0a8 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -5,6 +5,7 @@ #include "ultra64/gbi.h" #include "sched.h" #include "thga.h" +#include "versions.h" // Texture memory size, 4 KiB #define TMEM_SIZE 0x1000 @@ -46,8 +47,10 @@ typedef struct GraphicsContext { /* 0x02E8 */ s32 fbIdx; /* 0x02EC */ void (*callback)(struct GraphicsContext*, void*); /* 0x02F0 */ void* callbackParam; +#if OOT_VERSION >= PAL_1_0 /* 0x02F4 */ f32 xScale; /* 0x02F8 */ f32 yScale; +#endif /* 0x02FC */ char unk_2FC[0x04]; } GraphicsContext; // size = 0x300 diff --git a/include/sched.h b/include/sched.h index e17081701..2d20e7ec0 100644 --- a/include/sched.h +++ b/include/sched.h @@ -3,6 +3,7 @@ #include "ultra64.h" #include "irqmgr.h" +#include "versions.h" #define OS_SC_NEEDS_RDP 0x0001 // Task uses the RDP #define OS_SC_NEEDS_RSP 0x0002 // Task uses the RSP @@ -27,8 +28,10 @@ typedef struct CfbInfo { /* 0x10 */ u8 unk_10; // set to 0, never read /* 0x11 */ s8 updateRate; // how many VIs should elapse before next swap /* 0x12 */ s8 updateTimer; // counts down (in VIs) from updateRate to 0, swaps the framebuffer at 0 +#if OOT_VERSION >= PAL_1_0 /* 0x14 */ f32 xScale; /* 0x18 */ f32 yScale; +#endif } CfbInfo; // size = 0x1C typedef struct OSScTask { |