From daf45f768d9ae091a97dce1be8d048ac2b7bd54c Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Sat, 28 Aug 2021 07:25:03 -0700
Subject: move J2D / JUTResFont (#144)

* move some JSystem and meter2_info stuff

* more J2D / JUTTexture / JUTPalette

* setup dScnKy_env_light_c
---
 include/Z2AudioLib/Z2AudioMgr.h |  6 ++++--
 include/Z2AudioLib/Z2Creature.h |  4 ++++
 include/Z2AudioLib/Z2EnvSeMgr.h | 41 +++++++++++++++++++++++++++++++++++++++++
 include/Z2AudioLib/Z2SceneMgr.h |  2 ++
 4 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'include/Z2AudioLib')

diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h
index 212d5f94c4..f804cd58d1 100644
--- a/include/Z2AudioLib/Z2AudioMgr.h
+++ b/include/Z2AudioLib/Z2AudioMgr.h
@@ -2,11 +2,13 @@
 #define Z2AUDIOMGR_H
 
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JASAudioReseter.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "Z2AudioLib/Z2SceneMgr.h"
 #include "Z2AudioLib/Z2SeMgr.h"
 #include "Z2AudioLib/Z2SeqMgr.h"
+#include "Z2AudioLib/Z2SoundObjMgr.h"
 #include "Z2AudioLib/Z2SoundStarter.h"
 #include "Z2AudioLib/Z2StatusMgr.h"
 #include "dolphin/types.h"
@@ -30,8 +32,8 @@ private:
     /* 0x03D0 */ Z2SeqMgr mSeqMgr;
     /* 0x04A4 */ Z2SceneMgr mSceneMgr;
     /* 0x04C4 */ Z2StatusMgr mStatusMgr;
-    /* 0x04F4 */  // Z2SoundObjMgr mSoundObjMgr;
-    /* 0x051C */  // JASAudioReseter mAudioReseter;
+    /* 0x04F4 */ Z2SoundObjMgr mSoundObjMgr;
+    /* 0x051C */ JASAudioReseter mAudioReseter;
     /* 0x052C */ Z2SoundStarter mSoundStarter;
     /* 0x0530 */  // Z2SoundMgr mSoundMgr;
     /* 0x0D40 */  // JAISoundInfo mSoundInfo;
diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
index 8bd14a7d87..3cea0e6b23 100644
--- a/include/Z2AudioLib/Z2Creature.h
+++ b/include/Z2AudioLib/Z2Creature.h
@@ -96,6 +96,10 @@ private:
 
 class Z2CreatureRide {
 public:
+    Z2CreatureRide();
+    ~Z2CreatureRide();
+    void deleteObject();
+    void init(Vec*, Vec*, u8, u8);
     void setLinkRiding(bool);
 
 private:
diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h
index 844bf871f0..a926878fc7 100644
--- a/include/Z2AudioLib/Z2EnvSeMgr.h
+++ b/include/Z2AudioLib/Z2EnvSeMgr.h
@@ -1,6 +1,47 @@
 #ifndef Z2ENVSEMGR_H
 #define Z2ENVSEMGR_H
 
+#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
+struct Z2EnvSeMgr {
+    /* 802C611C */ Z2EnvSeMgr();
+    /* 802C6540 */ ~Z2EnvSeMgr();
+    /* 802C66B0 */ void framework();
+    /* 802C6998 */ void resetScene();
+    /* 802C699C */ void resetSceneInner();
+    /* 802C6AC0 */ void initSceneEnvSe(s32, s8, f32);
+    /* 802C6C1C */ void playSceneEnvSe();
+    /* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*);
+    /* 802C70C8 */ void startStaticEnvSe(s8);
+    /* 802C780C */ void registWindowPos(Vec*);
+    /* 802C7830 */ void startRainSe(s32, s8);
+    /* 802C7CF4 */ void startNearThunderSe(s8);
+    /* 802C7E68 */ void startFarThunderSe(Vec*, s8);
+    /* 802C7FB4 */ void setSnowPower(s8);
+    /* 802C7FBC */ void initStrongWindSe();
+    /* 802C7FC8 */ void setWindDirection(Vec*);
+    /* 802C800C */ void startStrongWindSe(s8);
+    /* 802C80F8 */ void initRiverSe(u8, u8, u8, u8);
+    /* 802C8234 */ void registRiverSePos(Vec*);
+    /* 802C8258 */ void setHyrulSewerOpen(bool);
+    /* 802C8300 */ void startRiverSe(s8);
+    /* 802C8730 */ void initFallSe(u8, u8, u8, u8);
+    /* 802C886C */ void registFallSePos(Vec*);
+    /* 802C8890 */ void startFallSe(s8);
+    /* 802C8A90 */ void initEtcSe(u8, u8, u8, u8);
+    /* 802C8C24 */ void registEtcSePos(Vec*);
+    /* 802C8C48 */ void startEtcSe(s8);
+    /* 802C92C8 */ void registWolfSmellSePos(Vec*);
+    /* 802C92EC */ void startFogWipeTrigger(Vec*);
+    /* 802C93A0 */ void setFogWipeWidth(f32);
+    /* 802C93E4 */ void getFogDensity();
+    /* 802C9400 */ void startFogSe();
+    /* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8);
+    /* 802C9F58 */ void registLv3WaterSePos(u8, Vec*);
+    /* 802CA794 */ void startLv3WaterSe(s8);
+
+    u8 field_0x0[780];
+};
+
 #endif /* Z2ENVSEMGR_H */
diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h
index ec67d7326a..dfb77c2aed 100644
--- a/include/Z2AudioLib/Z2SceneMgr.h
+++ b/include/Z2AudioLib/Z2SceneMgr.h
@@ -28,6 +28,8 @@ public:
     void loadSeWave(u32);
     void loadBgmWave(u32);
 
+    bool isSceneExist() { return sceneExist; }
+
 private:
     /* 0x00 */ long BGM_ID;
     /* 0x04 */ int sceneNum;
-- 
cgit v1.2.3