diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/z64.h | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/functions.h b/include/functions.h index 8c8b76a3e..173b44d26 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1547,7 +1547,7 @@ s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4); s32 func_800E9138(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, f32 param_5); s32 func_800E9250(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, Vec3f param_5); u8 func_800E9360(void); -void static_context_init(void); +void GameInfo_Init(void); // void func_800E9470(void); void DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, GraphicsContext* gfxCtx); void DebugDisplay_DrawObjects(GlobalContext* globalCtx); diff --git a/include/z64.h b/include/z64.h index 6e179ebe2..e38d926a6 100644 --- a/include/z64.h +++ b/include/z64.h @@ -36,6 +36,7 @@ #include "z64scene.h" #include "z64save.h" #include "z64transition.h" +#include "regs.h" #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 @@ -242,14 +243,16 @@ typedef struct { /* 0x11D88 */ u8 unk_11D88; } Font; // size = 0x11D8C +// Game Info aka. Static Context +// Data normally accessed through REG macros (see regs.h) typedef struct { - /* 0x0000 */ u8 unk0; - /* 0x0001 */ u8 unk1; - /* 0x0002 */ u8 unk2; - /* 0x0003 */ u8 unk3; - /* 0x0004 */ u32 unk4; - /* 0x0008 */ UNK_TYPE1 pad8[0xC]; - /* 0x0014 */ s16 data[2784]; // Accessed through REG macros + /* 0x00 */ u8 unk_00; // regPage;? // 1 is first page + /* 0x01 */ u8 unk_01; // regGroup;? // "register" group (R, RS, RO, RP etc.) + /* 0x02 */ u8 unk_02; // regCur;? // selected register within page + /* 0x03 */ u8 unk_03; // dpadLast;? + /* 0x04 */ u32 unk_04; // repeat;? + /* 0x08 */ UNK_TYPE1 pad_08[0xC]; + /* 0x14 */ s16 data[REG_GROUPS * REG_PER_GROUP]; // 0xAE0 entries } GameInfo; // size = 0x15D4 typedef struct { |