Z2AudioLib misc decomp (#75)

* Z2SoundHandles: decomp portions

* start decomping: Z2SpeechMgr2, Z2SoundHandles

* Z2SoundHandles::stopAllSounds(): ok

* Z2SoundHandles::getHandleUserData(): ok

* Z2SoundInfo: header

* Z2SoundObjBase::framework(): ok

* Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok

* Z2SoundObjBase::~Z2SoundObjBase(): ok

* Z2SoundObjBase::stopOK(): ok

* Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose()

* clang-format

* Z2SoundObjBase::dispose(): ok

* JAISound::operator->(): null assert

* JAIAudience: stub

* Z2SoundObject::{init, deleteObject, isAlive}: ok

* Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this)

* start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init()

* Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok

* Z2MultiSeMgr::resetMultiSePos(): ok

* Z2WolfHowlMgr.h: decls

* Z2SoundStarter: move to decls and fix postprocess.py symbol pass

* Z2AudioArcLoader: decls

* Z2SoundObjMgr: ok some fns
- deleteEnemyAll()
- isTwilightBattle()
- setGhostEnemyState()

additionally elaborates parts of the Z2Creature hierarchy

* delete unused .s files and add tool to find them (only runs on linux)

* run clang-format

* postprocess.py: comment out debugging

* add python step to ok-check workflow

* address review comments

* address review comments

Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>

Co-authored-by: Pheenoh <pheenoh@gmail.com>
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
This commit is contained in:
Erin Moon
2021-01-21 22:16:51 -06:00
committed by GitHub
parent afb426c60c
commit a072e71c33
595 changed files with 1228 additions and 9009 deletions
+2 -3
View File
@@ -2,7 +2,7 @@
#define Z2SEQMGR_H_
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
#include "JSystem/JAudio2/JAISound/JAISound.h"
#include "Z2AudioLib/Z2Param/Z2Param.h"
#include "global.h"
@@ -67,13 +67,12 @@ void JAISeqMgr_NS_stop_X1_(void);
void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32);
void bgmStop__8Z2SeqMgrFUll(u32, s32);
void bgmStreamCheckReady__8Z2SeqMgrFv(void);
void JAISoundHandle_NS_releaseSound(void);
void releaseSound__14JAISoundHandleFv(void);
void Z2SeqMgr_NS_subBgmStop(void);
void subBgmStop__8Z2SeqMgrFv(void);
void subBgmStopInner__8Z2SeqMgrFv(void);
void JAISoundStatus__NS_lockWhenPrepared();
void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
void JAISound_NS_stop_X1_(void);
void JAISoundStatus__NS_unlockIfLocked(void);
void bgmStreamPlay__8Z2SeqMgrFv(void);
void bgmStreamStop__8Z2SeqMgrFUl(u32);
@@ -141,7 +141,7 @@ lbl_802AF210:
/* 802AF214 002AC154 28 03 00 00 */ cmplwi r3, 0
/* 802AF218 002AC158 41 82 00 0C */ beq lbl_802AF224
/* 802AF21C 002AC15C 38 80 00 00 */ li r4, 0
/* 802AF220 002AC160 4B FF 32 BD */ bl JAISound_NS_stop
/* 802AF220 002AC160 4B FF 32 BD */ bl stop__8JAISoundFUl
lbl_802AF224:
/* 802AF224 002AC164 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2)
/* 802AF228 002AC168 D0 1C 00 64 */ stfs f0, 0x64(r28)
@@ -159,7 +159,7 @@ lbl_802AF240:
/* 802AF254 002AC194 28 03 00 00 */ cmplwi r3, 0
/* 802AF258 002AC198 41 82 00 0C */ beq lbl_802AF264
/* 802AF25C 002AC19C 38 80 00 00 */ li r4, 0
/* 802AF260 002AC1A0 4B FF 32 7D */ bl JAISound_NS_stop
/* 802AF260 002AC1A0 4B FF 32 7D */ bl stop__8JAISoundFUl
lbl_802AF264:
/* 802AF264 002AC1A4 2C 1F 00 00 */ cmpwi r31, 0
/* 802AF268 002AC1A8 40 82 00 48 */ bne lbl_802AF2B0
@@ -167,7 +167,7 @@ lbl_802AF264:
/* 802AF270 002AC1B0 28 03 00 00 */ cmplwi r3, 0
/* 802AF274 002AC1B4 41 82 00 0C */ beq lbl_802AF280
/* 802AF278 002AC1B8 38 80 00 00 */ li r4, 0
/* 802AF27C 002AC1BC 4B FF 32 61 */ bl JAISound_NS_stop
/* 802AF27C 002AC1BC 4B FF 32 61 */ bl stop__8JAISoundFUl
lbl_802AF280:
/* 802AF280 002AC1C0 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2)
/* 802AF284 002AC1C4 D0 1C 00 14 */ stfs f0, 0x14(r28)
@@ -9,13 +9,13 @@
/* 802AF428 002AC368 80 63 00 00 */ lwz r3, 0(r3)
/* 802AF42C 002AC36C 28 03 00 00 */ cmplwi r3, 0
/* 802AF430 002AC370 41 82 00 08 */ beq lbl_802AF438
/* 802AF434 002AC374 4B FF 30 A9 */ bl JAISound_NS_stop
/* 802AF434 002AC374 4B FF 30 A9 */ bl stop__8JAISoundFUl
lbl_802AF438:
/* 802AF438 002AC378 80 7D 00 0C */ lwz r3, 0xc(r29)
/* 802AF43C 002AC37C 28 03 00 00 */ cmplwi r3, 0
/* 802AF440 002AC380 41 82 00 0C */ beq lbl_802AF44C
/* 802AF444 002AC384 7F C4 F3 78 */ mr r4, r30
/* 802AF448 002AC388 4B FF 30 95 */ bl JAISound_NS_stop
/* 802AF448 002AC388 4B FF 30 95 */ bl stop__8JAISoundFUl
lbl_802AF44C:
/* 802AF44C 002AC38C 2C 1F 00 00 */ cmpwi r31, 0
/* 802AF450 002AC390 40 82 00 34 */ bne lbl_802AF484
@@ -23,7 +23,7 @@ lbl_802AF44C:
/* 802AF458 002AC398 28 03 00 00 */ cmplwi r3, 0
/* 802AF45C 002AC39C 41 82 00 0C */ beq lbl_802AF468
/* 802AF460 002AC3A0 7F C4 F3 78 */ mr r4, r30
/* 802AF464 002AC3A4 4B FF 30 79 */ bl JAISound_NS_stop
/* 802AF464 002AC3A4 4B FF 30 79 */ bl stop__8JAISoundFUl
lbl_802AF468:
/* 802AF468 002AC3A8 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2)
/* 802AF46C 002AC3AC D0 1D 00 14 */ stfs f0, 0x14(r29)
@@ -57,7 +57,7 @@ lbl_802AF51C:
/* 802AF570 002AC4B0 28 03 00 00 */ cmplwi r3, 0
/* 802AF574 002AC4B4 41 82 00 0C */ beq lbl_802AF580
/* 802AF578 002AC4B8 38 80 00 00 */ li r4, 0
/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl JAISound_NS_stop
/* 802AF57C 002AC4BC 4B FF 2F 61 */ bl stop__8JAISoundFUl
lbl_802AF580:
/* 802AF580 002AC4C0 7F A3 EB 78 */ mr r3, r29
/* 802AF584 002AC4C4 38 80 00 01 */ li r4, 1
@@ -79,13 +79,13 @@ lbl_802AF580:
/* 802AF5C4 002AC504 28 03 00 00 */ cmplwi r3, 0
/* 802AF5C8 002AC508 41 82 00 0C */ beq lbl_802AF5D4
/* 802AF5CC 002AC50C 38 80 00 00 */ li r4, 0
/* 802AF5D0 002AC510 4B FF 2F 0D */ bl JAISound_NS_stop
/* 802AF5D0 002AC510 4B FF 2F 0D */ bl stop__8JAISoundFUl
lbl_802AF5D4:
/* 802AF5D4 002AC514 80 7D 00 0C */ lwz r3, 0xc(r29)
/* 802AF5D8 002AC518 28 03 00 00 */ cmplwi r3, 0
/* 802AF5DC 002AC51C 41 82 00 0C */ beq lbl_802AF5E8
/* 802AF5E0 002AC520 38 80 00 00 */ li r4, 0
/* 802AF5E4 002AC524 4B FF 2E F9 */ bl JAISound_NS_stop
/* 802AF5E4 002AC524 4B FF 2E F9 */ bl stop__8JAISoundFUl
lbl_802AF5E8:
/* 802AF5E8 002AC528 C0 02 BF 98 */ lfs f0, lbl_80455998-_SDA2_BASE_(r2)
/* 802AF5EC 002AC52C D0 1D 00 64 */ stfs f0, 0x64(r29)
@@ -125,9 +125,9 @@ lbl_802AF64C:
/* 802AF664 002AC5A4 40 82 00 18 */ bne lbl_802AF67C
lbl_802AF668:
/* 802AF668 002AC5A8 38 80 00 00 */ li r4, 0
/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl JAISound_NS_stop
/* 802AF66C 002AC5AC 4B FF 2E 71 */ bl stop__8JAISoundFUl
/* 802AF670 002AC5B0 38 7D 00 04 */ addi r3, r29, 4
/* 802AF674 002AC5B4 4B FF 2B 11 */ bl JAISoundHandle_NS_releaseSound
/* 802AF674 002AC5B4 4B FF 2B 11 */ bl releaseSound__14JAISoundHandleFv
/* 802AF678 002AC5B8 48 00 00 28 */ b lbl_802AF6A0
lbl_802AF67C:
/* 802AF67C 002AC5BC 38 00 FF FF */ li r0, -1
@@ -45,7 +45,7 @@ lbl_802AF8B4:
/* 802AF92C 002AC86C 48 00 48 39 */ bl Z2SeqMgr_NS_setBattleBgmOff
/* 802AF930 002AC870 80 7F 00 04 */ lwz r3, 4(r31)
/* 802AF934 002AC874 38 80 00 17 */ li r4, 0x17
/* 802AF938 002AC878 4B FF 2B A5 */ bl JAISound_NS_stop
/* 802AF938 002AC878 4B FF 2B A5 */ bl stop__8JAISoundFUl
/* 802AF93C 002AC87C 38 00 00 37 */ li r0, 0x37
/* 802AF940 002AC880 B0 1F 00 B8 */ sth r0, 0xb8(r31)
/* 802AF944 002AC884 48 00 00 78 */ b lbl_802AF9BC
@@ -53,25 +53,25 @@ lbl_802AF8B4:
/* 802AF94C 002AC88C B0 1F 00 B8 */ sth r0, 0xb8(r31)
/* 802AF950 002AC890 80 7F 00 04 */ lwz r3, 4(r31)
/* 802AF954 002AC894 38 80 00 2D */ li r4, 0x2d
/* 802AF958 002AC898 4B FF 2B 85 */ bl JAISound_NS_stop
/* 802AF958 002AC898 4B FF 2B 85 */ bl stop__8JAISoundFUl
/* 802AF95C 002AC89C 48 00 00 60 */ b lbl_802AF9BC
/* 802AF960 002AC8A0 38 00 01 FE */ li r0, 0x1fe
/* 802AF964 002AC8A4 B0 1F 00 B8 */ sth r0, 0xb8(r31)
/* 802AF968 002AC8A8 80 7F 00 04 */ lwz r3, 4(r31)
/* 802AF96C 002AC8AC 38 80 00 2D */ li r4, 0x2d
/* 802AF970 002AC8B0 4B FF 2B 6D */ bl JAISound_NS_stop
/* 802AF970 002AC8B0 4B FF 2B 6D */ bl stop__8JAISoundFUl
/* 802AF974 002AC8B4 48 00 00 48 */ b lbl_802AF9BC
/* 802AF978 002AC8B8 38 00 01 68 */ li r0, 0x168
/* 802AF97C 002AC8BC B0 1F 00 B8 */ sth r0, 0xb8(r31)
/* 802AF980 002AC8C0 80 7F 00 04 */ lwz r3, 4(r31)
/* 802AF984 002AC8C4 38 80 00 2D */ li r4, 0x2d
/* 802AF988 002AC8C8 4B FF 2B 55 */ bl JAISound_NS_stop
/* 802AF988 002AC8C8 4B FF 2B 55 */ bl stop__8JAISoundFUl
/* 802AF98C 002AC8CC 48 00 00 30 */ b lbl_802AF9BC
/* 802AF990 002AC8D0 38 00 01 A4 */ li r0, 0x1a4
/* 802AF994 002AC8D4 B0 1F 00 B8 */ sth r0, 0xb8(r31)
/* 802AF998 002AC8D8 80 7F 00 04 */ lwz r3, 4(r31)
/* 802AF99C 002AC8DC 38 80 00 2D */ li r4, 0x2d
/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl JAISound_NS_stop
/* 802AF9A0 002AC8E0 4B FF 2B 3D */ bl stop__8JAISoundFUl
/* 802AF9A4 002AC8E4 48 00 00 18 */ b lbl_802AF9BC
/* 802AF9A8 002AC8E8 7F E3 FB 78 */ mr r3, r31
/* 802AF9AC 002AC8EC 38 80 00 00 */ li r4, 0
@@ -86,9 +86,9 @@ lbl_802AFAEC:
lbl_802AFAFC:
/* 802AFAFC 002ACA3C 80 7E 00 04 */ lwz r3, 4(r30)
/* 802AFB00 002ACA40 7F E4 FB 78 */ mr r4, r31
/* 802AFB04 002ACA44 4B FF 29 D9 */ bl JAISound_NS_stop
/* 802AFB04 002ACA44 4B FF 29 D9 */ bl stop__8JAISoundFUl
/* 802AFB08 002ACA48 38 7E 00 04 */ addi r3, r30, 4
/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl JAISoundHandle_NS_releaseSound
/* 802AFB0C 002ACA4C 4B FF 26 79 */ bl releaseSound__14JAISoundHandleFv
/* 802AFB10 002ACA50 88 0D 82 E2 */ lbz r0, lbl_80450862-_SDA_BASE_(r13)
/* 802AFB14 002ACA54 28 00 00 00 */ cmplwi r0, 0
/* 802AFB18 002ACA58 41 82 00 40 */ beq lbl_802AFB58
@@ -90,14 +90,14 @@ lbl_802AFCD8:
/* 802AFCDC 002ACC1C 28 03 00 00 */ cmplwi r3, 0
/* 802AFCE0 002ACC20 41 82 00 F4 */ beq lbl_802AFDD4
/* 802AFCE4 002ACC24 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13)
/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl JAISound_NS_stop
/* 802AFCE8 002ACC28 4B FF 27 F5 */ bl stop__8JAISoundFUl
/* 802AFCEC 002ACC2C 48 00 00 E8 */ b lbl_802AFDD4
lbl_802AFCF0:
/* 802AFCF0 002ACC30 80 7F 00 00 */ lwz r3, 0(r31)
/* 802AFCF4 002ACC34 28 03 00 00 */ cmplwi r3, 0
/* 802AFCF8 002ACC38 41 82 00 0C */ beq lbl_802AFD04
/* 802AFCFC 002ACC3C 38 80 00 00 */ li r4, 0
/* 802AFD00 002ACC40 4B FF 27 DD */ bl JAISound_NS_stop
/* 802AFD00 002ACC40 4B FF 27 DD */ bl stop__8JAISoundFUl
lbl_802AFD04:
/* 802AFD04 002ACC44 C0 02 BF 9C */ lfs f0, lbl_8045599C-_SDA2_BASE_(r2)
/* 802AFD08 002ACC48 D0 1F 00 64 */ stfs f0, 0x64(r31)
@@ -25,7 +25,7 @@ lbl_802AFE5C:
/* 802AFE6C 002ACDAC 28 03 00 00 */ cmplwi r3, 0
/* 802AFE70 002ACDB0 41 82 00 58 */ beq lbl_802AFEC8
/* 802AFE74 002ACDB4 38 80 00 1E */ li r4, 0x1e
/* 802AFE78 002ACDB8 4B FF 26 65 */ bl JAISound_NS_stop
/* 802AFE78 002ACDB8 4B FF 26 65 */ bl stop__8JAISoundFUl
/* 802AFE7C 002ACDBC 48 00 00 4C */ b lbl_802AFEC8
lbl_802AFE80:
/* 802AFE80 002ACDC0 28 03 00 00 */ cmplwi r3, 0
@@ -41,7 +41,7 @@ lbl_802AFE98:
/* 802AFEA0 002ACDE0 40 82 00 28 */ bne lbl_802AFEC8
/* 802AFEA4 002ACDE4 28 03 00 00 */ cmplwi r3, 0
/* 802AFEA8 002ACDE8 41 82 00 08 */ beq lbl_802AFEB0
/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl JAISound_NS_stop_X1_
/* 802AFEAC 002ACDEC 4B FF 26 ED */ bl stop__8JAISoundFv
lbl_802AFEB0:
/* 802AFEB0 002ACDF0 7F E3 FB 78 */ mr r3, r31
/* 802AFEB4 002ACDF4 3C 80 01 00 */ lis r4, 0x010000A9@ha
@@ -39,10 +39,10 @@ lbl_802AFF58:
/* 802AFF5C 002ACE9C 28 03 00 00 */ cmplwi r3, 0
/* 802AFF60 002ACEA0 41 82 00 0C */ beq lbl_802AFF6C
/* 802AFF64 002ACEA4 7F E4 FB 78 */ mr r4, r31
/* 802AFF68 002ACEA8 4B FF 25 75 */ bl JAISound_NS_stop
/* 802AFF68 002ACEA8 4B FF 25 75 */ bl stop__8JAISoundFUl
lbl_802AFF6C:
/* 802AFF6C 002ACEAC 38 7E 00 0C */ addi r3, r30, 0xc
/* 802AFF70 002ACEB0 4B FF 22 15 */ bl JAISoundHandle_NS_releaseSound
/* 802AFF70 002ACEB0 4B FF 22 15 */ bl releaseSound__14JAISoundHandleFv
/* 802AFF74 002ACEB4 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802AFF78 002ACEB8 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 802AFF7C 002ACEBC 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -286,7 +286,7 @@ lbl_802B03AC:
/* 802B03BC 002AD2FC 38 A0 05 DC */ li r5, 0x5dc
/* 802B03C0 002AD300 38 C0 13 88 */ li r6, 0x1388
/* 802B03C4 002AD304 38 E0 27 10 */ li r7, 0x2710
/* 802B03C8 002AD308 48 00 F5 B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B03C8 002AD308 48 00 F5 B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
lbl_802B03CC:
/* 802B03CC 002AD30C 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 802B03D0 002AD310 40 82 19 D0 */ bne lbl_802B1DA0
@@ -2023,7 +2023,7 @@ lbl_802B1DA0:
/* 802B1DA8 002AECE8 38 A0 00 09 */ li r5, 9
/* 802B1DAC 002AECEC 57 C6 04 3E */ clrlwi r6, r30, 0x10
/* 802B1DB0 002AECF0 38 E0 FF FF */ li r7, -1
/* 802B1DB4 002AECF4 4B FF 91 29 */ bl Z2SoundStarter_NS_setPortData
/* 802B1DB4 002AECF4 4B FF 91 29 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
/* 802B1DB8 002AECF8 9B DD 00 BC */ stb r30, 0xbc(r29)
lbl_802B1DBC:
/* 802B1DBC 002AECFC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0
@@ -436,7 +436,7 @@ lbl_802B2464:
/* 802B246C 002AF3AC 38 A0 00 09 */ li r5, 9
/* 802B2470 002AF3B0 38 C0 00 01 */ li r6, 1
/* 802B2474 002AF3B4 38 E0 FF FF */ li r7, -1
/* 802B2478 002AF3B8 4B FF 8A 65 */ bl Z2SoundStarter_NS_setPortData
/* 802B2478 002AF3B8 4B FF 8A 65 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
/* 802B247C 002AF3BC 48 00 05 08 */ b lbl_802B2984
lbl_802B2480:
/* 802B2480 002AF3C0 7F 83 E3 78 */ mr r3, r28
@@ -763,7 +763,7 @@ lbl_802B2960:
/* 802B2970 002AF8B0 38 A0 00 09 */ li r5, 9
/* 802B2974 002AF8B4 57 A6 04 3E */ clrlwi r6, r29, 0x10
/* 802B2978 002AF8B8 38 E0 FF FF */ li r7, -1
/* 802B297C 002AF8BC 4B FF 85 61 */ bl Z2SoundStarter_NS_setPortData
/* 802B297C 002AF8BC 4B FF 85 61 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
lbl_802B2980:
/* 802B2980 002AF8C0 9B BC 00 BD */ stb r29, 0xbd(r28)
lbl_802B2984:
@@ -33,7 +33,7 @@ lbl_802B32C4:
/* 802B32F8 002B0238 7C 09 03 A6 */ mtctr r0
/* 802B32FC 002B023C 4E 80 04 20 */ bctr
/* 802B3300 002B0240 38 80 00 1E */ li r4, 0x1e
/* 802B3304 002B0244 4B FE F1 D9 */ bl JAISound_NS_stop
/* 802B3304 002B0244 4B FE F1 D9 */ bl stop__8JAISoundFUl
lbl_802B3308:
/* 802B3308 002B0248 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802B330C 002B024C 7C 08 03 A6 */ mtlr r0
@@ -8,7 +8,7 @@
/* 802B4144 002B1084 38 A0 02 BC */ li r5, 0x2bc
/* 802B4148 002B1088 38 C0 04 4C */ li r6, 0x44c
/* 802B414C 002B108C 38 E0 05 DC */ li r7, 0x5dc
/* 802B4150 002B1090 48 00 B8 31 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B4150 002B1090 48 00 B8 31 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
lbl_802B4154:
/* 802B4154 002B1094 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802B4158 002B1098 7C 08 03 A6 */ mtlr r0
@@ -75,7 +75,7 @@ lbl_802B4544:
/* 802B45AC 002B14EC D0 5E 00 1C */ stfs f2, 0x1c(r30)
lbl_802B45B0:
/* 802B45B0 002B14F0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B45B4 002B14F4 48 00 BC 31 */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B45B4 002B14F4 48 00 BC 31 */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B45B8 002B14F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B45BC 002B14FC 41 82 00 2C */ beq lbl_802B45E8
/* 802B45C0 002B1500 80 7E 00 04 */ lwz r3, 4(r30)
@@ -92,7 +92,7 @@ lbl_802B45DC:
/* 802B45E4 002B1524 41 82 00 3C */ beq lbl_802B4620
lbl_802B45E8:
/* 802B45E8 002B1528 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B45EC 002B152C 48 00 BB F9 */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B45EC 002B152C 48 00 BB F9 */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B45F0 002B1530 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B45F4 002B1534 40 82 00 40 */ bne lbl_802B4634
/* 802B45F8 002B1538 80 7E 00 04 */ lwz r3, 4(r30)
@@ -110,12 +110,12 @@ lbl_802B4614:
lbl_802B4620:
/* 802B4620 002B1560 80 7E 00 04 */ lwz r3, 4(r30)
/* 802B4624 002B1564 38 80 00 1E */ li r4, 0x1e
/* 802B4628 002B1568 4B FE DE B5 */ bl JAISound_NS_stop
/* 802B4628 002B1568 4B FE DE B5 */ bl stop__8JAISoundFUl
/* 802B462C 002B156C 80 7E 00 04 */ lwz r3, 4(r30)
/* 802B4630 002B1570 4B FE DB 71 */ bl JAISound_NS_releaseHandle
lbl_802B4634:
/* 802B4634 002B1574 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B4638 002B1578 48 00 BB AD */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B4638 002B1578 48 00 BB AD */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B463C 002B157C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B4640 002B1580 40 82 00 2C */ bne lbl_802B466C
/* 802B4644 002B1584 80 7E 00 04 */ lwz r3, 4(r30)
@@ -48,7 +48,7 @@ lbl_802B48E8:
/* 802B48EC 002B182C 28 00 00 00 */ cmplwi r0, 0
/* 802B48F0 002B1830 40 82 00 14 */ bne lbl_802B4904
/* 802B48F4 002B1834 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B48F8 002B1838 48 00 B8 ED */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B48F8 002B1838 48 00 B8 ED */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B48FC 002B183C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B4900 002B1840 41 82 01 E4 */ beq lbl_802B4AE4
lbl_802B4904:
@@ -68,7 +68,7 @@ lbl_802B4920:
/* 802B4934 002B1874 38 A0 00 09 */ li r5, 9
/* 802B4938 002B1878 38 C0 00 01 */ li r6, 1
/* 802B493C 002B187C 38 E0 FF FF */ li r7, -1
/* 802B4940 002B1880 4B FF 65 9D */ bl Z2SoundStarter_NS_setPortData
/* 802B4940 002B1880 4B FF 65 9D */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
/* 802B4944 002B1884 7F C3 F3 78 */ mr r3, r30
/* 802B4948 002B1888 38 9E 00 04 */ addi r4, r30, 4
/* 802B494C 002B188C 88 AD 82 EC */ lbz r5, lbl_8045086C-_SDA_BASE_(r13)
@@ -164,7 +164,7 @@ lbl_802B4A6C:
/* 802B4AAC 002B19EC 38 A0 00 09 */ li r5, 9
/* 802B4AB0 002B19F0 38 C0 00 03 */ li r6, 3
/* 802B4AB4 002B19F4 38 E0 FF FF */ li r7, -1
/* 802B4AB8 002B19F8 4B FF 64 25 */ bl Z2SoundStarter_NS_setPortData
/* 802B4AB8 002B19F8 4B FF 64 25 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
/* 802B4ABC 002B19FC 48 00 00 24 */ b lbl_802B4AE0
lbl_802B4AC0:
/* 802B4AC0 002B1A00 28 00 00 02 */ cmplwi r0, 2
@@ -174,7 +174,7 @@ lbl_802B4AC0:
/* 802B4AD0 002B1A10 38 A0 00 09 */ li r5, 9
/* 802B4AD4 002B1A14 38 C0 00 02 */ li r6, 2
/* 802B4AD8 002B1A18 38 E0 FF FF */ li r7, -1
/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl Z2SoundStarter_NS_setPortData
/* 802B4ADC 002B1A1C 4B FF 64 01 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
lbl_802B4AE0:
/* 802B4AE0 002B1A20 9B FE 00 BF */ stb r31, 0xbf(r30)
lbl_802B4AE4:
@@ -36,7 +36,7 @@ lbl_802B4C30:
/* 802B4C48 002B1B88 28 00 00 00 */ cmplwi r0, 0
/* 802B4C4C 002B1B8C 40 82 00 14 */ bne lbl_802B4C60
/* 802B4C50 002B1B90 80 7F 00 04 */ lwz r3, 4(r31)
/* 802B4C54 002B1B94 4B FE D9 45 */ bl JAISound_NS_stop_X1_
/* 802B4C54 002B1B94 4B FE D9 45 */ bl stop__8JAISoundFv
/* 802B4C58 002B1B98 38 00 00 00 */ li r0, 0
/* 802B4C5C 002B1B9C 98 1F 00 BF */ stb r0, 0xbf(r31)
lbl_802B4C60:
@@ -81,7 +81,7 @@ lbl_802B4CE0:
/* 802B4CE4 002B1C24 28 00 00 00 */ cmplwi r0, 0
/* 802B4CE8 002B1C28 40 82 00 14 */ bne lbl_802B4CFC
/* 802B4CEC 002B1C2C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B4CF0 002B1C30 48 00 B4 F5 */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B4CF4 002B1C34 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B4CF8 002B1C38 41 82 01 A4 */ beq lbl_802B4E9C
lbl_802B4CFC:
@@ -28,7 +28,7 @@ lbl_802B4F08:
/* 802B4F18 002B1E58 28 00 00 00 */ cmplwi r0, 0
/* 802B4F1C 002B1E5C 40 82 00 14 */ bne lbl_802B4F30
/* 802B4F20 002B1E60 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B4F24 002B1E64 48 00 B2 C1 */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B4F24 002B1E64 48 00 B2 C1 */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B4F28 002B1E68 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B4F2C 002B1E6C 41 82 00 14 */ beq lbl_802B4F40
lbl_802B4F30:
@@ -63,7 +63,7 @@ lbl_802B4F5C:
/* 802B4F94 002B1ED4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802B4F98 002B1ED8 41 82 02 54 */ beq lbl_802B51EC
/* 802B4F9C 002B1EDC 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl Z2SoundObjMgr_NS_setBattleInit
/* 802B4FA0 002B1EE0 48 00 B1 61 */ bl setBattleInit__13Z2SoundObjMgrFv
/* 802B4FA4 002B1EE4 38 00 00 FF */ li r0, 0xff
/* 802B4FA8 002B1EE8 98 1C 00 BD */ stb r0, 0xbd(r28)
/* 802B4FAC 002B1EEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
@@ -147,7 +147,7 @@ lbl_802B50A8:
/* 802B50D4 002B2014 48 00 00 30 */ b lbl_802B5104
lbl_802B50D8:
/* 802B50D8 002B2018 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B50DC 002B201C 48 00 B1 09 */ bl Z2SoundObjMgr_NS_isTwilightBattle
/* 802B50DC 002B201C 48 00 B1 09 */ bl isTwilightBattle__13Z2SoundObjMgrFv
/* 802B50E0 002B2020 54 64 06 3E */ clrlwi r4, r3, 0x18
/* 802B50E4 002B2024 7F 83 E3 78 */ mr r3, r28
/* 802B50E8 002B2028 4B FF CD 0D */ bl changeSubBgmStatus__8Z2SeqMgrFl
@@ -41,7 +41,7 @@ lbl_802B59CC:
/* 802B59DC 002B291C 7F E4 FB 78 */ mr r4, r31
/* 802B59E0 002B2920 38 A0 00 0A */ li r5, 0xa
/* 802B59E4 002B2924 38 C0 FF FF */ li r6, -1
/* 802B59E8 002B2928 4B FF 55 8D */ bl Z2SoundStarter_NS_getPortData
/* 802B59E8 002B2928 4B FF 55 8D */ bl getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc
/* 802B59EC 002B292C 98 7F 00 C4 */ stb r3, 0xc4(r31)
/* 802B59F0 002B2930 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B59F4 002B2934 88 03 00 0C */ lbz r0, 0xc(r3)
@@ -214,9 +214,9 @@ lbl_802B5C28:
/* 802B5C48 002B2B88 41 80 00 1C */ blt lbl_802B5C64
/* 802B5C4C 002B2B8C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802B5C50 002B2B90 38 80 00 3C */ li r4, 0x3c
/* 802B5C54 002B2B94 4B FE C8 89 */ bl JAISound_NS_stop
/* 802B5C54 002B2B94 4B FE C8 89 */ bl stop__8JAISoundFUl
/* 802B5C58 002B2B98 7F E3 FB 78 */ mr r3, r31
/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl JAISoundHandle_NS_releaseSound
/* 802B5C5C 002B2B9C 4B FE C5 29 */ bl releaseSound__14JAISoundHandleFv
/* 802B5C60 002B2BA0 48 00 02 0C */ b lbl_802B5E6C
lbl_802B5C64:
/* 802B5C64 002B2BA4 2C 04 00 11 */ cmpwi r4, 0x11
@@ -260,9 +260,9 @@ lbl_802B5CC0:
/* 802B5CE8 002B2C28 28 00 00 14 */ cmplwi r0, 0x14
/* 802B5CEC 002B2C2C 40 80 01 80 */ bge lbl_802B5E6C
/* 802B5CF0 002B2C30 38 80 00 3C */ li r4, 0x3c
/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl JAISound_NS_stop
/* 802B5CF4 002B2C34 4B FE C7 E9 */ bl stop__8JAISoundFUl
/* 802B5CF8 002B2C38 7F E3 FB 78 */ mr r3, r31
/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl JAISoundHandle_NS_releaseSound
/* 802B5CFC 002B2C3C 4B FE C4 89 */ bl releaseSound__14JAISoundHandleFv
/* 802B5D00 002B2C40 48 00 01 6C */ b lbl_802B5E6C
lbl_802B5D04:
/* 802B5D04 002B2C44 28 03 00 00 */ cmplwi r3, 0