mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-29 15:43:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Z2AudioLib misc decomp (#75)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s
-13
View File
@@ -1,13 +0,0 @@
/* 802B68B0 002B37F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802B68B4 002B37F4 7C 08 02 A6 */ mflr r0
/* 802B68B8 002B37F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802B68BC 002B37FC 98 83 00 1E */ stb r4, 0x1e(r3)
/* 802B68C0 002B3800 54 80 06 3F */ clrlwi. r0, r4, 0x18
/* 802B68C4 002B3804 40 82 00 0C */ bne lbl_802B68D0
/* 802B68C8 002B3808 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13)
/* 802B68CC 002B380C 4B FF 3B 65 */ bl resetFilterAll__10Z2SoundMgrFv
lbl_802B68D0:
/* 802B68D0 002B3810 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802B68D4 002B3814 7C 08 03 A6 */ mtlr r0
/* 802B68D8 002B3818 38 21 00 10 */ addi r1, r1, 0x10
/* 802B68DC 002B381C 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
+29 -29
View File
@@ -38,7 +38,7 @@
/* 802B6B8C 002B3ACC 48 00 2F 39 */ bl Z2SeMgr_NS_resetCrowdSize
/* 802B6B90 002B3AD0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B6B94 002B3AD4 38 80 00 00 */ li r4, 0
/* 802B6B98 002B3AD8 48 00 94 55 */ bl Z2SoundObjMgr_NS_setGhostEnemyState
/* 802B6B98 002B3AD8 48 00 94 55 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc
/* 802B6B9C 002B3ADC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6BA0 002B3AE0 4B FF 4C 6D */ bl resetModY__7Z2SeMgrFv
/* 802B6BA4 002B3AE4 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
@@ -1145,7 +1145,7 @@ lbl_802B7B58:
/* 802B7BA0 002B4AE0 38 A0 02 BC */ li r5, 0x2bc
/* 802B7BA4 002B4AE4 38 C0 04 4C */ li r6, 0x44c
/* 802B7BA8 002B4AE8 38 E0 05 DC */ li r7, 0x5dc
/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B7BAC 002B4AEC 48 00 7D D5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e
@@ -1262,7 +1262,7 @@ lbl_802B7D08:
/* 802B7D54 002B4C94 3C E0 00 01 */ lis r7, 0x00009C40@ha
/* 802B7D58 002B4C98 38 C7 9C 40 */ addi r6, r7, 0x00009C40@l
/* 802B7D5C 002B4C9C 38 E7 C3 50 */ addi r7, r7, -15536
/* 802B7D60 002B4CA0 48 00 7C 21 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B7D60 002B4CA0 48 00 7C 21 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B7D64 002B4CA4 48 00 19 54 */ b lbl_802B96B8
lbl_802B7D68:
/* 802B7D68 002B4CA8 38 60 00 0F */ li r3, 0xf
@@ -1775,7 +1775,7 @@ lbl_802B8468:
/* 802B849C 002B53DC 38 A0 03 E8 */ li r5, 0x3e8
/* 802B84A0 002B53E0 38 C0 07 D0 */ li r6, 0x7d0
/* 802B84A4 002B53E4 38 E0 23 28 */ li r7, 0x2328
/* 802B84A8 002B53E8 48 00 74 D9 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B84A8 002B53E8 48 00 74 D9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B84AC 002B53EC 3B E0 00 3D */ li r31, 0x3d
/* 802B84B0 002B53F0 3B 20 00 1C */ li r25, 0x1c
lbl_802B84B4:
@@ -1855,7 +1855,7 @@ lbl_802B8578:
/* 802B85B4 002B54F4 38 A0 02 BC */ li r5, 0x2bc
/* 802B85B8 002B54F8 38 C0 04 4C */ li r6, 0x44c
/* 802B85BC 002B54FC 38 E0 05 DC */ li r7, 0x5dc
/* 802B85C0 002B5500 48 00 73 C1 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B85C0 002B5500 48 00 73 C1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B85C4 002B5504 48 00 10 F4 */ b lbl_802B96B8
lbl_802B85C8:
/* 802B85C8 002B5508 88 1B 00 1E */ lbz r0, 0x1e(r27)
@@ -2022,7 +2022,7 @@ lbl_802B87E8:
/* 802B8810 002B5750 38 A0 02 BC */ li r5, 0x2bc
/* 802B8814 002B5754 38 C0 04 4C */ li r6, 0x44c
/* 802B8818 002B5758 38 E0 05 DC */ li r7, 0x5dc
/* 802B881C 002B575C 48 00 71 65 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B881C 002B575C 48 00 71 65 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8820 002B5760 48 00 0E 98 */ b lbl_802B96B8
/* 802B8824 002B5764 3B A0 00 4A */ li r29, 0x4a
/* 802B8828 002B5768 2C 13 00 0B */ cmpwi r19, 0xb
@@ -2057,7 +2057,7 @@ lbl_802B887C:
/* 802B888C 002B57CC 38 A0 02 BC */ li r5, 0x2bc
/* 802B8890 002B57D0 38 C0 04 4C */ li r6, 0x44c
/* 802B8894 002B57D4 38 E0 05 DC */ li r7, 0x5dc
/* 802B8898 002B57D8 48 00 70 E9 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8898 002B57D8 48 00 70 E9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B889C 002B57DC 48 00 0E 1C */ b lbl_802B96B8
/* 802B88A0 002B57E0 3B A0 00 4A */ li r29, 0x4a
/* 802B88A4 002B57E4 48 00 10 F9 */ bl dComIfGs_getStartPoint
@@ -2112,7 +2112,7 @@ lbl_802B8938:
/* 802B894C 002B588C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8950 002B5890 38 C0 04 4C */ li r6, 0x44c
/* 802B8954 002B5894 38 E0 05 DC */ li r7, 0x5dc
/* 802B8958 002B5898 48 00 70 29 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8958 002B5898 48 00 70 29 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B895C 002B589C 48 00 0D 5C */ b lbl_802B96B8
/* 802B8960 002B58A0 38 61 00 C8 */ addi r3, r1, 0xc8
/* 802B8964 002B58A4 3C 80 01 00 */ lis r4, 0x01000009@ha
@@ -2147,7 +2147,7 @@ lbl_802B8938:
/* 802B89D8 002B5918 38 A0 02 BC */ li r5, 0x2bc
/* 802B89DC 002B591C 38 C0 04 4C */ li r6, 0x44c
/* 802B89E0 002B5920 38 E0 05 DC */ li r7, 0x5dc
/* 802B89E4 002B5924 48 00 6F 9D */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B89E4 002B5924 48 00 6F 9D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B89E8 002B5928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B89EC 002B592C 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13)
/* 802B89F0 002B5930 48 00 0F BD */ bl Z2SeqMgr_NS_unMuteSceneBgm
@@ -2192,7 +2192,7 @@ lbl_802B8A6C:
/* 802B8A84 002B59C4 38 A0 02 BC */ li r5, 0x2bc
/* 802B8A88 002B59C8 38 C0 04 4C */ li r6, 0x44c
/* 802B8A8C 002B59CC 38 E0 05 DC */ li r7, 0x5dc
/* 802B8A90 002B59D0 48 00 6E F1 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8A90 002B59D0 48 00 6E F1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
lbl_802B8A94:
/* 802B8A94 002B59D4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B8A98 002B59D8 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13)
@@ -2231,7 +2231,7 @@ lbl_802B8A94:
/* 802B8B1C 002B5A5C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8B20 002B5A60 38 C0 04 4C */ li r6, 0x44c
/* 802B8B24 002B5A64 38 E0 05 DC */ li r7, 0x5dc
/* 802B8B28 002B5A68 48 00 6E 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8B28 002B5A68 48 00 6E 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8B2C 002B5A6C 48 00 0B 8C */ b lbl_802B96B8
/* 802B8B30 002B5A70 3B A0 00 05 */ li r29, 5
/* 802B8B34 002B5A74 38 60 00 03 */ li r3, 3
@@ -2273,7 +2273,7 @@ lbl_802B8BA4:
/* 802B8BBC 002B5AFC 38 A0 02 BC */ li r5, 0x2bc
/* 802B8BC0 002B5B00 38 C0 04 4C */ li r6, 0x44c
/* 802B8BC4 002B5B04 38 E0 05 DC */ li r7, 0x5dc
/* 802B8BC8 002B5B08 48 00 6D B9 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8BC8 002B5B08 48 00 6D B9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8BCC 002B5B0C 48 00 0A EC */ b lbl_802B96B8
/* 802B8BD0 002B5B10 38 61 00 A8 */ addi r3, r1, 0xa8
/* 802B8BD4 002B5B14 3C 80 01 00 */ lis r4, 0x01000020@ha
@@ -2305,7 +2305,7 @@ lbl_802B8BA4:
/* 802B8C3C 002B5B7C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8C40 002B5B80 38 C0 04 4C */ li r6, 0x44c
/* 802B8C44 002B5B84 38 E0 05 DC */ li r7, 0x5dc
/* 802B8C48 002B5B88 48 00 6D 39 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8C48 002B5B88 48 00 6D 39 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8C4C 002B5B8C 48 00 0A 6C */ b lbl_802B96B8
/* 802B8C50 002B5B90 3B A0 00 09 */ li r29, 9
/* 802B8C54 002B5B94 38 60 00 04 */ li r3, 4
@@ -2347,7 +2347,7 @@ lbl_802B8CC4:
/* 802B8CDC 002B5C1C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8CE0 002B5C20 38 C0 04 4C */ li r6, 0x44c
/* 802B8CE4 002B5C24 38 E0 05 DC */ li r7, 0x5dc
/* 802B8CE8 002B5C28 48 00 6C 99 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8CE8 002B5C28 48 00 6C 99 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8CEC 002B5C2C 48 00 09 CC */ b lbl_802B96B8
/* 802B8CF0 002B5C30 38 61 00 98 */ addi r3, r1, 0x98
/* 802B8CF4 002B5C34 3C 80 01 00 */ lis r4, 0x0100002D@ha
@@ -2367,7 +2367,7 @@ lbl_802B8CC4:
/* 802B8D2C 002B5C6C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8D30 002B5C70 38 C0 04 4C */ li r6, 0x44c
/* 802B8D34 002B5C74 38 E0 05 DC */ li r7, 0x5dc
/* 802B8D38 002B5C78 48 00 6C 49 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8D38 002B5C78 48 00 6C 49 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8D3C 002B5C7C 48 00 09 7C */ b lbl_802B96B8
/* 802B8D40 002B5C80 38 61 00 94 */ addi r3, r1, 0x94
/* 802B8D44 002B5C84 3C 80 01 00 */ lis r4, 0x0100002D@ha
@@ -2387,7 +2387,7 @@ lbl_802B8CC4:
/* 802B8D7C 002B5CBC 38 A0 02 BC */ li r5, 0x2bc
/* 802B8D80 002B5CC0 38 C0 04 4C */ li r6, 0x44c
/* 802B8D84 002B5CC4 38 E0 05 DC */ li r7, 0x5dc
/* 802B8D88 002B5CC8 48 00 6B F9 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8D88 002B5CC8 48 00 6B F9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8D8C 002B5CCC 48 00 09 2C */ b lbl_802B96B8
/* 802B8D90 002B5CD0 3B A0 00 0D */ li r29, 0xd
/* 802B8D94 002B5CD4 38 60 00 0A */ li r3, 0xa
@@ -2429,7 +2429,7 @@ lbl_802B8E04:
/* 802B8E1C 002B5D5C 38 A0 02 BC */ li r5, 0x2bc
/* 802B8E20 002B5D60 38 C0 04 4C */ li r6, 0x44c
/* 802B8E24 002B5D64 38 E0 05 DC */ li r7, 0x5dc
/* 802B8E28 002B5D68 48 00 6B 59 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8E28 002B5D68 48 00 6B 59 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8E2C 002B5D6C 48 00 08 8C */ b lbl_802B96B8
/* 802B8E30 002B5D70 38 61 00 88 */ addi r3, r1, 0x88
/* 802B8E34 002B5D74 3C 80 01 00 */ lis r4, 0x01000037@ha
@@ -2464,7 +2464,7 @@ lbl_802B8E04:
/* 802B8EA8 002B5DE8 38 A0 02 BC */ li r5, 0x2bc
/* 802B8EAC 002B5DEC 38 C0 04 4C */ li r6, 0x44c
/* 802B8EB0 002B5DF0 38 E0 05 DC */ li r7, 0x5dc
/* 802B8EB4 002B5DF4 48 00 6A CD */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8EB4 002B5DF4 48 00 6A CD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 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 changeBgmStatus__8Z2SeqMgrFl
@@ -2512,7 +2512,7 @@ lbl_802B8F48:
/* 802B8F60 002B5EA0 38 A0 02 BC */ li r5, 0x2bc
/* 802B8F64 002B5EA4 38 C0 04 4C */ li r6, 0x44c
/* 802B8F68 002B5EA8 38 E0 05 DC */ li r7, 0x5dc
/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8F6C 002B5EAC 48 00 6A 15 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8F70 002B5EB0 48 00 07 48 */ b lbl_802B96B8
/* 802B8F74 002B5EB4 38 61 00 78 */ addi r3, r1, 0x78
/* 802B8F78 002B5EB8 3C 80 01 00 */ lis r4, 0x0100003C@ha
@@ -2544,7 +2544,7 @@ lbl_802B8F48:
/* 802B8FE0 002B5F20 38 A0 02 BC */ li r5, 0x2bc
/* 802B8FE4 002B5F24 38 C0 04 4C */ li r6, 0x44c
/* 802B8FE8 002B5F28 38 E0 05 DC */ li r7, 0x5dc
/* 802B8FEC 002B5F2C 48 00 69 95 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B8FEC 002B5F2C 48 00 69 95 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B8FF0 002B5F30 48 00 06 C8 */ b lbl_802B96B8
/* 802B8FF4 002B5F34 3B A0 00 15 */ li r29, 0x15
/* 802B8FF8 002B5F38 38 60 00 07 */ li r3, 7
@@ -2586,7 +2586,7 @@ lbl_802B9068:
/* 802B9080 002B5FC0 38 A0 02 BC */ li r5, 0x2bc
/* 802B9084 002B5FC4 38 C0 04 4C */ li r6, 0x44c
/* 802B9088 002B5FC8 38 E0 05 DC */ li r7, 0x5dc
/* 802B908C 002B5FCC 48 00 68 F5 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B908C 002B5FCC 48 00 68 F5 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B9090 002B5FD0 48 00 06 28 */ b lbl_802B96B8
/* 802B9094 002B5FD4 2C 1A 00 10 */ cmpwi r26, 0x10
/* 802B9098 002B5FD8 40 82 00 28 */ bne lbl_802B90C0
@@ -2630,7 +2630,7 @@ lbl_802B90E0:
/* 802B9128 002B6068 38 A0 02 BC */ li r5, 0x2bc
/* 802B912C 002B606C 38 C0 04 4C */ li r6, 0x44c
/* 802B9130 002B6070 38 E0 05 DC */ li r7, 0x5dc
/* 802B9134 002B6074 48 00 68 4D */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B9134 002B6074 48 00 68 4D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B9138 002B6078 48 00 05 80 */ b lbl_802B96B8
/* 802B913C 002B607C 3B A0 00 19 */ li r29, 0x19
/* 802B9140 002B6080 38 60 00 16 */ li r3, 0x16
@@ -2672,7 +2672,7 @@ lbl_802B91B0:
/* 802B91C8 002B6108 38 A0 02 BC */ li r5, 0x2bc
/* 802B91CC 002B610C 38 C0 04 4C */ li r6, 0x44c
/* 802B91D0 002B6110 38 E0 05 DC */ li r7, 0x5dc
/* 802B91D4 002B6114 48 00 67 AD */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B91D4 002B6114 48 00 67 AD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B91D8 002B6118 48 00 04 E0 */ b lbl_802B96B8
/* 802B91DC 002B611C 2C 13 00 08 */ cmpwi r19, 8
/* 802B91E0 002B6120 40 82 00 2C */ bne lbl_802B920C
@@ -2728,7 +2728,7 @@ lbl_802B924C:
/* 802B9294 002B61D4 38 A0 02 BC */ li r5, 0x2bc
/* 802B9298 002B61D8 38 C0 04 4C */ li r6, 0x44c
/* 802B929C 002B61DC 38 E0 05 DC */ li r7, 0x5dc
/* 802B92A0 002B61E0 48 00 66 E1 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B92A0 002B61E0 48 00 66 E1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B92A4 002B61E4 48 00 04 14 */ b lbl_802B96B8
/* 802B92A8 002B61E8 2C 13 00 08 */ cmpwi r19, 8
/* 802B92AC 002B61EC 40 82 00 0C */ bne lbl_802B92B8
@@ -2808,7 +2808,7 @@ lbl_802B93A8:
/* 802B93B8 002B62F8 38 A0 02 BC */ li r5, 0x2bc
/* 802B93BC 002B62FC 38 C0 04 4C */ li r6, 0x44c
/* 802B93C0 002B6300 38 E0 05 DC */ li r7, 0x5dc
/* 802B93C4 002B6304 48 00 65 BD */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B93C4 002B6304 48 00 65 BD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B93C8 002B6308 48 00 02 F0 */ b lbl_802B96B8
/* 802B93CC 002B630C 2C 1A 00 01 */ cmpwi r26, 1
/* 802B93D0 002B6310 41 80 00 30 */ blt lbl_802B9400
@@ -2855,7 +2855,7 @@ lbl_802B944C:
/* 802B9464 002B63A4 38 A0 02 BC */ li r5, 0x2bc
/* 802B9468 002B63A8 38 C0 04 4C */ li r6, 0x44c
/* 802B946C 002B63AC 38 E0 05 DC */ li r7, 0x5dc
/* 802B9470 002B63B0 48 00 65 11 */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B9470 002B63B0 48 00 65 11 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B9474 002B63B4 48 00 02 44 */ b lbl_802B96B8
/* 802B9478 002B63B8 2C 1A 00 32 */ cmpwi r26, 0x32
/* 802B947C 002B63BC 40 82 00 58 */ bne lbl_802B94D4
@@ -2893,7 +2893,7 @@ lbl_802B94D4:
/* 802B94E8 002B6428 38 A0 02 BC */ li r5, 0x2bc
/* 802B94EC 002B642C 38 C0 04 4C */ li r6, 0x44c
/* 802B94F0 002B6430 38 E0 05 DC */ li r7, 0x5dc
/* 802B94F4 002B6434 48 00 64 8D */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B94F4 002B6434 48 00 64 8D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B94F8 002B6438 48 00 01 C0 */ b lbl_802B96B8
/* 802B94FC 002B643C 3B E0 00 4B */ li r31, 0x4b
/* 802B9500 002B6440 3B C0 00 63 */ li r30, 0x63
@@ -2905,7 +2905,7 @@ lbl_802B94D4:
/* 802B9518 002B6458 38 A0 02 BC */ li r5, 0x2bc
/* 802B951C 002B645C 38 C0 04 4C */ li r6, 0x44c
/* 802B9520 002B6460 38 E0 05 DC */ li r7, 0x5dc
/* 802B9524 002B6464 48 00 64 5D */ bl Z2SoundObjMgr_NS_setForceBattleArea
/* 802B9524 002B6464 48 00 64 5D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
/* 802B9528 002B6468 48 00 01 90 */ b lbl_802B96B8
/* 802B952C 002B646C 2C 13 00 08 */ cmpwi r19, 8
/* 802B9530 002B6470 40 82 00 10 */ bne lbl_802B9540
@@ -3122,7 +3122,7 @@ lbl_802B9814:
lbl_802B9840:
/* 802B9840 002B6780 80 70 00 00 */ lwz r3, 0(r16)
/* 802B9844 002B6784 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13)
/* 802B9848 002B6788 4B FE 8C 95 */ bl JAISound_NS_stop
/* 802B9848 002B6788 4B FE 8C 95 */ bl stop__8JAISoundFUl
lbl_802B984C:
/* 802B984C 002B678C 82 10 00 0C */ lwz r16, 0xc(r16)
lbl_802B9850:
include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 802B9D54 002B6C94 38 00 00 00 */ li r0, 0
/* 802B9D58 002B6C98 90 03 00 08 */ stw r0, 8(r3)
/* 802B9D5C 002B6C9C 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802B9D60 002B6CA0 48 00 63 DD */ bl Z2SoundObjMgr_NS_deleteEnemyAll
/* 802B9D60 002B6CA0 48 00 63 DD */ bl deleteEnemyAll__13Z2SoundObjMgrFv
/* 802B9D64 002B6CA4 7F E3 FB 78 */ mr r3, r31
/* 802B9D68 002B6CA8 38 80 00 00 */ li r4, 0
/* 802B9D6C 002B6CAC 4B FF CB 75 */ bl setSceneExist__10Z2SceneMgrFb