mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

EnDivingGame OK (#745)

Browse source 
* update

* EnDivingGame_Draw OK

* dont feel like working on this function today

* fixed build errors

* fixing some merge conflicts

Signed-off-by: Angie <angheloalf95@gmail.com>

* more conflict fixing

Signed-off-by: Angie <angheloalf95@gmail.com>

* all merge conflicts fixed

Signed-off-by: Angie <angheloalf95@gmail.com>

* EnDivingGame_Update OK

Signed-off-by: Angie <angheloalf95@gmail.com>

* remove DECR

Signed-off-by: Angie <angheloalf95@gmail.com>

* format and unused_asm

Signed-off-by: Angie <angheloalf95@gmail.com>

* change reloc in spec

Signed-off-by: Angie <angheloalf95@gmail.com>

* damn reloc

Signed-off-by: Angie <angheloalf95@gmail.com>

* Apply suggestions from code review

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* use OPEN_DISPS macro

Signed-off-by: Angie <angheloalf95@gmail.com>

* batch of suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more suggestions

Signed-off-by: Angie <angheloalf95@gmail.com>

* more changes, but this isn't ready yet

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename two timers

Signed-off-by: angie <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* grabbedRuppiesCounter

Signed-off-by: angie <angheloalf95@gmail.com>

* a lot of vec

Signed-off-by: angie <angheloalf95@gmail.com>

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* fix some typos

Signed-off-by: angie <angheloalf95@gmail.com>

* allRupeesThrowed

Signed-off-by: angie <angheloalf95@gmail.com>

* rupeesLeftToThrow

Signed-off-by: Angie <angheloalf95@gmail.com>

* boolean changes and minor comments

Signed-off-by: Angie <angheloalf95@gmail.com>

* and more renaming

Signed-off-by: Angie <angheloalf95@gmail.com>

* renaiming and chained assign

Signed-off-by: Angie <angheloalf95@gmail.com>

* rename 3 functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* final rename and add two enums

Signed-off-by: angie <angheloalf95@gmail.com>

* format

Signed-off-by: angie <angheloalf95@gmail.com>

* enum naming

Signed-off-by: angie <angheloalf95@gmail.com>

Co-authored-by: Lucas Shaw <lgs84@cornell.edu>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2021-04-03 13:15:16 -03:00 • committed by GitHub
parent c94e595dc1
commit 9834f5517e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 565 additions and 1851 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/functions.h
View file

@ -1582,7 +1582,7 @@ s16 Gameplay_ChangeCameraStatus(GlobalContext* globalCtx, s16 camId, s16 status)
void Gameplay_ClearCamera(GlobalContext* globalCtx, s16 camId);
void Gameplay_ClearAllSubCameras(GlobalContext* globalCtx);
Camera* Gameplay_GetCamera(GlobalContext* globalCtx, s16 camId);
s32 Gameplay_CameraSetAtEye(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3);
s32 Gameplay_CameraSetAtEye(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye);
s32 Gameplay_CameraSetAtEyeUp(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye, Vec3f* up);
s32 Gameplay_CameraSetFov(GlobalContext* globalCtx, s16 camId, f32 fov);
s32 Gameplay_SetCameraRoll(GlobalContext* globalCtx, s16 camId, s16 roll);
@ -1597,6 +1597,7 @@ void Gameplay_TriggerRespawn(GlobalContext* globalCtx);
s32 func_800C0CB8(GlobalContext* globalCtx);
s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw);
s32 func_800C0DB4(GlobalContext* globalCtx, Vec3f* pos);
void PreRender_SetValuesSave(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);
void PreRender_Init(PreRenderContext* this);
void PreRender_SetValues(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf);