From e975c4df38aa4da83fa90845b999cc768cf120a1 Mon Sep 17 00:00:00 2001
From: engineer124 <engineer124engineer124@gmail.com>
Date: Fri, 19 Aug 2022 18:41:33 -0400
Subject: [PATCH] cleanup

---
 include/functions.h |  2 +-
 src/code/z_play.c   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 8b0d7dae6c..e5e438d5d8 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1335,7 +1335,7 @@ s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* headRo
 s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* torsoRot, Vec3f focusPos);
 void SaveContext_Init(void);
 void GameInfo_Init(void);
-void DebugDisplay_Init(void);
+DebugDispObject* DebugDisplay_Init(void);
 DebugDispObject* 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 func_800E9C90(void);
 // void func_800E9CA0(s32 param_1, UNK_TYPE1 param_2, s8* param_3);
diff --git a/src/code/z_play.c b/src/code/z_play.c
index d799ca69cc..11e51588df 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -389,7 +389,7 @@ void func_80166968(PlayState* this, Camera* camera) {
             Camera_SetFlags(camera, CAM_STATE_UNDERWATER);
             D_801D0D58 = -1;
             Distortion_SetType(0x10);
-            Distortion_SetCountdown(0x50);
+            Distortion_SetCountdown(80);
         }
 
         func_801A3EC0(0x20);
@@ -548,8 +548,7 @@ void func_80168DAC(PlayState* this) {
 void Play_Main(GameState* thisx) {
     PlayState* this = (PlayState*)thisx;
 
-    D_801D0D60 = &this->state.input[0];
-
+    D_801D0D60 = CONTROLLER1(&this->state);
     DebugDisplay_Init();
 
     {
@@ -563,13 +562,13 @@ void Play_Main(GameState* thisx) {
     }
 
     {
-        Input sp28 = this->state.input[0];
+        Input sp28 = *CONTROLLER1(&this->state);
 
         if (1) {
-            this->state.input[0] = D_801F6C18;
+            *CONTROLLER1(&this->state) = D_801F6C18;
         }
         func_80168DAC(this);
-        this->state.input[0] = sp28;
+        *CONTROLLER1(&this->state) = sp28;
     }
 
     ActorCutscene_Update();