mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-11 03:26:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Z2StatusMgr (#24)

Browse Source 
* 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>
This commit is contained in:
TakaRikka
2020-12-13 12:43:16 -08:00
committed by GitHub
parent 4e622b873f
commit c65c2dbb8f
121 changed files with 9860 additions and 9476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
+10 -31
View File
@@ -1,37 +1,22 @@
#include "global.h"
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
class JAISoundParamsMove{
public:
struct JAISoundParamsMove{
void moveVolume(float param_1, u32 param_2);
private:
float unk_1;
};
class Z2SoundMgr{
public:
struct Z2SoundMgr{
void resetFilterAll();
u8 p1[0x3ec];
JAISoundParamsMove* JAISoundParamsMove;
private:
};
class Z2SeMgr{
public:
void seMoveVolumeAll(float param_1, u32 param_2);
};
class Z2SeqMgr{
private:
u8 p1[0xD0];
u8 unk_1;
public:
void setFieldBgmPlay(bool param_1);
};
class Z2SceneMgr{
private:
struct Z2SceneMgr{
long BGM_ID;
int field_0x4;
int sceneNum;
int timer;
s8 roomNum;
u8 SeWave_1;
@@ -49,10 +34,10 @@ private:
u8 field_0x19;
u8 field_0x1a;
u8 field_0x1b;
u8 field_0x1c;
bool field_0x1d;
bool inGame;
bool sceneExist;
bool inDarkness;
public:
Z2SceneMgr(void);
void setInDarkness(bool param_1);
void setSceneExist(bool param_1);
@@ -61,9 +46,3 @@ public:
void setSceneName(char* stageName, long roomNum, long layerNum);
int checkFirstWaves(void);
};
struct JAISoundID
{
u32 soundId;
JAISoundID(JAISoundID const &soundIdToSet);
};
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s
+1 -1
View File
@@ -29,7 +29,7 @@ lbl_802B6A7C:
/* 802B6A80 002B39C0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6A84 002B39C4 D0 03 00 B4 */ stfs f0, 0xb4(r3)
/* 802B6A88 002B39C8 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B6A8C 002B39CC 4B FF F6 F1 */ bl Z2StatusMgr_NS_menuOut
/* 802B6A8C 002B39CC 4B FF F6 F1 */ bl menuOut__11Z2StatusMgrFv
/* 802B6A90 002B39D0 88 1F 00 1A */ lbz r0, 0x1a(r31)
/* 802B6A94 002B39D4 28 00 00 00 */ cmplwi r0, 0
/* 802B6A98 002B39D8 40 82 00 44 */ bne lbl_802B6ADC
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
+24 -24
View File
@@ -40,7 +40,7 @@
/* 802B6B94 002B3AD4 38 80 00 00 */ li r4, 0
/* 802B6B98 002B3AD8 48 00 94 55 */ bl Z2SoundObjMgr_NS_setGhostEnemyState
/* 802B6B9C 002B3ADC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6BA0 002B3AE0 4B FF 4C 6D */ bl Z2SeMgr_NS_resetModY
/* 802B6BA0 002B3AE0 4B FF 4C 6D */ bl resetModY__7Z2SeMgrFv
/* 802B6BA4 002B3AE4 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B6BA8 002B3AE8 88 03 00 2C */ lbz r0, 0x2c(r3)
/* 802B6BAC 002B3AEC 28 00 00 08 */ cmplwi r0, 8
@@ -48,7 +48,7 @@
/* 802B6BB4 002B3AF4 3C 80 80 3A */ lis r4, lbl_8039BFA8@ha
/* 802B6BB8 002B3AF8 38 84 BF A8 */ addi r4, r4, lbl_8039BFA8@l
/* 802B6BBC 002B3AFC 38 84 02 6A */ addi r4, r4, 0x26a
/* 802B6BC0 002B3B00 4B FF F6 29 */ bl Z2StatusMgr_NS_setDemoName
/* 802B6BC0 002B3B00 4B FF F6 29 */ bl setDemoName__11Z2StatusMgrFPc
lbl_802B6BC4:
/* 802B6BC4 002B3B04 28 12 00 00 */ cmplwi r18, 0
/* 802B6BC8 002B3B08 41 82 00 44 */ beq lbl_802B6C0C
@@ -103,7 +103,7 @@ lbl_802B6C40:
/* 802B6C7C 002B3BBC 3B E0 00 06 */ li r31, 6
/* 802B6C80 002B3BC0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6C84 002B3BC4 38 80 00 00 */ li r4, 0
/* 802B6C88 002B3BC8 4B FF 93 05 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B6C88 002B3BC8 4B FF 93 05 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B6C8C 002B3BCC 48 00 00 38 */ b lbl_802B6CC4
lbl_802B6C90:
/* 802B6C90 002B3BD0 2C 13 00 08 */ cmpwi r19, 8
@@ -155,7 +155,7 @@ lbl_802B6D1C:
/* 802B6D38 002B3C78 3B E0 00 06 */ li r31, 6
/* 802B6D3C 002B3C7C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6D40 002B3C80 38 80 00 00 */ li r4, 0
/* 802B6D44 002B3C84 4B FF 92 49 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B6D44 002B3C84 4B FF 92 49 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B6D48 002B3C88 48 00 29 70 */ b lbl_802B96B8
lbl_802B6D4C:
/* 802B6D4C 002B3C8C 38 61 02 2C */ addi r3, r1, 0x22c
@@ -212,7 +212,7 @@ lbl_802B6DAC:
/* 802B6E0C 002B3D4C 3B E0 00 06 */ li r31, 6
/* 802B6E10 002B3D50 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6E14 002B3D54 38 80 00 00 */ li r4, 0
/* 802B6E18 002B3D58 4B FF 91 75 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B6E18 002B3D58 4B FF 91 75 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B6E1C 002B3D5C 48 00 28 9C */ b lbl_802B96B8
/* 802B6E20 002B3D60 3B A0 00 00 */ li r29, 0
/* 802B6E24 002B3D64 3B C0 00 00 */ li r30, 0
@@ -376,7 +376,7 @@ lbl_802B7058:
/* 802B707C 002B3FBC 3B E0 00 06 */ li r31, 6
/* 802B7080 002B3FC0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B7084 002B3FC4 38 80 00 01 */ li r4, 1
/* 802B7088 002B3FC8 4B FF 8F 05 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B7088 002B3FC8 4B FF 8F 05 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B708C 002B3FCC 48 00 00 68 */ b lbl_802B70F4
lbl_802B7090:
/* 802B7090 002B3FD0 2C 13 00 02 */ cmpwi r19, 2
@@ -433,7 +433,7 @@ lbl_802B70F4:
/* 802B7154 002B4094 3B E0 00 06 */ li r31, 6
/* 802B7158 002B4098 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B715C 002B409C 38 80 00 01 */ li r4, 1
/* 802B7160 002B40A0 4B FF 8E 2D */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B7160 002B40A0 4B FF 8E 2D */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B7164 002B40A4 48 00 00 84 */ b lbl_802B71E8
lbl_802B7168:
/* 802B7168 002B40A8 38 61 01 E8 */ addi r3, r1, 0x1e8
@@ -504,7 +504,7 @@ lbl_802B71EC:
/* 802B725C 002B419C 3B E0 00 06 */ li r31, 6
/* 802B7260 002B41A0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B7264 002B41A4 38 80 00 00 */ li r4, 0
/* 802B7268 002B41A8 4B FF 8D 25 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B7268 002B41A8 4B FF 8D 25 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B726C 002B41AC 48 00 24 4C */ b lbl_802B96B8
/* 802B7270 002B41B0 3B A0 00 00 */ li r29, 0
/* 802B7274 002B41B4 3B C0 00 00 */ li r30, 0
@@ -683,7 +683,7 @@ lbl_802B74C8:
/* 802B74E8 002B4428 3B 00 00 01 */ li r24, 1
/* 802B74EC 002B442C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B74F0 002B4430 38 80 00 01 */ li r4, 1
/* 802B74F4 002B4434 4B FF 8A 99 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B74F4 002B4434 4B FF 8A 99 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B74F8 002B4438 3B C0 00 32 */ li r30, 0x32
/* 802B74FC 002B443C 48 00 21 BC */ b lbl_802B96B8
/* 802B7500 002B4440 3B A0 00 31 */ li r29, 0x31
@@ -787,12 +787,12 @@ lbl_802B7640:
/* 802B7668 002B45A8 40 82 00 14 */ bne lbl_802B767C
/* 802B766C 002B45AC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B7670 002B45B0 38 80 00 01 */ li r4, 1
/* 802B7674 002B45B4 4B FF 89 19 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B7674 002B45B4 4B FF 89 19 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B7678 002B45B8 48 00 20 40 */ b lbl_802B96B8
lbl_802B767C:
/* 802B767C 002B45BC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B7680 002B45C0 38 80 00 00 */ li r4, 0
/* 802B7684 002B45C4 4B FF 89 09 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B7684 002B45C4 4B FF 89 09 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B7688 002B45C8 48 00 20 30 */ b lbl_802B96B8
/* 802B768C 002B45CC 3B A0 00 34 */ li r29, 0x34
/* 802B7690 002B45D0 2C 13 00 08 */ cmpwi r19, 8
@@ -1177,7 +1177,7 @@ lbl_802B7C10:
/* 802B7C18 002B4B58 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B7C1C 002B4B5C 38 80 00 21 */ li r4, 0x21
/* 802B7C20 002B4B60 38 A0 00 00 */ li r5, 0
/* 802B7C24 002B4B64 4B FF 77 E5 */ bl Z2SeqMgr_NS_bgmStop
/* 802B7C24 002B4B64 4B FF 77 E5 */ bl bgmStop__8Z2SeqMgrFUll
lbl_802B7C28:
/* 802B7C28 002B4B68 3B E0 00 31 */ li r31, 0x31
/* 802B7C2C 002B4B6C 3B A0 00 34 */ li r29, 0x34
@@ -1505,7 +1505,7 @@ lbl_802B80AC:
/* 802B80C8 002B5008 3B E0 00 25 */ li r31, 0x25
/* 802B80CC 002B500C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B80D0 002B5010 7F 44 D3 78 */ mr r4, r26
/* 802B80D4 002B5014 4B FF 7E B9 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B80D4 002B5014 4B FF 7E B9 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B80D8 002B5018 48 00 15 E0 */ b lbl_802B96B8
/* 802B80DC 002B501C 2C 1A 00 06 */ cmpwi r26, 6
/* 802B80E0 002B5020 40 82 00 10 */ bne lbl_802B80F0
@@ -1601,7 +1601,7 @@ lbl_802B820C:
/* 802B8228 002B5168 3B E0 00 37 */ li r31, 0x37
/* 802B822C 002B516C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8230 002B5170 38 80 00 00 */ li r4, 0
/* 802B8234 002B5174 4B FF 7D 59 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B8234 002B5174 4B FF 7D 59 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B8238 002B5178 48 00 14 80 */ b lbl_802B96B8
lbl_802B823C:
/* 802B823C 002B517C 38 61 01 0C */ addi r3, r1, 0x10c
@@ -1634,7 +1634,7 @@ lbl_802B8284:
/* 802B82A0 002B51E0 3B E0 00 25 */ li r31, 0x25
/* 802B82A4 002B51E4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B82A8 002B51E8 38 80 00 05 */ li r4, 5
/* 802B82AC 002B51EC 4B FF 7C E1 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B82AC 002B51EC 4B FF 7C E1 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B82B0 002B51F0 48 00 14 08 */ b lbl_802B96B8
lbl_802B82B4:
/* 802B82B4 002B51F4 38 61 01 00 */ addi r3, r1, 0x100
@@ -1885,7 +1885,7 @@ lbl_802B8604:
lbl_802B8620:
/* 802B8620 002B5560 3A 80 00 01 */ li r20, 1
/* 802B8624 002B5564 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B8628 002B5568 4B FF E1 0D */ bl Z2StatusMgr_NS_checkDayTime
/* 802B8628 002B5568 4B FF E1 0D */ bl checkDayTime__11Z2StatusMgrFv
/* 802B862C 002B556C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B8630 002B5570 41 82 00 20 */ beq lbl_802B8650
/* 802B8634 002B5574 38 61 00 DC */ addi r3, r1, 0xdc
@@ -1990,7 +1990,7 @@ lbl_802B878C:
lbl_802B879C:
/* 802B879C 002B56DC 3A 80 00 01 */ li r20, 1
/* 802B87A0 002B56E0 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B87A4 002B56E4 4B FF DF 91 */ bl Z2StatusMgr_NS_checkDayTime
/* 802B87A4 002B56E4 4B FF DF 91 */ bl checkDayTime__11Z2StatusMgrFv
/* 802B87A8 002B56E8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B87AC 002B56EC 41 82 00 20 */ beq lbl_802B87CC
/* 802B87B0 002B56F0 38 61 00 D0 */ addi r3, r1, 0xd0
@@ -2127,7 +2127,7 @@ lbl_802B8938:
/* 802B8988 002B58C8 3B C0 00 02 */ li r30, 2
/* 802B898C 002B58CC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8990 002B58D0 7F 44 D3 78 */ mr r4, r26
/* 802B8994 002B58D4 4B FF 75 F9 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B8994 002B58D4 4B FF 75 F9 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B8998 002B58D8 48 00 0D 20 */ b lbl_802B96B8
/* 802B899C 002B58DC 38 61 00 C4 */ addi r3, r1, 0xc4
/* 802B89A0 002B58E0 3C 80 01 00 */ lis r4, 0x01000009@ha
@@ -2209,7 +2209,7 @@ lbl_802B8A94:
/* 802B8AC4 002B5A04 3B 20 00 3C */ li r25, 0x3c
/* 802B8AC8 002B5A08 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8ACC 002B5A0C 7F 44 D3 78 */ mr r4, r26
/* 802B8AD0 002B5A10 4B FF 74 BD */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B8AD0 002B5A10 4B FF 74 BD */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B8AD4 002B5A14 3B A0 00 05 */ li r29, 5
/* 802B8AD8 002B5A18 3B C0 00 06 */ li r30, 6
/* 802B8ADC 002B5A1C 48 00 0B DC */ b lbl_802B96B8
@@ -2444,7 +2444,7 @@ lbl_802B8E04:
/* 802B8E58 002B5D98 3B C0 00 12 */ li r30, 0x12
/* 802B8E5C 002B5D9C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8E60 002B5DA0 7F 44 D3 78 */ mr r4, r26
/* 802B8E64 002B5DA4 4B FF 71 29 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B8E64 002B5DA4 4B FF 71 29 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B8E68 002B5DA8 48 00 08 50 */ b lbl_802B96B8
/* 802B8E6C 002B5DAC 38 61 00 84 */ addi r3, r1, 0x84
/* 802B8E70 002B5DB0 3C 80 01 00 */ lis r4, 0x01000037@ha
@@ -2467,7 +2467,7 @@ lbl_802B8E04:
/* 802B8EB4 002B5DF4 48 00 6A CD */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8EB8 002B5DF8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8EBC 002B5DFC 7F 44 D3 78 */ mr r4, r26
/* 802B8EC0 002B5E00 4B FF 70 CD */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B8EC0 002B5E00 4B FF 70 CD */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B8EC4 002B5E04 48 00 07 F4 */ b lbl_802B96B8
/* 802B8EC8 002B5E08 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8ECC 002B5E0C 38 80 00 3C */ li r4, 0x3c
@@ -2705,7 +2705,7 @@ lbl_802B921C:
/* 802B923C 002B617C 3B E0 00 28 */ li r31, 0x28
/* 802B9240 002B6180 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B9244 002B6184 7F 44 D3 78 */ mr r4, r26
/* 802B9248 002B6188 4B FF 6D 45 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B9248 002B6188 4B FF 6D 45 */ bl changeBgmStatus__8Z2SeqMgrFl
lbl_802B924C:
/* 802B924C 002B618C 3B A0 00 1D */ li r29, 0x1d
/* 802B9250 002B6190 3B C0 00 1E */ li r30, 0x1e
@@ -2843,7 +2843,7 @@ lbl_802B9438:
/* 802B9438 002B6378 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B943C 002B637C 38 80 00 2D */ li r4, 0x2d
/* 802B9440 002B6380 38 A0 00 00 */ li r5, 0
/* 802B9444 002B6384 4B FF 5F C5 */ bl Z2SeqMgr_NS_bgmStop
/* 802B9444 002B6384 4B FF 5F C5 */ bl bgmStop__8Z2SeqMgrFUll
/* 802B9448 002B6388 3B 20 00 3D */ li r25, 0x3d
lbl_802B944C:
/* 802B944C 002B638C 3B A0 00 21 */ li r29, 0x21
@@ -3092,7 +3092,7 @@ lbl_802B97B4:
/* 802B97D0 002B6710 3B E0 00 37 */ li r31, 0x37
/* 802B97D4 002B6714 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B97D8 002B6718 38 80 00 01 */ li r4, 1
/* 802B97DC 002B671C 4B FF 67 B1 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802B97DC 002B671C 4B FF 67 B1 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802B97E0 002B6720 3B 00 00 00 */ li r24, 0
lbl_802B97E4:
/* 802B97E4 002B6724 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13)