From 13a94482e546217a245f914c1b5b49be0da0e592 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 30 May 2020 09:33:29 -0400
Subject: Decompiled ovl_En_Zl1 (#169)

* Some progress

* progs

* More

* 1 more

* Init

* Slightly better score on one function

* 1 down!

* some progress

* Prep for PR

* PR suggestions

* OK!

* Formatting

* formatting again

* PR comments

* updating ZAP2
---
 src/code/z_en_item00.c | 3 ++-
 src/code/z_play.c      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index bc3ff73d8..871102f56 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -478,8 +478,9 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) {
 
     this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f);
 
-    if LINK_IS_ADULT
+    if (LINK_IS_ADULT) {
         this->actor.posRot.pos.y += 20.0f;
+    }
 }
 
 extern s32 D_80157D90;
diff --git a/src/code/z_play.c b/src/code/z_play.c
index fcb0ae136..41726cb11 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -1690,13 +1690,13 @@ void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2) {
     func_8005AE64(globalCtx->cameraPtrs[camIdx1], globalCtx->cameraPtrs[camIdx2]);
 }
 
-void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3) {
+s32 func_800C0808(GlobalContext* globalCtx, s16 camId, Player* player, s16 arg3) {
     Camera* camera;
     s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId;
 
     camera = globalCtx->cameraPtrs[camIdx];
-    func_80058148(camera, arg2);
-    func_8005A77C(camera, arg3);
+    func_80058148(camera, player);
+    return func_8005A77C(camera, arg3);
 }
 
 void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2) {
-- 
cgit v1.2.3