Z2StatusMgr (#24)

* split Z2SeMgr / begin split of Z2SeqMgr

* Z2StatusMgr ok

most of Z2StatusMgr done, rest split

* name some class members

* name some Z2SceneMgr vars

Co-authored-by: Pheenoh <pheenoh@gmail.com>

libs/Z2AudioLib/Z2LinkMgr.cpp

@@ -1,4 +1,6 @@
 #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
+#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
 void Z2CreatureLink::setLinkGroupInfo(u8 param1) {

libs/Z2AudioLib/Z2SceneMgr.cpp

@@ -1,11 +1,13 @@
 #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
+#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
 //Missing 2 instructions (beginning and end)
 #ifdef NONMATCHING
 Z2SceneMgr::Z2SceneMgr(void){
     lbl_80450B80 = this;
-    this->field_0x4 = -1;
+    this->sceneNum = -1;
     this->timer = -1;
     this->BGM_ID = -1;
     this->roomNum = -1;
@@ -23,9 +25,9 @@ Z2SceneMgr::Z2SceneMgr(void){
     this->field_0x19 = 0;
     this->field_0x1a = 0;
     this->field_0x1b = 0;
-    this->field_0x1d = 0;
-    this->field_0x1c = 0;
-    this->field_0x1e = false;
+    this->sceneExist = 0;
+    this->inGame = 0;
+    this->inDarkness = false;
     this->field_0x17 = 0;
     return;
 }
@@ -52,14 +54,14 @@ extern float lbl_80455A3C;
 #ifdef NONMATCHING
 void Z2SceneMgr::setSceneExist(bool param_1){
     Z2SoundMgr *Z2soundMgrPtr;
-    this->field_0x1d = param_1;
+    this->sceneExist = param_1;
     this->timer = 0;
     Z2soundMgrPtr = lbl_80450B60;
     if(param_1==false){
         Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0xb4);
     }
     else{
-        this->field_0x1c = 1;
+        this->inGame = 1;
         if (this->SeWave_3 == 0x85) {
             Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0);
         }

libs/Z2AudioLib/Z2SeMgr.cpp

@@ -1 +1,144 @@
-// ok
+#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+
+extern "C"{
+    void JAISoundHandle(void);
+    void JAISoundHandle_NS_dtor(void);
+    void Z2MultiSeObj_NS_dtor(void);
+}
+
+asm Z2SeMgr::Z2SeMgr(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"
+}
+
+asm Z2MultiSeObj::Z2MultiSeObj(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB710.s"
+}
+
+asm void Z2SeMgr::initSe(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB750.s"
+}
+
+asm void Z2SeMgr::resetModY(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB80C.s"
+}
+
+asm void Z2SeMgr::modHeightAtCamera(Vec const** param1){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
+}
+
+asm void Z2SeMgr::incrCrowdSize(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
+}
+
+asm void Z2SeMgr::decrCrowdSize(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
+}
+
+asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB984.s"
+}
+
+asm void Z2SeMgr::seStartLevel(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s"
+}
+
+asm void Z2SeMgr::seStop(JAISoundID, u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s"
+}
+
+asm void Z2SeMgr::seStopAll(u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s"
+}
+
+asm void Z2SeMgr::seMoveVolumeAll(float, u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD9F4.s"
+}
+
+asm void Z2SeMgr::messageSePlay(u16, Vec*, s8){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s"
+}
+
+asm void Z2SeMgr::talkInSe(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB50.s"
+}
+
+asm void Z2SeMgr::talkOutSe(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADC54.s"
+}
+
+asm void Z2SeMgr::menuInSe(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADD58.s"
+}
+
+asm void Z2SeMgr::setLevObjSE(u32, Vec*, s8){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADE5C.s"
+}
+
+asm void Z2SeMgr::setMultiTriggerSE(u32, Vec*, s8){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADFF4.s"
+}
+
+asm void Z2SeMgr::processSeFramework(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE184.s"
+}
+
+asm bool Z2SeMgr::isLevelSe(JAISoundID){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE524.s"
+}
+
+asm bool Z2SeMgr::isSoundCulling(JAISoundID){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s"
+}
+
+
+asm Z2MultiSeMgr::Z2MultiSeMgr(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB04.s"
+}
+
+asm Z2MultiSeMgr::~Z2MultiSeMgr(){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB34.s"
+}
+
+asm u32 Z2MultiSeMgr::registMultiSePos(Vec*){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
+}
+
+asm void Z2MultiSeMgr::resetMultiSePos(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
+}
+
+asm float Z2MultiSeMgr::getPanPower(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECE0.s"
+}
+
+asm float Z2MultiSeMgr::getDolbyPower(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
+}

libs/Z2AudioLib/Z2SeqMgr.cpp

@@ -1 +1,93 @@
-// ok
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+
+
+asm Z2SeqMgr::Z2SeqMgr(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s"
+}
+
+asm void Z2SeqMgr::bgmStart(u32,u32,s32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s"
+}
+
+asm void Z2SeqMgr::bgmStop(u32,s32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s"
+}
+
+asm void Z2SeqMgr::subBgmStart(u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s"
+}
+
+asm void Z2SeqMgr::subBgmStop(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s"
+}
+
+asm void Z2SeqMgr::subBgmStopInner(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s"
+}
+
+asm void Z2SeqMgr::bgmStreamPrepare(u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s"
+}
+
+asm int Z2SeqMgr::bgmStreamCheckReady(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFDEC.s"
+}
+
+asm void Z2SeqMgr::bgmStreamPlay(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s"
+}
+
+asm void Z2SeqMgr::bgmStreamStop(u32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s"
+}
+
+asm void Z2SeqMgr::changeBgmStatus(s32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s"
+}
+
+asm void Z2SeqMgr::changeSubBgmStatus(s32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s"
+}
+
+asm void Z2SeqMgr::onVariantBgmJumpEnd(bool){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s"
+}
+
+asm void Z2SeqMgr::changeFishingBgm(s32){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2A88.s"
+}
+
+asm void Z2SeqMgr::talkInBgm(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2CA4.s"
+}
+
+asm void Z2SeqMgr::talkOutBgm(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2D64.s"
+}
+
+asm void Z2SeqMgr::menuInBgm(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DAC.s"
+}
+
+asm void Z2SeqMgr::menuOutBgm(void){
+    nofralloc
+    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DF4.s"
+}

libs/Z2AudioLib/Z2StatusMgr.cpp

@@ -1 +1,130 @@
-// ok
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
+#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+
+Z2StatusMgr::Z2StatusMgr(){
+    lbl_80450B7C = this;
+    this->hour = 0;
+    this->minute = 0;
+    this->weekday = 0;
+    this->unk3 = 0;
+    this->time = 3072;
+    this->event_bit = (void*)0;
+    this->is_menu_in = false;
+    this->camera_map_info = 0;
+    float polygon_pos_init = lbl_80455A18;
+    this->polygon_position.x = polygon_pos_init;
+    this->polygon_position.y = polygon_pos_init;
+    this->polygon_position.z = polygon_pos_init;
+    float depth_init = lbl_80455A1C;
+    this->underwater_depth = depth_init;
+    this->camera_in_water_depth_ratio = depth_init;
+    this->demo_status = 0;
+    this->heart_gauge_on = 0;
+}
+
+void Z2StatusMgr::heartGaugeOn(void){
+    this->heart_gauge_on = 2;
+}
+
+asm void Z2StatusMgr::processHeartGaugeSound(void){
+    nofralloc
+    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
+}
+
+void Z2StatusMgr::talkIn(void){
+    u8 is_demo;
+
+    is_demo = isMovieDemo();
+    if(is_demo == false){
+        lbl_80450B84->talkInBgm();
+        lbl_80450B88->talkInSe();
+    }
+}
+
+void Z2StatusMgr::talkOut(void){
+    u8 is_demo;
+
+    is_demo = isMovieDemo();
+    if(is_demo == false){
+        lbl_80450B84->talkOutBgm();
+        lbl_80450B88->talkOutSe();
+    }
+}
+
+void Z2StatusMgr::menuIn(){
+    lbl_80450B84->menuInBgm();
+    lbl_80450B88->menuInSe();
+    
+    this->is_menu_in = true;
+}
+
+void Z2StatusMgr::menuOut(){
+    lbl_80450B84->menuOutBgm();
+    lbl_80450B88->talkOutSe();
+    
+    this->is_menu_in = false;
+}
+
+//right instructions, wrong registers
+#ifdef NONMATCHING
+bool Z2StatusMgr::isMovieDemo(void){
+    bool uvar2;
+
+    uvar2 = false;
+    if(this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9){
+        uvar2 = true;
+    }
+    return uvar2;
+}
+#else
+asm bool Z2StatusMgr::isMovieDemo(void){
+    nofralloc
+    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
+}
+#endif
+
+asm void Z2StatusMgr::setDemoName(char*){
+    nofralloc
+    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
+}
+
+void Z2StatusMgr::processTime(void){
+    u16 temp = this->hour * 256;
+    this->time = temp + minute;
+}
+
+bool Z2StatusMgr::checkDayTime(void){
+    if(this->hour >= 6 && this->hour < 19){
+        return true;
+    }
+    else{
+        return false;
+    }
+}
+
+void Z2StatusMgr::setEventBit(void* event_bit){
+    this->event_bit = event_bit;
+}
+
+void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos){
+    if(polygon_pos == 0){
+        return;
+    }
+    else{
+        this->polygon_position.x = polygon_pos->x;
+        this->polygon_position.y = polygon_pos->y;
+        this->polygon_position.z = polygon_pos->z;
+    }
+}
+
+void Z2StatusMgr::setCameraGroupInfo(u8 param1){
+    return;
+}
+
+asm void Z2StatusMgr::setCameraInWaterDepth(float){
+    nofralloc
+    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
+}