diff options
| author | Synray <31429825+Synray@users.noreply.github.com> | 2021-02-15 09:29:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 18:29:06 +0100 |
| commit | 79c8accfaba2b7ca0bd0acdd8aa65d3805cb2ed8 (patch) | |
| tree | fc75b049344a069669a9335ee8d1bc139a23afcf /include | |
| parent | 5bc23f58f80cdce021008ec798c6ac3e5f4a6bf0 (diff) | |
z_play.c OK (#701)
* z_play.c OK
* Change ~0x13 -> -20
* Back to hex
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 6 | ||||
| -rw-r--r-- | include/macros.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index f44cc1916..dfa8308ba 100644 --- a/include/functions.h +++ b/include/functions.h @@ -758,7 +758,7 @@ s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* dynaActor, s16 arg2, void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, GlobalContext* globalCtx); void Camera_InitPlayerSettings(Camera* camera, Player* player); s16 Camera_ChangeStatus(Camera* camera, s16 status); -Vec3s* Camera_Update(Vec3s* outDir, Camera* camera); +Vec3s Camera_Update(Camera* camera); void Camera_Finish(Camera* camera); s32 Camera_ChangeMode(Camera* camera, s16 mode); s32 Camera_CheckValidMode(Camera* camera, s16 mode); @@ -943,7 +943,7 @@ u8 func_8006F140(GlobalContext*, EnvironmentContext*, UNK_TYPE); f32 func_8006F93C(u16, u16, u16); f32 func_8006F9BC(u16 endFrame, u16 startFrame, u16 frames, u16, u16); // ? func_8006FB94(?); -void func_8006FC88(s16 skyboxId, EnvironmentContext* envCtx, SkyboxContext* skyboxCtx); +void func_8006FC88(u8 skyboxId, EnvironmentContext* envCtx, SkyboxContext* skyboxCtx); void func_80070600(GlobalContext* globalCtx, s32 waterboxProperties); void func_800706A0(GlobalContext* globalCtx); // ? func_80070718(?); @@ -968,7 +968,7 @@ void func_80075E68(GlobalContext* globalCtx); // ? func_800763A8(?); // ? func_800766C4(?); void func_8007672C(GraphicsContext*, u8, u8, u8, u8, UNK_TYPE); -void func_80076934(GlobalContext* globalCtx); +void func_80076934(GlobalContext* globalCtx, u8); void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4); s32 func_800775CC(); void func_800775D8(); diff --git a/include/macros.h b/include/macros.h index 3315dd5e1..68f140580 100644 --- a/include/macros.h +++ b/include/macros.h @@ -75,8 +75,10 @@ #define LOG_FLOAT(exp, value, file, line) LOG(exp, value, "%f", file, line) #define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \ - (curState)->init = newInit; \ - (curState)->size = sizeof(newStruct) + do { \ + (curState)->init = newInit; \ + (curState)->size = sizeof(newStruct); \ + } while (0) #define SET_FULLSCREEN_VIEWPORT(view) \ { \ |