diff --git a/asm/JSystem/JAudio2/JAISeMgr/__ct__8JAISeMgrFb.s b/asm/JSystem/JAudio2/JAISeMgr/__ct__8JAISeMgrFb.s index 7948c7b93f..14433d8a78 100644 --- a/asm/JSystem/JAudio2/JAISeMgr/__ct__8JAISeMgrFb.s +++ b/asm/JSystem/JAudio2/JAISeMgr/__ct__8JAISeMgrFb.s @@ -6,7 +6,7 @@ lbl_802A0074: /* 802A0084 7C 7F 1B 78 */ mr r31, r3 /* 802A0088 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A008C 41 82 00 08 */ beq lbl_802A0094 -/* 802A0090 93 ED 85 EC */ stw r31, data_80450B6C(r13) +/* 802A0090 93 ED 85 EC */ stw r31, __OSReport_disable-0x2C(r13) lbl_802A0094: /* 802A0094 3C 60 80 3D */ lis r3, __vt__14JAISeqDataUser@ha /* 0x803C9940@ha */ /* 802A0098 38 03 99 40 */ addi r0, r3, __vt__14JAISeqDataUser@l /* 0x803C9940@l */ diff --git a/asm/JSystem/JAudio2/JAISeMgr/__dt__8JAISeMgrFv.s b/asm/JSystem/JAudio2/JAISeMgr/__dt__8JAISeMgrFv.s index a502ec2e9b..82586b65c4 100644 --- a/asm/JSystem/JAudio2/JAISeMgr/__dt__8JAISeMgrFv.s +++ b/asm/JSystem/JAudio2/JAISeMgr/__dt__8JAISeMgrFv.s @@ -21,11 +21,11 @@ lbl_802A08FC: /* 802A0948 48 00 0E 2D */ bl __dt__14JAISeqDataUserFv /* 802A094C 28 1E 00 00 */ cmplwi r30, 0 /* 802A0950 41 82 00 18 */ beq lbl_802A0968 -/* 802A0954 80 0D 85 EC */ lwz r0, data_80450B6C(r13) +/* 802A0954 80 0D 85 EC */ lwz r0, __OSReport_disable-0x2C(r13) /* 802A0958 7C 00 F0 40 */ cmplw r0, r30 /* 802A095C 40 82 00 0C */ bne lbl_802A0968 /* 802A0960 38 00 00 00 */ li r0, 0 -/* 802A0964 90 0D 85 EC */ stw r0, data_80450B6C(r13) +/* 802A0964 90 0D 85 EC */ stw r0, __OSReport_disable-0x2C(r13) lbl_802A0968: /* 802A0968 7F E0 07 35 */ extsh. r0, r31 /* 802A096C 40 81 00 0C */ ble lbl_802A0978 diff --git a/asm/JSystem/JAudio2/JAISeMgr/func_802A0768.s b/asm/JSystem/JAudio2/JAISeMgr/func_802A0768.s index 9963cad5ad..314cefebaa 100644 --- a/asm/JSystem/JAudio2/JAISeMgr/func_802A0768.s +++ b/asm/JSystem/JAudio2/JAISeMgr/func_802A0768.s @@ -14,7 +14,7 @@ lbl_802A0768: /* 802A0798 41 82 00 08 */ beq lbl_802A07A0 /* 802A079C 48 00 1D FD */ bl stop__8JAISoundFv lbl_802A07A0: -/* 802A07A0 83 6D 85 DC */ lwz r27, data_80450B5C(r13) +/* 802A07A0 83 6D 85 DC */ lwz r27, __OSReport_disable-0x3C(r13) /* 802A07A4 28 1B 00 00 */ cmplwi r27, 0 /* 802A07A8 41 82 00 50 */ beq lbl_802A07F8 /* 802A07AC 80 1D 00 00 */ lwz r0, 0(r29) diff --git a/asm/JSystem/JAudio2/JAISeqMgr/__ct__9JAISeqMgrFb.s b/asm/JSystem/JAudio2/JAISeqMgr/__ct__9JAISeqMgrFb.s index 8c146d7de3..96cd848a74 100644 --- a/asm/JSystem/JAudio2/JAISeqMgr/__ct__9JAISeqMgrFb.s +++ b/asm/JSystem/JAudio2/JAISeqMgr/__ct__9JAISeqMgrFb.s @@ -6,7 +6,7 @@ lbl_802A1914: /* 802A1924 7C 7F 1B 78 */ mr r31, r3 /* 802A1928 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A192C 41 82 00 08 */ beq lbl_802A1934 -/* 802A1930 93 ED 85 E8 */ stw r31, data_80450B68(r13) +/* 802A1930 93 ED 85 E8 */ stw r31, __OSReport_disable-0x30(r13) lbl_802A1934: /* 802A1934 3C 60 80 3D */ lis r3, __vt__14JAISeqDataUser@ha /* 0x803C9940@ha */ /* 802A1938 38 03 99 40 */ addi r0, r3, __vt__14JAISeqDataUser@l /* 0x803C9940@l */ diff --git a/asm/JSystem/JAudio2/JAISeqMgr/__dt__9JAISeqMgrFv.s b/asm/JSystem/JAudio2/JAISeqMgr/__dt__9JAISeqMgrFv.s index 34d62648dc..fd3cc30e46 100644 --- a/asm/JSystem/JAudio2/JAISeqMgr/__dt__9JAISeqMgrFv.s +++ b/asm/JSystem/JAudio2/JAISeqMgr/__dt__9JAISeqMgrFv.s @@ -21,11 +21,11 @@ lbl_802A2130: /* 802A2138 4B FF F6 3D */ bl __dt__14JAISeqDataUserFv /* 802A213C 28 1E 00 00 */ cmplwi r30, 0 /* 802A2140 41 82 00 18 */ beq lbl_802A2158 -/* 802A2144 80 0D 85 E8 */ lwz r0, data_80450B68(r13) +/* 802A2144 80 0D 85 E8 */ lwz r0, __OSReport_disable-0x30(r13) /* 802A2148 7C 00 F0 40 */ cmplw r0, r30 /* 802A214C 40 82 00 0C */ bne lbl_802A2158 /* 802A2150 38 00 00 00 */ li r0, 0 -/* 802A2154 90 0D 85 E8 */ stw r0, data_80450B68(r13) +/* 802A2154 90 0D 85 E8 */ stw r0, __OSReport_disable-0x30(r13) lbl_802A2158: /* 802A2158 7F E0 07 35 */ extsh. r0, r31 /* 802A215C 40 81 00 0C */ ble lbl_802A2168 diff --git a/asm/JSystem/JAudio2/JAISeqMgr/func_802A1B48.s b/asm/JSystem/JAudio2/JAISeqMgr/func_802A1B48.s index 62a32ce751..d486da5710 100644 --- a/asm/JSystem/JAudio2/JAISeqMgr/func_802A1B48.s +++ b/asm/JSystem/JAudio2/JAISeqMgr/func_802A1B48.s @@ -14,7 +14,7 @@ lbl_802A1B48: /* 802A1B78 41 82 00 08 */ beq lbl_802A1B80 /* 802A1B7C 48 00 0A 1D */ bl stop__8JAISoundFv lbl_802A1B80: -/* 802A1B80 83 CD 85 DC */ lwz r30, data_80450B5C(r13) +/* 802A1B80 83 CD 85 DC */ lwz r30, __OSReport_disable-0x3C(r13) /* 802A1B84 28 1E 00 00 */ cmplwi r30, 0 /* 802A1B88 41 82 00 2C */ beq lbl_802A1BB4 /* 802A1B8C 80 1A 00 00 */ lwz r0, 0(r26) diff --git a/asm/JSystem/JAudio2/JAISoundInfo/__ct__12JAISoundInfoFb.s b/asm/JSystem/JAudio2/JAISoundInfo/__ct__12JAISoundInfoFb.s index f3d4fc2808..e217700b41 100644 --- a/asm/JSystem/JAudio2/JAISoundInfo/__ct__12JAISoundInfoFb.s +++ b/asm/JSystem/JAudio2/JAISoundInfo/__ct__12JAISoundInfoFb.s @@ -1,7 +1,7 @@ lbl_802A2D34: /* 802A2D34 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A2D38 41 82 00 08 */ beq lbl_802A2D40 -/* 802A2D3C 90 6D 85 DC */ stw r3, data_80450B5C(r13) +/* 802A2D3C 90 6D 85 DC */ stw r3, __OSReport_disable-0x3C(r13) lbl_802A2D40: /* 802A2D40 3C 80 80 3D */ lis r4, __vt__12JAISoundInfo@ha /* 0x803C99A0@ha */ /* 802A2D44 38 04 99 A0 */ addi r0, r4, __vt__12JAISoundInfo@l /* 0x803C99A0@l */ diff --git a/asm/JSystem/JAudio2/JAISoundInfo/__dt__12JAISoundInfoFv.s b/asm/JSystem/JAudio2/JAISoundInfo/__dt__12JAISoundInfoFv.s index db5ca9cf40..fd6e4e79e0 100644 --- a/asm/JSystem/JAudio2/JAISoundInfo/__dt__12JAISoundInfoFv.s +++ b/asm/JSystem/JAudio2/JAISoundInfo/__dt__12JAISoundInfoFv.s @@ -9,11 +9,11 @@ lbl_802A2D50: /* 802A2D6C 38 03 99 A0 */ addi r0, r3, __vt__12JAISoundInfo@l /* 0x803C99A0@l */ /* 802A2D70 90 1F 00 00 */ stw r0, 0(r31) /* 802A2D74 41 82 00 18 */ beq lbl_802A2D8C -/* 802A2D78 80 0D 85 DC */ lwz r0, data_80450B5C(r13) +/* 802A2D78 80 0D 85 DC */ lwz r0, __OSReport_disable-0x3C(r13) /* 802A2D7C 7C 00 F8 40 */ cmplw r0, r31 /* 802A2D80 40 82 00 0C */ bne lbl_802A2D8C /* 802A2D84 38 00 00 00 */ li r0, 0 -/* 802A2D88 90 0D 85 DC */ stw r0, data_80450B5C(r13) +/* 802A2D88 90 0D 85 DC */ stw r0, __OSReport_disable-0x3C(r13) lbl_802A2D8C: /* 802A2D8C 7C 80 07 35 */ extsh. r0, r4 /* 802A2D90 40 81 00 0C */ ble lbl_802A2D9C diff --git a/asm/JSystem/JAudio2/JAISoundStarter/__ct__15JAISoundStarterFb.s b/asm/JSystem/JAudio2/JAISoundStarter/__ct__15JAISoundStarterFb.s index 75acb48464..33335102cb 100644 --- a/asm/JSystem/JAudio2/JAISoundStarter/__ct__15JAISoundStarterFb.s +++ b/asm/JSystem/JAudio2/JAISoundStarter/__ct__15JAISoundStarterFb.s @@ -1,7 +1,7 @@ lbl_802A2F6C: /* 802A2F6C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A2F70 41 82 00 08 */ beq lbl_802A2F78 -/* 802A2F74 90 6D 85 F8 */ stw r3, data_80450B78(r13) +/* 802A2F74 90 6D 85 F8 */ stw r3, __OSReport_disable-0x20(r13) lbl_802A2F78: /* 802A2F78 3C 80 80 3D */ lis r4, __vt__15JAISoundStarter@ha /* 0x803C99C8@ha */ /* 802A2F7C 38 04 99 C8 */ addi r0, r4, __vt__15JAISoundStarter@l /* 0x803C99C8@l */ diff --git a/asm/JSystem/JAudio2/JAISoundStarter/__dt__15JAISoundStarterFv.s b/asm/JSystem/JAudio2/JAISoundStarter/__dt__15JAISoundStarterFv.s index a3d76f2ff9..c090e3e7c7 100644 --- a/asm/JSystem/JAudio2/JAISoundStarter/__dt__15JAISoundStarterFv.s +++ b/asm/JSystem/JAudio2/JAISoundStarter/__dt__15JAISoundStarterFv.s @@ -9,11 +9,11 @@ lbl_802A2F88: /* 802A2FA4 38 03 99 C8 */ addi r0, r3, __vt__15JAISoundStarter@l /* 0x803C99C8@l */ /* 802A2FA8 90 1F 00 00 */ stw r0, 0(r31) /* 802A2FAC 41 82 00 18 */ beq lbl_802A2FC4 -/* 802A2FB0 80 0D 85 F8 */ lwz r0, data_80450B78(r13) +/* 802A2FB0 80 0D 85 F8 */ lwz r0, __OSReport_disable-0x20(r13) /* 802A2FB4 7C 00 F8 40 */ cmplw r0, r31 /* 802A2FB8 40 82 00 0C */ bne lbl_802A2FC4 /* 802A2FBC 38 00 00 00 */ li r0, 0 -/* 802A2FC0 90 0D 85 F8 */ stw r0, data_80450B78(r13) +/* 802A2FC0 90 0D 85 F8 */ stw r0, __OSReport_disable-0x20(r13) lbl_802A2FC4: /* 802A2FC4 7C 80 07 35 */ extsh. r0, r4 /* 802A2FC8 40 81 00 0C */ ble lbl_802A2FD4 diff --git a/asm/JSystem/JAudio2/JAIStreamMgr/__ct__12JAIStreamMgrFb.s b/asm/JSystem/JAudio2/JAIStreamMgr/__ct__12JAIStreamMgrFb.s index b131f8ed52..da9e187c26 100644 --- a/asm/JSystem/JAudio2/JAIStreamMgr/__ct__12JAIStreamMgrFb.s +++ b/asm/JSystem/JAudio2/JAIStreamMgr/__ct__12JAIStreamMgrFb.s @@ -6,7 +6,7 @@ lbl_802A3B68: /* 802A3B78 7C 7F 1B 78 */ mr r31, r3 /* 802A3B7C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A3B80 41 82 00 08 */ beq lbl_802A3B88 -/* 802A3B84 93 ED 85 E4 */ stw r31, data_80450B64(r13) +/* 802A3B84 93 ED 85 E4 */ stw r31, __OSReport_disable-0x34(r13) lbl_802A3B88: /* 802A3B88 C0 02 BE 00 */ lfs f0, lit_653(r2) /* 802A3B8C D0 1F 00 04 */ stfs f0, 4(r31) diff --git a/asm/JSystem/JAudio2/JAIStreamMgr/func_802A3C3C.s b/asm/JSystem/JAudio2/JAIStreamMgr/func_802A3C3C.s index be1d248656..d25750fdcf 100644 --- a/asm/JSystem/JAudio2/JAIStreamMgr/func_802A3C3C.s +++ b/asm/JSystem/JAudio2/JAIStreamMgr/func_802A3C3C.s @@ -30,7 +30,7 @@ lbl_802A3CA4: /* 802A3CA4 7F 23 CB 78 */ mr r3, r25 /* 802A3CA8 48 00 04 CD */ bl newStream___12JAIStreamMgrFv /* 802A3CAC 7C 7D 1B 78 */ mr r29, r3 -/* 802A3CB0 83 ED 85 DC */ lwz r31, data_80450B5C(r13) +/* 802A3CB0 83 ED 85 DC */ lwz r31, __OSReport_disable-0x3C(r13) /* 802A3CB4 39 00 FF FF */ li r8, -1 /* 802A3CB8 28 1F 00 00 */ cmplwi r31, 0 /* 802A3CBC 41 82 00 28 */ beq lbl_802A3CE4 diff --git a/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s b/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s index da6ef02a0b..877675f557 100644 --- a/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s +++ b/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s @@ -3,7 +3,7 @@ lbl_8029CF68: /* 8029CF6C 7C 08 02 A6 */ mflr r0 /* 8029CF70 90 01 00 14 */ stw r0, 0x14(r1) /* 8029CF74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CF78 83 ED 86 0C */ lwz r31, data_80450B8C(r13) +/* 8029CF78 83 ED 86 0C */ lwz r31, __OSReport_disable-0xC(r13) /* 8029CF7C 38 60 00 04 */ li r3, 4 /* 8029CF80 4B FF 3F A5 */ bl stop__8JASProbeFl /* 8029CF84 38 60 00 04 */ li r3, 4 diff --git a/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s b/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s index b1f151ec9f..5c7d458896 100644 --- a/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s +++ b/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s @@ -3,7 +3,7 @@ lbl_8029CFBC: /* 8029CFC0 7C 08 02 A6 */ mflr r0 /* 8029CFC4 90 01 00 14 */ stw r0, 0x14(r1) /* 8029CFC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CFCC 83 ED 86 0C */ lwz r31, data_80450B8C(r13) +/* 8029CFCC 83 ED 86 0C */ lwz r31, __OSReport_disable-0xC(r13) lbl_8029CFD0: /* 8029CFD0 48 0B 54 71 */ bl DSPCheckMailFromDSP /* 8029CFD4 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s b/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s index b9a5fecec6..0e5da428f2 100644 --- a/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s +++ b/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s @@ -14,7 +14,7 @@ lbl_8029CCDC: /* 8029CD0C 41 82 00 08 */ beq lbl_8029CD14 /* 8029CD10 38 63 FF 84 */ addi r3, r3, -124 lbl_8029CD14: -/* 8029CD14 90 6D 86 0C */ stw r3, data_80450B8C(r13) +/* 8029CD14 90 6D 86 0C */ stw r3, __OSReport_disable-0xC(r13) /* 8029CD18 3C 60 80 3C */ lis r3, __vt__14JASAudioThread@ha /* 0x803C78E0@ha */ /* 8029CD1C 38 03 78 E0 */ addi r0, r3, __vt__14JASAudioThread@l /* 0x803C78E0@l */ /* 8029CD20 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s b/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s index 836ace22db..c1373fd019 100644 --- a/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s +++ b/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s @@ -16,11 +16,11 @@ lbl_8029D028: /* 8029D060 41 82 00 08 */ beq lbl_8029D068 /* 8029D064 38 63 FF 84 */ addi r3, r3, -124 lbl_8029D068: -/* 8029D068 80 0D 86 0C */ lwz r0, data_80450B8C(r13) +/* 8029D068 80 0D 86 0C */ lwz r0, __OSReport_disable-0xC(r13) /* 8029D06C 7C 00 18 40 */ cmplw r0, r3 /* 8029D070 40 82 00 0C */ bne lbl_8029D07C /* 8029D074 38 00 00 00 */ li r0, 0 -/* 8029D078 90 0D 86 0C */ stw r0, data_80450B8C(r13) +/* 8029D078 90 0D 86 0C */ stw r0, __OSReport_disable-0xC(r13) lbl_8029D07C: /* 8029D07C 7F C3 F3 78 */ mr r3, r30 /* 8029D080 38 80 00 00 */ li r4, 0 diff --git a/asm/JSystem/JAudio2/JASTrack/__dt__19JASDefaultBankTableFv.s b/asm/JSystem/JAudio2/JASTrack/__dt__19JASDefaultBankTableFv.s index f8c23754ce..6c78f403b3 100644 --- a/asm/JSystem/JAudio2/JASTrack/__dt__19JASDefaultBankTableFv.s +++ b/asm/JSystem/JAudio2/JASTrack/__dt__19JASDefaultBankTableFv.s @@ -14,11 +14,11 @@ lbl_802934B4: /* 802934E4 41 82 00 08 */ beq lbl_802934EC /* 802934E8 38 63 FB F4 */ addi r3, r3, -1036 lbl_802934EC: -/* 802934EC 80 0D 86 10 */ lwz r0, data_80450B90(r13) +/* 802934EC 80 0D 86 10 */ lwz r0, __OSReport_disable-0x8(r13) /* 802934F0 7C 00 18 40 */ cmplw r0, r3 /* 802934F4 40 82 00 0C */ bne lbl_80293500 /* 802934F8 38 00 00 00 */ li r0, 0 -/* 802934FC 90 0D 86 10 */ stw r0, data_80450B90(r13) +/* 802934FC 90 0D 86 10 */ stw r0, __OSReport_disable-0x8(r13) lbl_80293500: /* 80293500 7C 80 07 35 */ extsh. r0, r4 /* 80293504 40 81 00 0C */ ble lbl_80293510 diff --git a/asm/JSystem/JAudio2/JASTrack/__sinit_JASTrack_cpp.s b/asm/JSystem/JAudio2/JASTrack/__sinit_JASTrack_cpp.s index 885ca8c2a4..1b2b9511b5 100644 --- a/asm/JSystem/JAudio2/JASTrack/__sinit_JASTrack_cpp.s +++ b/asm/JSystem/JAudio2/JASTrack/__sinit_JASTrack_cpp.s @@ -25,7 +25,7 @@ lbl_80293388: /* 802933E4 41 82 00 08 */ beq lbl_802933EC /* 802933E8 38 63 FB F4 */ addi r3, r3, -1036 lbl_802933EC: -/* 802933EC 90 6D 86 10 */ stw r3, data_80450B90(r13) +/* 802933EC 90 6D 86 10 */ stw r3, __OSReport_disable-0x8(r13) /* 802933F0 3C 60 80 3C */ lis r3, __vt__19JASDefaultBankTable@ha /* 0x803C5B68@ha */ /* 802933F4 38 03 5B 68 */ addi r0, r3, __vt__19JASDefaultBankTable@l /* 0x803C5B68@l */ /* 802933F8 90 1E 00 00 */ stw r0, 0(r30) diff --git a/asm/JSystem/JAudio2/JAUAudioArcLoader/readMaxSeCategory__17JAUAudioArcLoaderFiii.s b/asm/JSystem/JAudio2/JAUAudioArcLoader/readMaxSeCategory__17JAUAudioArcLoaderFiii.s index 7241fdb14b..62ed1e35f7 100644 --- a/asm/JSystem/JAudio2/JAUAudioArcLoader/readMaxSeCategory__17JAUAudioArcLoaderFiii.s +++ b/asm/JSystem/JAudio2/JAUAudioArcLoader/readMaxSeCategory__17JAUAudioArcLoaderFiii.s @@ -1,5 +1,5 @@ lbl_802A49D8: -/* 802A49D8 80 0D 85 EC */ lwz r0, data_80450B6C(r13) +/* 802A49D8 80 0D 85 EC */ lwz r0, __OSReport_disable-0x2C(r13) /* 802A49DC 28 00 00 00 */ cmplwi r0, 0 /* 802A49E0 4D 82 00 20 */ beqlr /* 802A49E4 1C 64 00 6C */ mulli r3, r4, 0x6c diff --git a/asm/JSystem/JAudio2/JAUInitializer/initJASystem__18JAU_JASInitializerFP12JKRSolidHeap.s b/asm/JSystem/JAudio2/JAUInitializer/initJASystem__18JAU_JASInitializerFP12JKRSolidHeap.s index a706b6dd5e..a346ce491a 100644 --- a/asm/JSystem/JAudio2/JAUInitializer/initJASystem__18JAU_JASInitializerFP12JKRSolidHeap.s +++ b/asm/JSystem/JAudio2/JAUInitializer/initJASystem__18JAU_JASInitializerFP12JKRSolidHeap.s @@ -6,7 +6,7 @@ lbl_802A4B28: /* 802A4B38 48 0B D6 A5 */ bl _savegpr_29 /* 802A4B3C 7C 7F 1B 78 */ mr r31, r3 /* 802A4B40 7C 9D 23 78 */ mr r29, r4 -/* 802A4B44 80 0D 86 0C */ lwz r0, data_80450B8C(r13) +/* 802A4B44 80 0D 86 0C */ lwz r0, __OSReport_disable-0xC(r13) /* 802A4B48 28 00 00 00 */ cmplwi r0, 0 /* 802A4B4C 40 82 01 98 */ bne lbl_802A4CE4 /* 802A4B50 4B FE B3 AD */ bl getThreadPointer__6JASDvdFv @@ -109,7 +109,7 @@ lbl_802A4CB8: /* 802A4CBC 2C 05 00 00 */ cmpwi r5, 0 /* 802A4CC0 41 80 00 10 */ blt lbl_802A4CD0 /* 802A4CC4 7F C3 F3 78 */ mr r3, r30 -/* 802A4CC8 80 8D 86 0C */ lwz r4, data_80450B8C(r13) +/* 802A4CC8 80 8D 86 0C */ lwz r4, __OSReport_disable-0xC(r13) /* 802A4CCC 48 02 CD A5 */ bl enter__15JKRThreadSwitchFP9JKRThreadi lbl_802A4CD0: /* 802A4CD0 C0 3F 00 2C */ lfs f1, 0x2c(r31) diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/dispose__10JAUSectionFv.s b/asm/JSystem/JAudio2/JAUSectionHeap/dispose__10JAUSectionFv.s index cb58f35d49..a07c1dfc3d 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/dispose__10JAUSectionFv.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/dispose__10JAUSectionFv.s @@ -7,11 +7,11 @@ lbl_802A5160: /* 802A5174 28 04 00 00 */ cmplwi r4, 0 /* 802A5178 41 82 00 1C */ beq lbl_802A5194 /* 802A517C 41 82 00 18 */ beq lbl_802A5194 -/* 802A5180 80 0D 85 D8 */ lwz r0, data_80450B58(r13) +/* 802A5180 80 0D 85 D8 */ lwz r0, __OSReport_disable-0x40(r13) /* 802A5184 7C 00 20 40 */ cmplw r0, r4 /* 802A5188 40 82 00 0C */ bne lbl_802A5194 /* 802A518C 38 00 00 00 */ li r0, 0 -/* 802A5190 90 0D 85 D8 */ stw r0, data_80450B58(r13) +/* 802A5190 90 0D 85 D8 */ stw r0, __OSReport_disable-0x40(r13) lbl_802A5194: /* 802A5194 38 00 00 00 */ li r0, 0 /* 802A5198 80 83 00 30 */ lwz r4, 0x30(r3) @@ -25,11 +25,11 @@ lbl_802A51A0: /* 802A51B4 28 04 00 00 */ cmplwi r4, 0 /* 802A51B8 41 82 00 1C */ beq lbl_802A51D4 /* 802A51BC 41 82 00 18 */ beq lbl_802A51D4 -/* 802A51C0 80 0D 85 D4 */ lwz r0, data_80450B54(r13) +/* 802A51C0 80 0D 85 D4 */ lwz r0, __OSReport_disable-0x44(r13) /* 802A51C4 7C 00 20 40 */ cmplw r0, r4 /* 802A51C8 40 82 00 0C */ bne lbl_802A51D4 /* 802A51CC 38 00 00 00 */ li r0, 0 -/* 802A51D0 90 0D 85 D4 */ stw r0, data_80450B54(r13) +/* 802A51D0 90 0D 85 D4 */ stw r0, __OSReport_disable-0x44(r13) lbl_802A51D4: /* 802A51D4 38 00 00 00 */ li r0, 0 /* 802A51D8 80 63 00 30 */ lwz r3, 0x30(r3) diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/newBank__10JAUSectionFPCvUl.s b/asm/JSystem/JAudio2/JAUSectionHeap/newBank__10JAUSectionFPCvUl.s index 7503e38121..298442973a 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/newBank__10JAUSectionFPCvUl.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/newBank__10JAUSectionFPCvUl.s @@ -39,7 +39,7 @@ lbl_802A5A90: /* 802A5ADC 7F E3 01 2E */ stwx r31, r3, r0 /* 802A5AE0 48 00 00 50 */ b lbl_802A5B30 lbl_802A5AE4: -/* 802A5AE4 80 6D 86 10 */ lwz r3, data_80450B90(r13) +/* 802A5AE4 80 6D 86 10 */ lwz r3, __OSReport_disable-0x8(r13) /* 802A5AE8 80 63 00 04 */ lwz r3, 4(r3) /* 802A5AEC 57 60 10 3A */ slwi r0, r27, 2 /* 802A5AF0 7F E3 01 2E */ stwx r31, r3, r0 diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/newSoundNameTable__10JAUSectionFPCvUlb.s b/asm/JSystem/JAudio2/JAUSectionHeap/newSoundNameTable__10JAUSectionFPCvUlb.s index 8d1f812550..7c0196880b 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/newSoundNameTable__10JAUSectionFPCvUlb.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/newSoundNameTable__10JAUSectionFPCvUlb.s @@ -27,7 +27,7 @@ lbl_802A52F4: /* 802A5300 41 82 00 1C */ beq lbl_802A531C /* 802A5304 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 802A5308 41 82 00 08 */ beq lbl_802A5310 -/* 802A530C 93 ED 85 D4 */ stw r31, data_80450B54(r13) +/* 802A530C 93 ED 85 D4 */ stw r31, __OSReport_disable-0x44(r13) lbl_802A5310: /* 802A5310 38 00 00 00 */ li r0, 0 /* 802A5314 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/newSoundTable__10JAUSectionFPCvUlb.s b/asm/JSystem/JAudio2/JAUSectionHeap/newSoundTable__10JAUSectionFPCvUlb.s index 067fcb9883..59c09cc834 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/newSoundTable__10JAUSectionFPCvUlb.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/newSoundTable__10JAUSectionFPCvUlb.s @@ -27,7 +27,7 @@ lbl_802A5238: /* 802A5244 41 82 00 1C */ beq lbl_802A5260 /* 802A5248 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 802A524C 41 82 00 08 */ beq lbl_802A5254 -/* 802A5250 93 ED 85 D8 */ stw r31, data_80450B58(r13) +/* 802A5250 93 ED 85 D8 */ stw r31, __OSReport_disable-0x40(r13) lbl_802A5254: /* 802A5254 38 00 00 00 */ li r0, 0 /* 802A5258 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/newStaticSeqData__10JAUSectionF10JAISoundID.s b/asm/JSystem/JAudio2/JAUSectionHeap/newStaticSeqData__10JAUSectionF10JAISoundID.s index d4440578fd..e73ee53f07 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/newStaticSeqData__10JAUSectionF10JAISoundID.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/newStaticSeqData__10JAUSectionF10JAISoundID.s @@ -7,7 +7,7 @@ lbl_802A5730: /* 802A5744 7C 7D 1B 78 */ mr r29, r3 /* 802A5748 7C 9E 23 78 */ mr r30, r4 /* 802A574C 83 E3 00 5C */ lwz r31, 0x5c(r3) -/* 802A5750 80 6D 85 D0 */ lwz r3, data_80450B50(r13) +/* 802A5750 80 6D 85 D0 */ lwz r3, __OSReport_disable-0x48(r13) /* 802A5754 28 03 00 00 */ cmplwi r3, 0 /* 802A5758 40 82 00 0C */ bne lbl_802A5764 /* 802A575C 38 60 00 00 */ li r3, 0 diff --git a/asm/JSystem/JAudio2/JAUSectionHeap/newVoiceBank__10JAUSectionFUlUl.s b/asm/JSystem/JAudio2/JAUSectionHeap/newVoiceBank__10JAUSectionFUlUl.s index d53ed8f2fa..64c662a804 100644 --- a/asm/JSystem/JAudio2/JAUSectionHeap/newVoiceBank__10JAUSectionFUlUl.s +++ b/asm/JSystem/JAudio2/JAUSectionHeap/newVoiceBank__10JAUSectionFUlUl.s @@ -44,7 +44,7 @@ lbl_802A5C00: /* 802A5C20 7C 64 01 2E */ stwx r3, r4, r0 /* 802A5C24 48 00 00 50 */ b lbl_802A5C74 lbl_802A5C28: -/* 802A5C28 80 8D 86 10 */ lwz r4, data_80450B90(r13) +/* 802A5C28 80 8D 86 10 */ lwz r4, __OSReport_disable-0x8(r13) /* 802A5C2C 80 84 00 04 */ lwz r4, 4(r4) /* 802A5C30 57 C0 10 3A */ slwi r0, r30, 2 /* 802A5C34 7C 64 01 2E */ stwx r3, r4, r0 diff --git a/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser.s b/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser.s index a42d03af14..d7d8fb48dc 100644 --- a/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser.s +++ b/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser.s @@ -14,7 +14,7 @@ lbl_802A6C18: /* 802A6C48 38 60 00 00 */ li r3, 0 /* 802A6C4C 48 00 00 E4 */ b lbl_802A6D30 lbl_802A6C50: -/* 802A6C50 80 6D 85 D0 */ lwz r3, data_80450B50(r13) +/* 802A6C50 80 6D 85 D0 */ lwz r3, __OSReport_disable-0x48(r13) /* 802A6C54 28 03 00 00 */ cmplwi r3, 0 /* 802A6C58 40 82 00 0C */ bne lbl_802A6C64 /* 802A6C5C 38 60 00 00 */ li r3, 0 diff --git a/asm/Z2AudioLib/Z2Audience/__ct__10Z2AudienceFv.s b/asm/Z2AudioLib/Z2Audience/__ct__10Z2AudienceFv.s index 45a3d1f9cc..892839d0db 100644 --- a/asm/Z2AudioLib/Z2Audience/__ct__10Z2AudienceFv.s +++ b/asm/Z2AudioLib/Z2Audience/__ct__10Z2AudienceFv.s @@ -11,7 +11,7 @@ lbl_802BD130: /* 802BD154 41 82 00 08 */ beq lbl_802BD15C /* 802BD158 38 63 FF FC */ addi r3, r3, -4 lbl_802BD15C: -/* 802BD15C 90 6D 85 C4 */ stw r3, data_80450B44(r13) +/* 802BD15C 90 6D 85 C4 */ stw r3, __OSReport_disable-0x54(r13) /* 802BD160 3C 60 80 3D */ lis r3, __vt__10Z2Audience@ha /* 0x803CAC98@ha */ /* 802BD164 38 03 AC 98 */ addi r0, r3, __vt__10Z2Audience@l /* 0x803CAC98@l */ /* 802BD168 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/Z2AudioLib/Z2Audience/__dt__10Z2AudienceFv.s b/asm/Z2AudioLib/Z2Audience/__dt__10Z2AudienceFv.s index 6005fe6386..7e81f15caf 100644 --- a/asm/Z2AudioLib/Z2Audience/__dt__10Z2AudienceFv.s +++ b/asm/Z2AudioLib/Z2Audience/__dt__10Z2AudienceFv.s @@ -16,11 +16,11 @@ lbl_802BD1FC: /* 802BD234 41 82 00 08 */ beq lbl_802BD23C /* 802BD238 38 63 FF FC */ addi r3, r3, -4 lbl_802BD23C: -/* 802BD23C 80 0D 85 C4 */ lwz r0, data_80450B44(r13) +/* 802BD23C 80 0D 85 C4 */ lwz r0, __OSReport_disable-0x54(r13) /* 802BD240 7C 00 18 40 */ cmplw r0, r3 /* 802BD244 40 82 00 0C */ bne lbl_802BD250 /* 802BD248 38 00 00 00 */ li r0, 0 -/* 802BD24C 90 0D 85 C4 */ stw r0, data_80450B44(r13) +/* 802BD24C 90 0D 85 C4 */ stw r0, __OSReport_disable-0x54(r13) lbl_802BD250: /* 802BD250 7F C3 F3 78 */ mr r3, r30 /* 802BD254 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2Audience/calcMicPriority__9Z2SpotMicFf.s b/asm/Z2AudioLib/Z2Audience/calcMicPriority__9Z2SpotMicFf.s index ddad41e4e9..98202c2e82 100644 --- a/asm/Z2AudioLib/Z2Audience/calcMicPriority__9Z2SpotMicFf.s +++ b/asm/Z2AudioLib/Z2Audience/calcMicPriority__9Z2SpotMicFf.s @@ -5,7 +5,7 @@ lbl_802BCFE4: /* 802BCFF0 C0 03 00 04 */ lfs f0, 4(r3) /* 802BCFF4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802BCFF8 40 81 00 10 */ ble lbl_802BD008 -/* 802BCFFC 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCFFC 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BD000 80 63 00 70 */ lwz r3, 0x70(r3) /* 802BD004 48 00 00 28 */ b lbl_802BD02C lbl_802BD008: diff --git a/asm/Z2AudioLib/Z2Audience/func_802BD338.s b/asm/Z2AudioLib/Z2Audience/func_802BD338.s index 21015aec40..d5e071c223 100644 --- a/asm/Z2AudioLib/Z2Audience/func_802BD338.s +++ b/asm/Z2AudioLib/Z2Audience/func_802BD338.s @@ -21,7 +21,7 @@ lbl_802BD338: lbl_802BD384: /* 802BD384 80 05 00 00 */ lwz r0, 0(r5) /* 802BD388 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BD38C 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802BD38C 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802BD390 38 81 00 0C */ addi r4, r1, 0xc /* 802BD394 4B FF DD C5 */ bl getAudibleSwFull__11Z2SoundInfoF10JAISoundID /* 802BD398 90 61 00 10 */ stw r3, 0x10(r1) diff --git a/asm/Z2AudioLib/Z2Audience/setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb.s b/asm/Z2AudioLib/Z2Audience/setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb.s index 5d15fe0960..03cb7dc82f 100644 --- a/asm/Z2AudioLib/Z2Audience/setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb.s +++ b/asm/Z2AudioLib/Z2Audience/setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb.s @@ -117,13 +117,13 @@ lbl_802BCA3C: /* 802BCA64 EC 01 00 B2 */ fmuls f0, f1, f2 /* 802BCA68 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 802BCA6C 40 81 00 18 */ ble lbl_802BCA84 -/* 802BCA70 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCA70 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BCA74 38 63 00 0C */ addi r3, r3, 0xc /* 802BCA78 EC 23 10 24 */ fdivs f1, f3, f2 /* 802BCA7C 4B FF FA 55 */ bl updateVolumeDist__19Z2Audience3DSettingFf /* 802BCA80 48 00 00 10 */ b lbl_802BCA90 lbl_802BCA84: -/* 802BCA84 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCA84 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BCA88 38 63 00 0C */ addi r3, r3, 0xc /* 802BCA8C 4B FF F8 7D */ bl initVolumeDist__19Z2Audience3DSettingFv lbl_802BCA90: @@ -140,7 +140,7 @@ lbl_802BCAAC: /* 802BCAB4 88 1B 00 70 */ lbz r0, 0x70(r27) /* 802BCAB8 28 00 00 00 */ cmplwi r0, 0 /* 802BCABC 41 82 00 DC */ beq lbl_802BCB98 -/* 802BCAC0 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCAC0 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BCAC4 38 63 00 0C */ addi r3, r3, 0xc /* 802BCAC8 C0 3B 00 64 */ lfs f1, 0x64(r27) /* 802BCACC FC 40 08 90 */ fmr f2, f1 @@ -188,7 +188,7 @@ lbl_802BCAD8: /* 802BCB70 88 1B 00 70 */ lbz r0, 0x70(r27) /* 802BCB74 28 00 00 00 */ cmplwi r0, 0 /* 802BCB78 41 82 00 20 */ beq lbl_802BCB98 -/* 802BCB7C 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCB7C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BCB80 38 63 00 0C */ addi r3, r3, 0xc /* 802BCB84 C0 1B 00 60 */ lfs f0, 0x60(r27) /* 802BCB88 C0 5B 00 64 */ lfs f2, 0x64(r27) diff --git a/asm/Z2AudioLib/Z2Audience/setMicState__9Z2SpotMicFP13Z2AudioCamerai.s b/asm/Z2AudioLib/Z2Audience/setMicState__9Z2SpotMicFP13Z2AudioCamerai.s index 805873eb5e..e0d2674baf 100644 --- a/asm/Z2AudioLib/Z2Audience/setMicState__9Z2SpotMicFP13Z2AudioCamerai.s +++ b/asm/Z2AudioLib/Z2Audience/setMicState__9Z2SpotMicFP13Z2AudioCamerai.s @@ -39,7 +39,7 @@ lbl_802BCE8C: /* 802BCEA4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 802BCEA8 38 61 00 08 */ addi r3, r1, 8 /* 802BCEAC 48 08 A2 A5 */ bl PSVECMag -/* 802BCEB0 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802BCEB0 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802BCEB4 C0 83 00 0C */ lfs f4, 0xc(r3) /* 802BCEB8 C0 A3 00 48 */ lfs f5, 0x48(r3) /* 802BCEBC FC 01 20 40 */ fcmpo cr0, f1, f4 diff --git a/asm/Z2AudioLib/Z2AudioArcLoader/readBFCA__16Z2AudioArcLoaderFPCv.s b/asm/Z2AudioLib/Z2AudioArcLoader/readBFCA__16Z2AudioArcLoaderFPCv.s index de31743cf4..e965d8d942 100644 --- a/asm/Z2AudioLib/Z2AudioArcLoader/readBFCA__16Z2AudioArcLoaderFPCv.s +++ b/asm/Z2AudioLib/Z2AudioArcLoader/readBFCA__16Z2AudioArcLoaderFPCv.s @@ -21,7 +21,7 @@ lbl_802A9B04: /* 802A9B0C 38 A0 00 02 */ li r5, 2 /* 802A9B10 48 02 BD 31 */ bl mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection /* 802A9B14 7C 7E 1B 78 */ mr r30, r3 -/* 802A9B18 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802A9B18 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802A9B1C 7F C4 F3 78 */ mr r4, r30 /* 802A9B20 7F E5 FB 78 */ mr r5, r31 /* 802A9B24 48 01 0C D9 */ bl initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap diff --git a/asm/Z2AudioLib/Z2AudioMgr/__ct__10Z2AudioMgrFv.s b/asm/Z2AudioLib/Z2AudioMgr/__ct__10Z2AudioMgrFv.s index 27273a498b..a691ea9090 100644 --- a/asm/Z2AudioLib/Z2AudioMgr/__ct__10Z2AudioMgrFv.s +++ b/asm/Z2AudioLib/Z2AudioMgr/__ct__10Z2AudioMgrFv.s @@ -29,7 +29,7 @@ lbl_802CD248: /* 802CD2B4 38 80 00 01 */ li r4, 1 /* 802CD2B8 4B FD 5A 7D */ bl __ct__12JAISoundInfoFb /* 802CD2BC 38 9E 00 04 */ addi r4, r30, 4 -/* 802CD2C0 90 8D 85 D0 */ stw r4, data_80450B50(r13) +/* 802CD2C0 90 8D 85 D0 */ stw r4, __OSReport_disable-0x48(r13) /* 802CD2C4 3C 60 80 3A */ lis r3, __vt__12JAUSoundInfo@ha /* 0x803A2F4C@ha */ /* 802CD2C8 38 03 2F 4C */ addi r0, r3, __vt__12JAUSoundInfo@l /* 0x803A2F4C@l */ /* 802CD2CC 90 1E 00 04 */ stw r0, 4(r30) @@ -40,7 +40,7 @@ lbl_802CD248: /* 802CD2E0 41 82 00 08 */ beq lbl_802CD2E8 /* 802CD2E4 38 63 FF F4 */ addi r3, r3, -12 lbl_802CD2E8: -/* 802CD2E8 90 6D 85 CC */ stw r3, data_80450B4C(r13) +/* 802CD2E8 90 6D 85 CC */ stw r3, __OSReport_disable-0x4C(r13) /* 802CD2EC 3C 60 80 3D */ lis r3, __vt__11Z2SoundInfo@ha /* 0x803CAC48@ha */ /* 802CD2F0 38 63 AC 48 */ addi r3, r3, __vt__11Z2SoundInfo@l /* 0x803CAC48@l */ /* 802CD2F4 90 7E 00 00 */ stw r3, 0(r30) diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s index 2c49a87bac..db881ff35c 100644 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s +++ b/asm/Z2AudioLib/Z2Creature/deleteObject__15Z2CreatureEnemyFv.s @@ -7,7 +7,7 @@ lbl_802C0FC4: /* 802C0FD8 88 03 00 A0 */ lbz r0, 0xa0(r3) /* 802C0FDC 28 00 00 2C */ cmplwi r0, 0x2c /* 802C0FE0 40 82 00 5C */ bne lbl_802C103C -/* 802C0FE4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C0FE4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C0FE8 C0 62 C2 20 */ lfs f3, lit_3669(r2) /* 802C0FEC D0 63 00 34 */ stfs f3, 0x34(r3) /* 802C0FF0 C0 02 C2 34 */ lfs f0, lit_3717(r2) @@ -38,7 +38,7 @@ lbl_802C103C: /* 802C1050 41 82 00 08 */ beq lbl_802C1058 /* 802C1054 38 9F 00 90 */ addi r4, r31, 0x90 lbl_802C1058: -/* 802C1058 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C1058 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C105C 4B FF F1 35 */ bl func_802C0190 lbl_802C1060: /* 802C1060 38 00 00 00 */ li r0, 0 diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s index 98277acd08..9815ce542b 100644 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s +++ b/asm/Z2AudioLib/Z2Creature/deleteObject__16Z2CreatureSumomoFv.s @@ -4,7 +4,7 @@ lbl_802C1CA0: /* 802C1CA8 90 01 00 24 */ stw r0, 0x24(r1) /* 802C1CAC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802C1CB0 7C 7F 1B 78 */ mr r31, r3 -/* 802C1CB4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1CB4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1CB8 80 83 00 04 */ lwz r4, 4(r3) /* 802C1CBC 28 04 00 00 */ cmplwi r4, 0 /* 802C1CC0 41 82 00 10 */ beq lbl_802C1CD0 @@ -17,7 +17,7 @@ lbl_802C1CD4: /* 802C1CD4 3C 04 FF 00 */ addis r0, r4, 0xff00 /* 802C1CD8 28 00 00 64 */ cmplwi r0, 0x64 /* 802C1CDC 40 82 00 18 */ bne lbl_802C1CF4 -/* 802C1CE0 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802C1CE0 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802C1CE4 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802C1CE8 28 00 00 06 */ cmplwi r0, 6 /* 802C1CEC 41 82 00 08 */ beq lbl_802C1CF4 diff --git a/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s b/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s index 81359eaab0..f4d5b1e380 100644 --- a/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s +++ b/asm/Z2AudioLib/Z2Creature/deleteObject__17Z2CreatureCitizenFv.s @@ -7,7 +7,7 @@ lbl_802C0D04: /* 802C0D18 88 03 00 A2 */ lbz r0, 0xa2(r3) /* 802C0D1C 28 00 00 00 */ cmplwi r0, 0 /* 802C0D20 40 82 00 0C */ bne lbl_802C0D2C -/* 802C0D24 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C0D24 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C0D28 4B FE AC 39 */ bl decrCrowdSize__7Z2SeMgrFv lbl_802C0D2C: /* 802C0D2C 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s b/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s index dda3ecc626..87a8b3a975 100644 --- a/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s +++ b/asm/Z2AudioLib/Z2Creature/playSumomoBgm__16Z2CreatureSumomoFUl.s @@ -2,7 +2,7 @@ lbl_802C1C24: /* 802C1C24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C1C28 7C 08 02 A6 */ mflr r0 /* 802C1C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C1C30 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1C30 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1C34 80 A3 00 04 */ lwz r5, 4(r3) /* 802C1C38 28 05 00 00 */ cmplwi r5, 0 /* 802C1C3C 41 82 00 10 */ beq lbl_802C1C4C @@ -24,7 +24,7 @@ lbl_802C1C50: lbl_802C1C74: /* 802C1C74 28 04 03 E8 */ cmplwi r4, 0x3e8 /* 802C1C78 41 80 00 18 */ blt lbl_802C1C90 -/* 802C1C7C 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802C1C7C 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802C1C80 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802C1C84 28 00 00 06 */ cmplwi r0, 6 /* 802C1C88 41 82 00 08 */ beq lbl_802C1C90 diff --git a/asm/Z2AudioLib/Z2Creature/playVoice__17Z2CreatureCitizenFi.s b/asm/Z2AudioLib/Z2Creature/playVoice__17Z2CreatureCitizenFi.s index 9db2bf2182..231ce02dee 100644 --- a/asm/Z2AudioLib/Z2Creature/playVoice__17Z2CreatureCitizenFi.s +++ b/asm/Z2AudioLib/Z2Creature/playVoice__17Z2CreatureCitizenFi.s @@ -40,7 +40,7 @@ lbl_802C0EA4: /* 802C0EA4 88 1E 00 A2 */ lbz r0, 0xa2(r30) /* 802C0EA8 28 00 00 00 */ cmplwi r0, 0 /* 802C0EAC 40 82 00 14 */ bne lbl_802C0EC0 -/* 802C0EB0 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C0EB0 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C0EB4 4B FE AA AD */ bl decrCrowdSize__7Z2SeMgrFv /* 802C0EB8 38 00 00 01 */ li r0, 1 /* 802C0EBC 98 1E 00 A2 */ stb r0, 0xa2(r30) diff --git a/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s b/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s index d9dbbefccb..8ad2cff152 100644 --- a/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s +++ b/asm/Z2AudioLib/Z2Creature/setEnemyName__15Z2CreatureEnemyFPCc.s @@ -15,7 +15,7 @@ lbl_802C1BB8: /* 802C1BC0 41 82 00 08 */ beq lbl_802C1BC8 /* 802C1BC4 38 A5 00 90 */ addi r5, r5, 0x90 lbl_802C1BC8: -/* 802C1BC8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C1BC8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C1BCC 4B FF E4 A9 */ bl func_802C0074 /* 802C1BD0 98 7F 00 A0 */ stb r3, 0xa0(r31) lbl_802C1BD4: diff --git a/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s b/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s index 989c503565..42e293503e 100644 --- a/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s +++ b/asm/Z2AudioLib/Z2Creature/setMdlType__17Z2CreatureCitizenFScbb.s @@ -23,7 +23,7 @@ lbl_802C0D48: /* 802C0D9C 7C 07 02 14 */ add r0, r7, r0 /* 802C0DA0 98 1F 00 A0 */ stb r0, 0xa0(r31) /* 802C0DA4 40 82 00 0C */ bne lbl_802C0DB0 -/* 802C0DA8 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C0DA8 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C0DAC 4B FE AB 91 */ bl incrCrowdSize__7Z2SeMgrFv lbl_802C0DB0: /* 802C0DB0 7F C0 07 75 */ extsb. r0, r30 diff --git a/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s b/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s index 50f3ebba10..44c07ccef1 100644 --- a/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s +++ b/asm/Z2AudioLib/Z2Creature/startCollisionSE__15Z2CreatureEnemyFUlUl.s @@ -17,7 +17,7 @@ lbl_802C1A14: lbl_802C1A50: /* 802C1A50 38 00 00 01 */ li r0, 1 /* 802C1A54 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C1A58 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1A58 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1A5C 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) /* 802C1A60 4B FF 30 9D */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1A64 38 7D 00 08 */ addi r3, r29, 8 @@ -35,7 +35,7 @@ lbl_802C1A7C: /* 802C1A90 41 82 00 08 */ beq lbl_802C1A98 /* 802C1A94 38 84 00 90 */ addi r4, r4, 0x90 lbl_802C1A98: -/* 802C1A98 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C1A98 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C1A9C 4B FF E6 F5 */ bl func_802C0190 lbl_802C1AA0: /* 802C1AA0 38 7D 00 08 */ addi r3, r29, 8 @@ -54,7 +54,7 @@ lbl_802C1AB8: /* 802C1AD0 7C 03 00 2E */ lwzx r0, r3, r0 /* 802C1AD4 7C 09 03 A6 */ mtctr r0 /* 802C1AD8 4E 80 04 20 */ bctr -/* 802C1ADC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1ADC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1AE0 38 80 00 02 */ li r4, 2 /* 802C1AE4 4B FF 2D 61 */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802C1AE8 48 00 00 68 */ b lbl_802C1B50 @@ -69,21 +69,21 @@ lbl_802C1AB8: lbl_802C1B0C: /* 802C1B0C 38 80 00 14 */ li r4, 0x14 lbl_802C1B10: -/* 802C1B10 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1B10 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1B14 4B FF 2F E9 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1B18 48 00 00 38 */ b lbl_802C1B50 /* 802C1B1C 28 04 00 2B */ cmplwi r4, 0x2b /* 802C1B20 40 82 00 1C */ bne lbl_802C1B3C /* 802C1B24 38 00 00 01 */ li r0, 1 /* 802C1B28 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C1B2C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1B2C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1B30 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) /* 802C1B34 4B FF 2F C9 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1B38 48 00 00 18 */ b lbl_802C1B50 lbl_802C1B3C: /* 802C1B3C 28 04 00 16 */ cmplwi r4, 0x16 /* 802C1B40 40 82 00 10 */ bne lbl_802C1B50 -/* 802C1B44 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1B44 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1B48 38 80 00 02 */ li r4, 2 /* 802C1B4C 4B FF 2C F9 */ bl setBattleSeqState__8Z2SeqMgrFUc lbl_802C1B50: diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s index 972cf46895..3b8b0da6f7 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc.s @@ -15,28 +15,28 @@ lbl_802C136C: /* 802C13A0 3C 03 FF F9 */ addis r0, r3, 0xfff9 /* 802C13A4 28 00 FF FF */ cmplwi r0, 0xffff /* 802C13A8 40 82 00 7C */ bne lbl_802C1424 -/* 802C13AC 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C13AC 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C13B0 80 9C 00 04 */ lwz r4, 4(r28) /* 802C13B4 38 A1 00 0C */ addi r5, r1, 0xc /* 802C13B8 38 C0 00 00 */ li r6, 0 /* 802C13BC 4B FF C5 71 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci -/* 802C13C0 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C13C0 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C13C4 38 81 00 0C */ addi r4, r1, 0xc /* 802C13C8 C0 22 C2 50 */ lfs f1, lit_4187(r2) /* 802C13CC 38 A0 00 00 */ li r5, 0 /* 802C13D0 4B FF C5 8D */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi /* 802C13D4 FF E0 08 90 */ fmr f31, f1 -/* 802C13D8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C13D8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C13DC 38 81 00 0C */ addi r4, r1, 0xc /* 802C13E0 38 A0 00 00 */ li r5, 0 /* 802C13E4 4B FF C6 61 */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802C13E8 FF C0 08 90 */ fmr f30, f1 -/* 802C13EC 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C13EC 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C13F0 38 81 00 0C */ addi r4, r1, 0xc /* 802C13F4 38 A0 00 00 */ li r5, 0 /* 802C13F8 4B FF C7 4D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci /* 802C13FC FC 60 08 90 */ fmr f3, f1 -/* 802C1400 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C1400 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C1404 7C 64 1B 78 */ mr r4, r3 /* 802C1408 38 A0 00 07 */ li r5, 7 /* 802C140C FC 20 F8 90 */ fmr f1, f31 diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s index e91b350ba8..b73d92f76b 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc.s @@ -41,7 +41,7 @@ lbl_802C110C: /* 802C11A8 41 82 00 08 */ beq lbl_802C11B0 /* 802C11AC 38 9D 00 90 */ addi r4, r29, 0x90 lbl_802C11B0: -/* 802C11B0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C11B0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C11B4 48 01 AF A9 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802C11B8 48 00 01 3C */ b lbl_802C12F4 lbl_802C11BC: @@ -57,7 +57,7 @@ lbl_802C11BC: /* 802C11E0 41 82 00 08 */ beq lbl_802C11E8 /* 802C11E4 38 9D 00 90 */ addi r4, r29, 0x90 lbl_802C11E8: -/* 802C11E8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C11E8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C11EC 48 01 AD 61 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802C11F0 48 00 01 04 */ b lbl_802C12F4 /* 802C11F4 28 1F 00 00 */ cmplwi r31, 0 @@ -121,7 +121,7 @@ lbl_802C11E8: /* 802C12DC 40 82 00 18 */ bne lbl_802C12F4 /* 802C12E0 38 00 00 01 */ li r0, 1 /* 802C12E4 98 1D 00 A3 */ stb r0, 0xa3(r29) -/* 802C12E8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C12E8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C12EC 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) /* 802C12F0 4B FF 38 0D */ bl setBattleLastHit__8Z2SeqMgrFUc lbl_802C12F4: diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s index ffba43302d..ef2bcd528f 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc.s @@ -7,11 +7,11 @@ lbl_802C0AF8: /* 802C0B0C 3C 05 FF FB */ addis r0, r5, 0xfffb /* 802C0B10 28 00 01 F0 */ cmplwi r0, 0x1f0 /* 802C0B14 40 82 00 2C */ bne lbl_802C0B40 -/* 802C0B18 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802C0B18 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802C0B1C 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802C0B20 28 00 00 02 */ cmplwi r0, 2 /* 802C0B24 41 82 00 14 */ beq lbl_802C0B38 -/* 802C0B28 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802C0B28 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802C0B2C 88 04 00 1C */ lbz r0, 0x1c(r4) /* 802C0B30 28 00 00 00 */ cmplwi r0, 0 /* 802C0B34 40 82 00 0C */ bne lbl_802C0B40 diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s index d73cd7b2a0..e657c9dfdb 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__10Z2CreatureF10JAISoundIDSc.s @@ -22,7 +22,7 @@ lbl_802C0A94: /* 802C0A98 7C 04 00 00 */ cmpw r4, r0 /* 802C0A9C 40 80 00 1C */ bge lbl_802C0AB8 lbl_802C0AA0: -/* 802C0AA0 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 802C0AA0 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 802C0AA4 48 00 C4 E5 */ bl isMidnaSpeak__12Z2SpeechMgr2Fv /* 802C0AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C0AAC 41 82 00 0C */ beq lbl_802C0AB8 diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s index 69d2ffdbb2..6e3175a28b 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc.s @@ -7,7 +7,7 @@ lbl_802C168C: /* 802C16A0 7C 7E 1B 78 */ mr r30, r3 /* 802C16A4 7C 9F 23 78 */ mr r31, r4 /* 802C16A8 7C A6 2B 78 */ mr r6, r5 -/* 802C16AC 80 8D 86 04 */ lwz r4, data_80450B84(r13) +/* 802C16AC 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) /* 802C16B0 80 64 00 00 */ lwz r3, 0(r4) /* 802C16B4 28 03 00 00 */ cmplwi r3, 0 /* 802C16B8 41 82 00 10 */ beq lbl_802C16C8 @@ -158,7 +158,7 @@ lbl_802C1854: /* 802C18AC 40 82 00 64 */ bne lbl_802C1910 /* 802C18B0 38 00 00 01 */ li r0, 1 /* 802C18B4 98 1E 00 A3 */ stb r0, 0xa3(r30) -/* 802C18B8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C18B8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C18BC 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) /* 802C18C0 4B FF 32 3D */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C18C4 48 00 00 4C */ b lbl_802C1910 @@ -168,7 +168,7 @@ lbl_802C1854: /* 802C18D4 40 82 00 3C */ bne lbl_802C1910 /* 802C18D8 38 00 00 01 */ li r0, 1 /* 802C18DC 98 1E 00 A3 */ stb r0, 0xa3(r30) -/* 802C18E0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C18E0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C18E4 88 8D 82 E9 */ lbz r4, struct_80450868+0x1(r13) /* 802C18E8 4B FF 32 15 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C18EC 48 00 00 24 */ b lbl_802C1910 diff --git a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s index 0fd129b914..6712b6d047 100644 --- a/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2Creature/startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc.s @@ -19,7 +19,7 @@ lbl_802C0F18: /* 802C0F18 88 1E 00 A2 */ lbz r0, 0xa2(r30) /* 802C0F1C 28 00 00 00 */ cmplwi r0, 0 /* 802C0F20 40 82 00 14 */ bne lbl_802C0F34 -/* 802C0F24 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C0F24 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C0F28 4B FE AA 39 */ bl decrCrowdSize__7Z2SeMgrFv /* 802C0F2C 38 00 00 01 */ li r0, 1 /* 802C0F30 98 1E 00 A2 */ stb r0, 0xa2(r30) diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/__ct__10Z2EnvSeMgrFv.s b/asm/Z2AudioLib/Z2EnvSeMgr/__ct__10Z2EnvSeMgrFv.s index ab429814f1..08631f14cc 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/__ct__10Z2EnvSeMgrFv.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/__ct__10Z2EnvSeMgrFv.s @@ -4,7 +4,7 @@ lbl_802C611C: /* 802C6124 90 01 00 14 */ stw r0, 0x14(r1) /* 802C6128 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C612C 7C 7F 1B 78 */ mr r31, r3 -/* 802C6130 93 ED 85 BC */ stw r31, data_80450B3C(r13) +/* 802C6130 93 ED 85 BC */ stw r31, __OSReport_disable-0x5C(r13) /* 802C6134 4B FF FD 99 */ bl __ct__14Z2EnvSeAutoPanFv /* 802C6138 38 7F 00 1C */ addi r3, r31, 0x1c /* 802C613C 4B FF FD 91 */ bl __ct__14Z2EnvSeAutoPanFv diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/__dt__10Z2EnvSeMgrFv.s b/asm/Z2AudioLib/Z2EnvSeMgr/__dt__10Z2EnvSeMgrFv.s index 1f604efe9b..cc8edd9a5f 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/__dt__10Z2EnvSeMgrFv.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/__dt__10Z2EnvSeMgrFv.s @@ -75,11 +75,11 @@ lbl_802C6540: /* 802C6664 4B FF F8 C5 */ bl __dt__14Z2EnvSeAutoPanFv /* 802C6668 28 1E 00 00 */ cmplwi r30, 0 /* 802C666C 41 82 00 18 */ beq lbl_802C6684 -/* 802C6670 80 0D 85 BC */ lwz r0, data_80450B3C(r13) +/* 802C6670 80 0D 85 BC */ lwz r0, __OSReport_disable-0x5C(r13) /* 802C6674 7C 00 F0 40 */ cmplw r0, r30 /* 802C6678 40 82 00 0C */ bne lbl_802C6684 /* 802C667C 38 00 00 00 */ li r0, 0 -/* 802C6680 90 0D 85 BC */ stw r0, data_80450B3C(r13) +/* 802C6680 90 0D 85 BC */ stw r0, __OSReport_disable-0x5C(r13) lbl_802C6684: /* 802C6684 7F E0 07 35 */ extsh. r0, r31 /* 802C6688 40 81 00 0C */ ble lbl_802C6694 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/calcPan__10Z2EnvSeDirFf.s b/asm/Z2AudioLib/Z2EnvSeMgr/calcPan__10Z2EnvSeDirFf.s index 9c2500edc3..f75417abee 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/calcPan__10Z2EnvSeDirFf.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/calcPan__10Z2EnvSeDirFf.s @@ -28,7 +28,7 @@ lbl_802C5D9C: /* 802C5E04 4B FD D1 11 */ bl moveDolby__18JAISoundParamsMoveFfUl /* 802C5E08 48 00 00 74 */ b lbl_802C5E7C lbl_802C5E0C: -/* 802C5E0C 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C5E0C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C5E10 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E14 7C 85 23 78 */ mr r5, r4 /* 802C5E18 38 C0 00 00 */ li r6, 0 @@ -36,12 +36,12 @@ lbl_802C5E0C: /* 802C5E20 38 7F 00 10 */ addi r3, r31, 0x10 /* 802C5E24 7C 64 1B 78 */ mr r4, r3 /* 802C5E28 48 07 3C 09 */ bl JMAFastVECNormalize__FPC3VecP3Vec -/* 802C5E2C 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C5E2C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C5E30 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E34 38 A0 00 00 */ li r5, 0 /* 802C5E38 4B FF 7C 0D */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802C5E3C D0 3F 00 08 */ stfs f1, 8(r31) -/* 802C5E40 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C5E40 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C5E44 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E48 38 A0 00 00 */ li r5, 0 /* 802C5E4C 4B FF 7C F9 */ bl calcRelPosDolby__10Z2AudienceFRC3Veci diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/framework__10Z2EnvSeMgrFv.s b/asm/Z2AudioLib/Z2EnvSeMgr/framework__10Z2EnvSeMgrFv.s index 91f9126772..5090655005 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/framework__10Z2EnvSeMgrFv.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/framework__10Z2EnvSeMgrFv.s @@ -9,7 +9,7 @@ lbl_802C66B0: /* 802C66CC 39 61 00 30 */ addi r11, r1, 0x30 /* 802C66D0 48 09 BB 0D */ bl _savegpr_29 /* 802C66D4 7C 7F 1B 78 */ mr r31, r3 -/* 802C66D8 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C66D8 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C66DC 83 C3 00 04 */ lwz r30, 4(r3) /* 802C66E0 88 1F 00 7C */ lbz r0, 0x7c(r31) /* 802C66E4 7C 00 07 75 */ extsb. r0, r0 @@ -59,7 +59,7 @@ lbl_802C676C: /* 802C6780 38 00 00 00 */ li r0, 0 /* 802C6784 98 1F 01 40 */ stb r0, 0x140(r31) lbl_802C6788: -/* 802C6788 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C6788 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C678C 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802C6790 28 00 00 00 */ cmplwi r0, 0 /* 802C6794 41 82 00 70 */ beq lbl_802C6804 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc.s b/asm/Z2AudioLib/Z2EnvSeMgr/initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc.s index 8d2e3ada31..ef1cc0696c 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc.s @@ -419,7 +419,7 @@ lbl_802C9ADC: /* 802C9AE8 D0 1B 02 8C */ stfs f0, 0x28c(r27) /* 802C9AEC 48 00 04 54 */ b lbl_802C9F40 lbl_802C9AF0: -/* 802C9AF0 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C9AF0 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C9AF4 80 03 00 04 */ lwz r0, 4(r3) /* 802C9AF8 2C 00 00 2E */ cmpwi r0, 0x2e /* 802C9AFC 40 82 04 44 */ bne lbl_802C9F40 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/playSceneEnvSe__10Z2EnvSeMgrFv.s b/asm/Z2AudioLib/Z2EnvSeMgr/playSceneEnvSe__10Z2EnvSeMgrFv.s index e998da6b71..32b73b9b82 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/playSceneEnvSe__10Z2EnvSeMgrFv.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/playSceneEnvSe__10Z2EnvSeMgrFv.s @@ -11,7 +11,7 @@ lbl_802C6C1C: /* 802C6C40 88 1F 01 B8 */ lbz r0, 0x1b8(r31) /* 802C6C44 2C 00 00 64 */ cmpwi r0, 0x64 /* 802C6C48 41 82 00 20 */ beq lbl_802C6C68 -/* 802C6C4C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C6C4C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C6C50 88 63 00 0C */ lbz r3, 0xc(r3) /* 802C6C54 7C 63 07 74 */ extsb r3, r3 /* 802C6C58 4B D6 64 15 */ bl dComIfGp_getReverb__Fi diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec.s b/asm/Z2AudioLib/Z2EnvSeMgr/registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec.s index c1e0cbe5a9..356f09d1f0 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec.s @@ -30,7 +30,7 @@ lbl_802C9F58: /* 802C9FC8 4B FE 4B A9 */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec /* 802C9FCC 48 00 07 B0 */ b lbl_802CA77C lbl_802C9FD0: -/* 802C9FD0 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C9FD0 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C9FD4 88 03 00 0C */ lbz r0, 0xc(r3) /* 802C9FD8 7C 00 07 74 */ extsb r0, r0 /* 802C9FDC 28 00 00 0D */ cmplwi r0, 0xd diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/setHyrulSewerOpen__10Z2EnvSeMgrFb.s b/asm/Z2AudioLib/Z2EnvSeMgr/setHyrulSewerOpen__10Z2EnvSeMgrFb.s index 237b263c63..58ebab41bb 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/setHyrulSewerOpen__10Z2EnvSeMgrFb.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/setHyrulSewerOpen__10Z2EnvSeMgrFb.s @@ -9,7 +9,7 @@ lbl_802C8258: /* 802C8274 3C 60 00 09 */ lis r3, 0x0009 /* 0x00090027@ha */ /* 802C8278 38 03 00 27 */ addi r0, r3, 0x0027 /* 0x00090027@l */ /* 802C827C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C8280 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C8280 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C8284 38 81 00 0C */ addi r4, r1, 0xc /* 802C8288 38 A0 00 00 */ li r5, 0 /* 802C828C 38 C0 00 00 */ li r6, 0 @@ -27,7 +27,7 @@ lbl_802C82B0: /* 802C82B8 3C 60 00 09 */ lis r3, 0x0009 /* 0x00090028@ha */ /* 802C82BC 38 03 00 28 */ addi r0, r3, 0x0028 /* 0x00090028@l */ /* 802C82C0 90 01 00 08 */ stw r0, 8(r1) -/* 802C82C4 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C82C4 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C82C8 38 81 00 08 */ addi r4, r1, 8 /* 802C82CC 38 A0 00 00 */ li r5, 0 /* 802C82D0 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl.s b/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl.s index 0014c5dab9..038f61802e 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl.s @@ -24,7 +24,7 @@ lbl_802C5AB4: /* 802C5B0C FF A0 20 90 */ fmr f29, f4 /* 802C5B10 FF C0 28 90 */ fmr f30, f5 /* 802C5B14 7C BF 2B 78 */ mr r31, r5 -/* 802C5B18 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C5B18 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C5B1C 88 03 00 0C */ lbz r0, 0xc(r3) /* 802C5B20 28 00 00 00 */ cmplwi r0, 0 /* 802C5B24 41 82 00 0C */ beq lbl_802C5B30 @@ -56,7 +56,7 @@ lbl_802C5B30: lbl_802C5B88: /* 802C5B88 80 1D 00 00 */ lwz r0, 0(r29) /* 802C5B8C 90 01 00 08 */ stw r0, 8(r1) -/* 802C5B90 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C5B90 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C5B94 38 81 00 08 */ addi r4, r1, 8 /* 802C5B98 38 BE 00 04 */ addi r5, r30, 4 /* 802C5B9C 80 DE 00 00 */ lwz r6, 0(r30) @@ -68,14 +68,14 @@ lbl_802C5B88: /* 802C5BB4 C0 02 C3 44 */ lfs f0, lit_3502(r2) /* 802C5BB8 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 802C5BBC 40 80 00 1C */ bge lbl_802C5BD8 -/* 802C5BC0 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802C5BC0 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802C5BC4 3C A0 80 3A */ lis r5, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */ /* 802C5BC8 38 A5 AB B8 */ addi r5, r5, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */ /* 802C5BCC 38 A5 02 00 */ addi r5, r5, 0x200 /* 802C5BD0 4B FE 46 A1 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802C5BD4 48 00 00 18 */ b lbl_802C5BEC lbl_802C5BD8: -/* 802C5BD8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802C5BD8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802C5BDC 3C A0 80 3A */ lis r5, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */ /* 802C5BE0 38 A5 AB B8 */ addi r5, r5, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */ /* 802C5BE4 38 A5 03 F8 */ addi r5, r5, 0x3f8 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl.s b/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl.s index a6066751b7..1c234ecc70 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl.s @@ -24,7 +24,7 @@ lbl_802C5908: /* 802C5960 FF A0 20 90 */ fmr f29, f4 /* 802C5964 FF C0 28 90 */ fmr f30, f5 /* 802C5968 7C BF 2B 78 */ mr r31, r5 -/* 802C596C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C596C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C5970 88 03 00 0C */ lbz r0, 0xc(r3) /* 802C5974 28 00 00 00 */ cmplwi r0, 0 /* 802C5978 41 82 00 0C */ beq lbl_802C5984 @@ -56,7 +56,7 @@ lbl_802C5984: lbl_802C59DC: /* 802C59DC 80 1E 00 00 */ lwz r0, 0(r30) /* 802C59E0 90 01 00 08 */ stw r0, 8(r1) -/* 802C59E4 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C59E4 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C59E8 38 81 00 08 */ addi r4, r1, 8 /* 802C59EC 38 BD 00 04 */ addi r5, r29, 4 /* 802C59F0 80 DD 00 00 */ lwz r6, 0(r29) @@ -78,14 +78,14 @@ lbl_802C59DC: /* 802C5A30 C0 02 C3 44 */ lfs f0, lit_3502(r2) /* 802C5A34 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 802C5A38 40 80 00 1C */ bge lbl_802C5A54 -/* 802C5A3C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802C5A3C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802C5A40 3C A0 80 3A */ lis r5, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */ /* 802C5A44 38 A5 AB B8 */ addi r5, r5, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */ /* 802C5A48 38 A5 02 00 */ addi r5, r5, 0x200 /* 802C5A4C 4B FE 48 25 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802C5A50 48 00 00 18 */ b lbl_802C5A68 lbl_802C5A54: -/* 802C5A54 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802C5A54 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802C5A58 3C A0 80 3A */ lis r5, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */ /* 802C5A5C 38 A5 AB B8 */ addi r5, r5, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */ /* 802C5A60 38 A5 03 F8 */ addi r5, r5, 0x3f8 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startEtcSe__10Z2EnvSeMgrFSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/startEtcSe__10Z2EnvSeMgrFSc.s index 59be1cadc7..c43b1ffd61 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startEtcSe__10Z2EnvSeMgrFSc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startEtcSe__10Z2EnvSeMgrFSc.s @@ -227,11 +227,11 @@ lbl_802C8F80: /* 802C8FB0 4B FF CB 05 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8FB4 7C 7D 1B 78 */ mr r29, r3 /* 802C8FB8 48 00 02 BC */ b lbl_802C9274 -/* 802C8FBC 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802C8FBC 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802C8FC0 80 04 00 10 */ lwz r0, 0x10(r4) /* 802C8FC4 28 00 00 06 */ cmplwi r0, 6 /* 802C8FC8 40 82 00 CC */ bne lbl_802C9094 -/* 802C8FCC 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C8FCC 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C8FD0 80 03 00 04 */ lwz r0, 4(r3) /* 802C8FD4 2C 00 00 10 */ cmpwi r0, 0x10 /* 802C8FD8 40 82 00 14 */ bne lbl_802C8FEC @@ -266,7 +266,7 @@ lbl_802C9028: /* 802C903C 38 7F 01 F0 */ addi r3, r31, 0x1f0 /* 802C9040 4B FE 5D 81 */ bl getDolbyPower__12Z2MultiSeMgrFv /* 802C9044 FF 80 08 90 */ fmr f28, f1 -/* 802C9048 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C9048 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C904C 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802C9050 28 00 00 00 */ cmplwi r0, 0 /* 802C9054 41 82 00 0C */ beq lbl_802C9060 @@ -287,7 +287,7 @@ lbl_802C9060: /* 802C908C 4B FF D0 55 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C9090 48 00 00 1C */ b lbl_802C90AC lbl_802C9094: -/* 802C9094 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C9094 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C9098 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802C909C 28 00 00 00 */ cmplwi r0, 0 /* 802C90A0 41 82 00 0C */ beq lbl_802C90AC diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startFogWipeTrigger__10Z2EnvSeMgrFP3Vec.s b/asm/Z2AudioLib/Z2EnvSeMgr/startFogWipeTrigger__10Z2EnvSeMgrFP3Vec.s index 48ff76c041..06bfb9fac8 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startFogWipeTrigger__10Z2EnvSeMgrFP3Vec.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startFogWipeTrigger__10Z2EnvSeMgrFP3Vec.s @@ -22,7 +22,7 @@ lbl_802C92EC: /* 802C933C 3C 60 00 09 */ lis r3, 0x0009 /* 0x00090035@ha */ /* 802C9340 38 03 00 35 */ addi r0, r3, 0x0035 /* 0x00090035@l */ /* 802C9344 90 01 00 08 */ stw r0, 8(r1) -/* 802C9348 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C9348 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C934C 38 81 00 08 */ addi r4, r1, 8 /* 802C9350 38 BE 02 10 */ addi r5, r30, 0x210 /* 802C9354 7F E6 FB 78 */ mr r6, r31 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startLv3WaterSe__10Z2EnvSeMgrFSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/startLv3WaterSe__10Z2EnvSeMgrFSc.s index 906b9134e3..5cf4c296bb 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startLv3WaterSe__10Z2EnvSeMgrFSc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startLv3WaterSe__10Z2EnvSeMgrFSc.s @@ -12,7 +12,7 @@ lbl_802CA794: /* 802CA7BC 93 C1 00 48 */ stw r30, 0x48(r1) /* 802CA7C0 7C 7E 1B 78 */ mr r30, r3 /* 802CA7C4 7C 9F 23 78 */ mr r31, r4 -/* 802CA7C8 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802CA7C8 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802CA7CC 80 03 00 04 */ lwz r0, 4(r3) /* 802CA7D0 2C 00 00 2E */ cmpwi r0, 0x2e /* 802CA7D4 40 82 00 18 */ bne lbl_802CA7EC diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startRainSe__10Z2EnvSeMgrFlSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/startRainSe__10Z2EnvSeMgrFlSc.s index 6602358cbc..02ff4d7059 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startRainSe__10Z2EnvSeMgrFlSc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startRainSe__10Z2EnvSeMgrFlSc.s @@ -168,7 +168,7 @@ lbl_802C7980: /* 802C7AB0 38 60 00 01 */ li r3, 1 /* 802C7AB4 4B FE 1C 41 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign /* 802C7AB8 FE E0 08 90 */ fmr f23, f1 -/* 802C7ABC 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C7ABC 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C7AC0 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802C7AC4 28 00 00 00 */ cmplwi r0, 0 /* 802C7AC8 41 82 00 10 */ beq lbl_802C7AD8 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startRiverSe__10Z2EnvSeMgrFSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/startRiverSe__10Z2EnvSeMgrFSc.s index 86e0e7468d..ebad606408 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startRiverSe__10Z2EnvSeMgrFSc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startRiverSe__10Z2EnvSeMgrFSc.s @@ -16,11 +16,11 @@ lbl_802C8300: /* 802C8338 48 09 9E A5 */ bl _savegpr_29 /* 802C833C 7C 7F 1B 78 */ mr r31, r3 /* 802C8340 7C 9D 23 78 */ mr r29, r4 -/* 802C8344 80 AD 85 FC */ lwz r5, data_80450B7C(r13) +/* 802C8344 80 AD 85 FC */ lwz r5, __OSReport_disable-0x1C(r13) /* 802C8348 80 05 00 10 */ lwz r0, 0x10(r5) /* 802C834C 28 00 00 06 */ cmplwi r0, 6 /* 802C8350 40 82 00 5C */ bne lbl_802C83AC -/* 802C8354 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802C8354 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802C8358 80 64 00 04 */ lwz r3, 4(r4) /* 802C835C 38 03 FF FB */ addi r0, r3, -5 /* 802C8360 28 00 00 29 */ cmplwi r0, 0x29 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/startStaticEnvSe__10Z2EnvSeMgrFSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/startStaticEnvSe__10Z2EnvSeMgrFSc.s index e99e80122e..2abad6212a 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr/startStaticEnvSe__10Z2EnvSeMgrFSc.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr/startStaticEnvSe__10Z2EnvSeMgrFSc.s @@ -62,12 +62,12 @@ lbl_802C719C: /* 802C71B4 C0 1F 00 50 */ lfs f0, 0x50(r31) /* 802C71B8 FC 02 00 00 */ fcmpu cr0, f2, f0 /* 802C71BC 41 82 00 2C */ beq lbl_802C71E8 -/* 802C71C0 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C71C0 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C71C4 38 9F 00 3C */ addi r4, r31, 0x3c /* 802C71C8 38 A1 00 78 */ addi r5, r1, 0x78 /* 802C71CC 38 C0 00 00 */ li r6, 0 /* 802C71D0 4B FF 67 5D */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci -/* 802C71D4 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802C71D4 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802C71D8 38 81 00 78 */ addi r4, r1, 0x78 /* 802C71DC C0 3F 00 50 */ lfs f1, 0x50(r31) /* 802C71E0 38 A0 00 00 */ li r5, 0 @@ -80,7 +80,7 @@ lbl_802C71E8: /* 802C71F8 C0 1F 00 4C */ lfs f0, 0x4c(r31) /* 802C71FC FF 80 00 90 */ fmr f28, f0 /* 802C7200 FF 60 00 90 */ fmr f27, f0 -/* 802C7204 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C7204 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C7208 88 83 00 00 */ lbz r4, 0(r3) /* 802C720C 88 1F 00 38 */ lbz r0, 0x38(r31) /* 802C7210 28 00 00 0B */ cmplwi r0, 0xb @@ -380,7 +380,7 @@ lbl_802C7668: /* 802C7684 C0 02 C3 44 */ lfs f0, lit_3502(r2) /* 802C7688 EC 00 08 28 */ fsubs f0, f0, f1 /* 802C768C EF BD 00 32 */ fmuls f29, f29, f0 -/* 802C7690 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C7690 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C7694 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802C7698 28 00 00 00 */ cmplwi r0, 0 /* 802C769C 41 82 00 10 */ beq lbl_802C76AC @@ -440,7 +440,7 @@ lbl_802C7710: /* 802C7768 80 1F 00 04 */ lwz r0, 4(r31) /* 802C776C 28 00 00 00 */ cmplwi r0, 0 /* 802C7770 41 82 00 1C */ beq lbl_802C778C -/* 802C7774 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C7774 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C7778 38 A0 00 06 */ li r5, 6 /* 802C777C 88 DF 01 41 */ lbz r6, 0x141(r31) /* 802C7780 7C C6 07 74 */ extsb r6, r6 @@ -450,7 +450,7 @@ lbl_802C778C: /* 802C778C 80 1C 00 00 */ lwz r0, 0(r28) /* 802C7790 28 00 00 00 */ cmplwi r0, 0 /* 802C7794 41 82 00 20 */ beq lbl_802C77B4 -/* 802C7798 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C7798 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C779C 7F 84 E3 78 */ mr r4, r28 /* 802C77A0 38 A0 00 06 */ li r5, 6 /* 802C77A4 88 DF 01 41 */ lbz r6, 0x141(r31) diff --git a/asm/Z2AudioLib/Z2FxLineMgr/__ct__11Z2FxLineMgrFv.s b/asm/Z2AudioLib/Z2FxLineMgr/__ct__11Z2FxLineMgrFv.s index 29394a0e2c..c6bde0d080 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr/__ct__11Z2FxLineMgrFv.s +++ b/asm/Z2AudioLib/Z2FxLineMgr/__ct__11Z2FxLineMgrFv.s @@ -1,5 +1,5 @@ lbl_802BA7DC: -/* 802BA7DC 90 6D 85 C0 */ stw r3, data_80450B40(r13) +/* 802BA7DC 90 6D 85 C0 */ stw r3, __OSReport_disable-0x58(r13) /* 802BA7E0 38 80 00 00 */ li r4, 0 /* 802BA7E4 90 83 00 00 */ stw r4, 0(r3) /* 802BA7E8 38 00 FF FF */ li r0, -1 diff --git a/asm/Z2AudioLib/Z2FxLineMgr/setSceneFx__11Z2FxLineMgrFl.s b/asm/Z2AudioLib/Z2FxLineMgr/setSceneFx__11Z2FxLineMgrFl.s index 424d2a908b..8d41554039 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr/setSceneFx__11Z2FxLineMgrFl.s +++ b/asm/Z2AudioLib/Z2FxLineMgr/setSceneFx__11Z2FxLineMgrFl.s @@ -2,7 +2,7 @@ lbl_802BAEB8: /* 802BAEB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BAEBC 7C 08 02 A6 */ mflr r0 /* 802BAEC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BAEC4 80 AD 86 00 */ lwz r5, data_80450B80(r13) +/* 802BAEC4 80 AD 86 00 */ lwz r5, __OSReport_disable-0x18(r13) /* 802BAEC8 88 05 00 1E */ lbz r0, 0x1e(r5) /* 802BAECC 28 00 00 00 */ cmplwi r0, 0 /* 802BAED0 41 82 00 18 */ beq lbl_802BAEE8 diff --git a/asm/Z2AudioLib/Z2FxLineMgr/setUnderWaterFx__11Z2FxLineMgrFb.s b/asm/Z2AudioLib/Z2FxLineMgr/setUnderWaterFx__11Z2FxLineMgrFb.s index 493a01d82d..9ae3c40f70 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr/setUnderWaterFx__11Z2FxLineMgrFb.s +++ b/asm/Z2AudioLib/Z2FxLineMgr/setUnderWaterFx__11Z2FxLineMgrFb.s @@ -18,7 +18,7 @@ lbl_802BAE48: /* 802BAE88 4B FF FD A1 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAE8C 48 00 00 10 */ b lbl_802BAE9C lbl_802BAE90: -/* 802BAE90 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802BAE90 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802BAE94 80 84 00 04 */ lwz r4, 4(r4) /* 802BAE98 48 00 00 21 */ bl setSceneFx__11Z2FxLineMgrFl lbl_802BAE9C: diff --git a/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureLinkFv.s b/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureLinkFv.s deleted file mode 100644 index 24e4bda9ec..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureLinkFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_802C333C: -/* 802C333C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C3340 7C 08 02 A6 */ mflr r0 -/* 802C3344 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C3348 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C334C 7C 7F 1B 78 */ mr r31, r3 -/* 802C3350 4B FF D0 79 */ bl __ct__10Z2CreatureFv -/* 802C3354 38 7F 00 90 */ addi r3, r31, 0x90 -/* 802C3358 48 00 15 91 */ bl __ct__18Z2LinkSoundStarterFv -/* 802C335C 3C 60 80 3D */ lis r3, __vt__14Z2CreatureLink@ha /* 0x803CB980@ha */ -/* 802C3360 38 63 B9 80 */ addi r3, r3, __vt__14Z2CreatureLink@l /* 0x803CB980@l */ -/* 802C3364 90 7F 00 00 */ stw r3, 0(r31) -/* 802C3368 38 03 00 30 */ addi r0, r3, 0x30 -/* 802C336C 90 1F 00 90 */ stw r0, 0x90(r31) -/* 802C3370 38 7F 00 94 */ addi r3, r31, 0x94 -/* 802C3374 4B FF B4 D1 */ bl __ct__16Z2SoundObjSimpleFv -/* 802C3378 38 60 00 00 */ li r3, 0 -/* 802C337C 98 7F 00 C0 */ stb r3, 0xc0(r31) -/* 802C3380 93 ED 8D E0 */ stw r31, mLinkPtr__14Z2CreatureLink(r13) -/* 802C3384 38 00 00 FF */ li r0, 0xff -/* 802C3388 98 1F 00 C1 */ stb r0, 0xc1(r31) -/* 802C338C 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C3390 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 -/* 802C3394 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C3398 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C339C 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 802C33A0 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C33A4 98 7F 00 C2 */ stb r3, 0xc2(r31) -/* 802C33A8 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C33AC 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a -/* 802C33B0 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C33B4 7F E3 FB 78 */ mr r3, r31 -/* 802C33B8 7F E4 FB 78 */ mr r4, r31 -/* 802C33BC 28 1F 00 00 */ cmplwi r31, 0 -/* 802C33C0 41 82 00 08 */ beq lbl_802C33C8 -/* 802C33C4 38 9F 00 90 */ addi r4, r31, 0x90 -lbl_802C33C8: -/* 802C33C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802C33CC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802C33D0 7D 89 03 A6 */ mtctr r12 -/* 802C33D4 4E 80 04 21 */ bctrl -/* 802C33D8 7F E0 FB 78 */ mr r0, r31 -/* 802C33DC 28 1F 00 00 */ cmplwi r31, 0 -/* 802C33E0 41 82 00 08 */ beq lbl_802C33E8 -/* 802C33E4 38 1F 00 90 */ addi r0, r31, 0x90 -lbl_802C33E8: -/* 802C33E8 90 1F 00 A8 */ stw r0, 0xa8(r31) -/* 802C33EC 38 60 00 00 */ li r3, 0 -/* 802C33F0 98 7F 00 C3 */ stb r3, 0xc3(r31) -/* 802C33F4 98 7F 00 C4 */ stb r3, 0xc4(r31) -/* 802C33F8 98 7F 00 C5 */ stb r3, 0xc5(r31) -/* 802C33FC 98 7F 00 C6 */ stb r3, 0xc6(r31) -/* 802C3400 98 7F 00 C7 */ stb r3, 0xc7(r31) -/* 802C3404 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C3408 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b -/* 802C340C 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C3410 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C3414 50 60 1F 38 */ rlwimi r0, r3, 3, 0x1c, 0x1c -/* 802C3418 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C341C 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C3420 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d -/* 802C3424 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C3428 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C342C 50 60 0F BC */ rlwimi r0, r3, 1, 0x1e, 0x1e -/* 802C3430 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C3434 88 1F 00 CB */ lbz r0, 0xcb(r31) -/* 802C3438 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 802C343C 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802C3440 88 1F 00 CC */ lbz r0, 0xcc(r31) -/* 802C3444 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 802C3448 98 1F 00 CC */ stb r0, 0xcc(r31) -/* 802C344C 7F E3 FB 78 */ mr r3, r31 -/* 802C3450 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C3454 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C3458 7C 08 03 A6 */ mtlr r0 -/* 802C345C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3460 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureRideFv.s b/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureRideFv.s deleted file mode 100644 index 5d1c352ae3..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureRideFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802C4FFC: -/* 802C4FFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C5000 7C 08 02 A6 */ mflr r0 -/* 802C5004 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C5008 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C500C 7C 7F 1B 78 */ mr r31, r3 -/* 802C5010 4B FF B3 B9 */ bl __ct__10Z2CreatureFv -/* 802C5014 38 7F 00 90 */ addi r3, r31, 0x90 -/* 802C5018 7F E4 FB 78 */ mr r4, r31 -/* 802C501C 48 00 02 19 */ bl __ct__18Z2RideSoundStarterFP14Z2CreatureRide -/* 802C5020 3C 60 80 3D */ lis r3, __vt__14Z2CreatureRide@ha /* 0x803CB924@ha */ -/* 802C5024 38 63 B9 24 */ addi r3, r3, __vt__14Z2CreatureRide@l /* 0x803CB924@l */ -/* 802C5028 90 7F 00 00 */ stw r3, 0(r31) -/* 802C502C 38 03 00 30 */ addi r0, r3, 0x30 -/* 802C5030 90 1F 00 90 */ stw r0, 0x90(r31) -/* 802C5034 38 00 00 00 */ li r0, 0 -/* 802C5038 98 1F 00 98 */ stb r0, 0x98(r31) -/* 802C503C 7F E3 FB 78 */ mr r3, r31 -/* 802C5040 7F E4 FB 78 */ mr r4, r31 -/* 802C5044 28 1F 00 00 */ cmplwi r31, 0 -/* 802C5048 41 82 00 08 */ beq lbl_802C5050 -/* 802C504C 38 9F 00 90 */ addi r4, r31, 0x90 -lbl_802C5050: -/* 802C5050 81 83 00 00 */ lwz r12, 0(r3) -/* 802C5054 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802C5058 7D 89 03 A6 */ mtctr r12 -/* 802C505C 4E 80 04 21 */ bctrl -/* 802C5060 7F E3 FB 78 */ mr r3, r31 -/* 802C5064 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C5068 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C506C 7C 08 03 A6 */ mtlr r0 -/* 802C5070 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5074 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureLinkFv.s b/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureLinkFv.s index bf204c7443..8e8b7cd991 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureLinkFv.s +++ b/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureLinkFv.s @@ -41,11 +41,11 @@ lbl_802C3564: /* 802C3598 41 82 00 08 */ beq lbl_802C35A0 /* 802C359C 38 63 FF FC */ addi r3, r3, -4 lbl_802C35A0: -/* 802C35A0 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802C35A0 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802C35A4 7C 00 18 40 */ cmplw r0, r3 /* 802C35A8 40 82 00 0C */ bne lbl_802C35B4 /* 802C35AC 38 00 00 00 */ li r0, 0 -/* 802C35B0 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802C35B0 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802C35B4: /* 802C35B4 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C35B8 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureRideFv.s b/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureRideFv.s index e76e91b37a..40eb81b2fc 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureRideFv.s +++ b/asm/Z2AudioLib/Z2LinkMgr/__dt__14Z2CreatureRideFv.s @@ -32,11 +32,11 @@ lbl_802C5114: /* 802C518C 41 82 00 08 */ beq lbl_802C5194 /* 802C5190 38 63 FF FC */ addi r3, r3, -4 lbl_802C5194: -/* 802C5194 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802C5194 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802C5198 7C 00 18 40 */ cmplw r0, r3 /* 802C519C 40 82 00 0C */ bne lbl_802C51A8 /* 802C51A0 38 00 00 00 */ li r0, 0 -/* 802C51A4 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802C51A4 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802C51A8: /* 802C51A8 38 7E 00 90 */ addi r3, r30, 0x90 /* 802C51AC 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2LinkSoundStarterFv.s b/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2LinkSoundStarterFv.s index 38389f270f..bbcba011b3 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2LinkSoundStarterFv.s +++ b/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2LinkSoundStarterFv.s @@ -20,11 +20,11 @@ lbl_802C3464: /* 802C34AC 41 82 00 08 */ beq lbl_802C34B4 /* 802C34B0 38 63 FF FC */ addi r3, r3, -4 lbl_802C34B4: -/* 802C34B4 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802C34B4 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802C34B8 7C 00 18 40 */ cmplw r0, r3 /* 802C34BC 40 82 00 0C */ bne lbl_802C34C8 /* 802C34C0 38 00 00 00 */ li r0, 0 -/* 802C34C4 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802C34C4 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802C34C8: /* 802C34C8 7F C3 F3 78 */ mr r3, r30 /* 802C34CC 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2RideSoundStarterFv.s b/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2RideSoundStarterFv.s index e4c763409a..a82c08a302 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2RideSoundStarterFv.s +++ b/asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2RideSoundStarterFv.s @@ -20,11 +20,11 @@ lbl_802C5078: /* 802C50C0 41 82 00 08 */ beq lbl_802C50C8 /* 802C50C4 38 63 FF FC */ addi r3, r3, -4 lbl_802C50C8: -/* 802C50C8 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802C50C8 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802C50CC 7C 00 18 40 */ cmplw r0, r3 /* 802C50D0 40 82 00 0C */ bne lbl_802C50DC /* 802C50D4 38 00 00 00 */ li r0, 0 -/* 802C50D8 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802C50D8 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802C50DC: /* 802C50DC 7F C3 F3 78 */ mr r3, r30 /* 802C50E0 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureLinkFv.s b/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureLinkFv.s deleted file mode 100644 index 03634eca9b..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureLinkFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802C35F8: -/* 802C35F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C35FC 7C 08 02 A6 */ mflr r0 -/* 802C3600 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C3604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C3608 7C 7F 1B 78 */ mr r31, r3 -/* 802C360C 88 03 00 B3 */ lbz r0, 0xb3(r3) -/* 802C3610 28 00 00 00 */ cmplwi r0, 0 -/* 802C3614 41 82 00 08 */ beq lbl_802C361C -/* 802C3618 48 00 01 35 */ bl deleteKantera__14Z2CreatureLinkFv -lbl_802C361C: -/* 802C361C 7F E3 FB 78 */ mr r3, r31 -/* 802C3620 4B FF CE C9 */ bl deleteObject__10Z2CreatureFv -/* 802C3624 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C3628 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C362C 7C 08 03 A6 */ mtlr r0 -/* 802C3630 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3634 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureRideFv.s b/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureRideFv.s deleted file mode 100644 index ce253a37d9..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureRideFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802C51EC: -/* 802C51EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C51F0 7C 08 02 A6 */ mflr r0 -/* 802C51F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C51F8 4B FF B2 F1 */ bl deleteObject__10Z2CreatureFv -/* 802C51FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C5200 7C 08 03 A6 */ mtlr r0 -/* 802C5204 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5208 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/framework__14Z2CreatureLinkFUlSc.s b/asm/Z2AudioLib/Z2LinkMgr/framework__14Z2CreatureLinkFUlSc.s index 200ed032f6..44f8db9edc 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/framework__14Z2CreatureLinkFUlSc.s +++ b/asm/Z2AudioLib/Z2LinkMgr/framework__14Z2CreatureLinkFUlSc.s @@ -33,7 +33,7 @@ lbl_802C37E8: /* 802C37F4 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020051@ha */ /* 802C37F8 38 03 00 51 */ addi r0, r3, 0x0051 /* 0x00020051@l */ /* 802C37FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C3800 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C3800 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C3804 38 81 00 14 */ addi r4, r1, 0x14 /* 802C3808 38 A0 00 00 */ li r5, 0 /* 802C380C 38 C0 00 00 */ li r6, 0 @@ -48,7 +48,7 @@ lbl_802C382C: /* 802C382C 88 1F 00 CB */ lbz r0, 0xcb(r31) /* 802C3830 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 802C3834 41 82 00 5C */ beq lbl_802C3890 -/* 802C3838 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C3838 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C383C C3 E3 00 1C */ lfs f31, 0x1c(r3) /* 802C3840 C0 02 C2 A0 */ lfs f0, lit_3723(r2) /* 802C3844 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -170,7 +170,7 @@ lbl_802C39C8: /* 802C39E8 C0 03 00 08 */ lfs f0, 8(r3) /* 802C39EC D0 1F 00 BC */ stfs f0, 0xbc(r31) lbl_802C39F0: -/* 802C39F0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C39F0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C39F4 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802C39F8 28 00 00 0A */ cmplwi r0, 0xa /* 802C39FC 40 82 00 10 */ bne lbl_802C3A0C diff --git a/asm/Z2AudioLib/Z2LinkMgr/func_802C4928.s b/asm/Z2AudioLib/Z2LinkMgr/func_802C4928.s index 2b7d55d5cb..ab2690ca77 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/func_802C4928.s +++ b/asm/Z2AudioLib/Z2LinkMgr/func_802C4928.s @@ -31,7 +31,7 @@ lbl_802C4928: /* 802C499C 88 03 00 CB */ lbz r0, 0xcb(r3) /* 802C49A0 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 802C49A4 41 82 00 E8 */ beq lbl_802C4A8C -/* 802C49A8 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C49A8 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C49AC C0 23 00 1C */ lfs f1, 0x1c(r3) /* 802C49B0 C0 02 C2 A0 */ lfs f0, lit_3723(r2) /* 802C49B4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -346,7 +346,7 @@ lbl_802C4DD8: /* 802C4E10 7C 7D 1B 78 */ mr r29, r3 /* 802C4E14 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802C4E18 41 82 01 24 */ beq lbl_802C4F3C -/* 802C4E1C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C4E1C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C4E20 88 03 00 16 */ lbz r0, 0x16(r3) /* 802C4E24 28 00 00 72 */ cmplwi r0, 0x72 /* 802C4E28 41 82 01 14 */ beq lbl_802C4F3C diff --git a/asm/Z2AudioLib/Z2LinkMgr/func_802C5284.s b/asm/Z2AudioLib/Z2LinkMgr/func_802C5284.s index d5b5e1f511..79ab28104e 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/func_802C5284.s +++ b/asm/Z2AudioLib/Z2LinkMgr/func_802C5284.s @@ -8,7 +8,7 @@ lbl_802C5284: /* 802C529C 48 09 CF 41 */ bl _savegpr_29 /* 802C52A0 7C 7D 1B 78 */ mr r29, r3 /* 802C52A4 FF E0 08 90 */ fmr f31, f1 -/* 802C52A8 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C52A8 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C52AC 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802C52B0 28 00 00 00 */ cmplwi r0, 0 /* 802C52B4 40 82 00 0C */ bne lbl_802C52C0 diff --git a/asm/Z2AudioLib/Z2LinkMgr/func_802C588C.s b/asm/Z2AudioLib/Z2LinkMgr/func_802C588C.s deleted file mode 100644 index ad7fac6506..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/func_802C588C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C588C: -/* 802C588C 38 63 FF 70 */ addi r3, r3, -144 -/* 802C5890 4B FF DC 70 */ b __dt__14Z2CreatureLinkFv diff --git a/asm/Z2AudioLib/Z2LinkMgr/func_802C5894.s b/asm/Z2AudioLib/Z2LinkMgr/func_802C5894.s deleted file mode 100644 index f31c02877d..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/func_802C5894.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C5894: -/* 802C5894 38 63 FF 70 */ addi r3, r3, -144 -/* 802C5898 4B FF F8 7C */ b __dt__14Z2CreatureRideFv diff --git a/asm/Z2AudioLib/Z2LinkMgr/initKantera__14Z2CreatureLinkFP3Vec.s b/asm/Z2AudioLib/Z2LinkMgr/initKantera__14Z2CreatureLinkFP3Vec.s deleted file mode 100644 index 82043053fd..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/initKantera__14Z2CreatureLinkFP3Vec.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802C3710: -/* 802C3710 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C3714 7C 08 02 A6 */ mflr r0 -/* 802C3718 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C371C 38 00 00 00 */ li r0, 0 -/* 802C3720 98 03 00 C5 */ stb r0, 0xc5(r3) -/* 802C3724 38 A0 00 02 */ li r5, 2 -/* 802C3728 81 83 00 A4 */ lwz r12, 0xa4(r3) -/* 802C372C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802C3730 7D 89 03 A6 */ mtctr r12 -/* 802C3734 38 63 00 94 */ addi r3, r3, 0x94 -/* 802C3738 4E 80 04 21 */ bctrl -/* 802C373C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C3740 7C 08 03 A6 */ mtlr r0 -/* 802C3744 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3748 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/init__14Z2CreatureLinkFP3VecP3VecP3Vec.s b/asm/Z2AudioLib/Z2LinkMgr/init__14Z2CreatureLinkFP3VecP3VecP3Vec.s deleted file mode 100644 index 4b6b482b25..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/init__14Z2CreatureLinkFP3VecP3VecP3Vec.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_802C3638: -/* 802C3638 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C363C 7C 08 02 A6 */ mflr r0 -/* 802C3640 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C3644 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C3648 93 C1 00 08 */ stw r30, 8(r1) -/* 802C364C 7C 7E 1B 78 */ mr r30, r3 -/* 802C3650 7C 9F 23 78 */ mr r31, r4 -/* 802C3654 38 E0 00 06 */ li r7, 6 -/* 802C3658 39 00 00 01 */ li r8, 1 -/* 802C365C 39 20 00 02 */ li r9, 2 -/* 802C3660 4B FF CF 51 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc -/* 802C3664 80 1E 00 04 */ lwz r0, 4(r30) -/* 802C3668 80 6D 85 C4 */ lwz r3, data_80450B44(r13) -/* 802C366C 80 63 01 D0 */ lwz r3, 0x1d0(r3) -/* 802C3670 90 03 00 14 */ stw r0, 0x14(r3) -/* 802C3674 38 00 00 FF */ li r0, 0xff -/* 802C3678 98 1E 00 C1 */ stb r0, 0xc1(r30) -/* 802C367C 38 60 00 00 */ li r3, 0 -/* 802C3680 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C3684 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 -/* 802C3688 98 1E 00 CB */ stb r0, 0xcb(r30) -/* 802C368C 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C3690 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 802C3694 98 1E 00 CB */ stb r0, 0xcb(r30) -/* 802C3698 98 7E 00 C2 */ stb r3, 0xc2(r30) -/* 802C369C 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C36A0 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a -/* 802C36A4 98 1E 00 CB */ stb r0, 0xcb(r30) -/* 802C36A8 98 7E 00 C5 */ stb r3, 0xc5(r30) -/* 802C36AC 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C36B0 50 60 0F BC */ rlwimi r0, r3, 1, 0x1e, 0x1e -/* 802C36B4 98 1E 00 CB */ stb r0, 0xcb(r30) -/* 802C36B8 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C36BC 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 802C36C0 98 1E 00 CB */ stb r0, 0xcb(r30) -/* 802C36C4 88 1E 00 CC */ lbz r0, 0xcc(r30) -/* 802C36C8 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 802C36CC 98 1E 00 CC */ stb r0, 0xcc(r30) -/* 802C36D0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 802C36D4 D0 1E 00 B4 */ stfs f0, 0xb4(r30) -/* 802C36D8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 802C36DC D0 1E 00 B8 */ stfs f0, 0xb8(r30) -/* 802C36E0 C0 1F 00 08 */ lfs f0, 8(r31) -/* 802C36E4 D0 1E 00 BC */ stfs f0, 0xbc(r30) -/* 802C36E8 98 7E 00 C8 */ stb r3, 0xc8(r30) -/* 802C36EC 98 7E 00 C9 */ stb r3, 0xc9(r30) -/* 802C36F0 38 00 FF FF */ li r0, -1 -/* 802C36F4 98 1E 00 CA */ stb r0, 0xca(r30) -/* 802C36F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C36FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C3700 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C3704 7C 08 03 A6 */ mtlr r0 -/* 802C3708 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C370C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setLinkBootsType__14Z2CreatureLinkFl.s b/asm/Z2AudioLib/Z2LinkMgr/setLinkBootsType__14Z2CreatureLinkFl.s deleted file mode 100644 index bbefa0a13a..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setLinkBootsType__14Z2CreatureLinkFl.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802C32F0: -/* 802C32F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C32F4 7C 08 02 A6 */ mflr r0 -/* 802C32F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C32FC 98 83 00 C4 */ stb r4, 0xc4(r3) -/* 802C3300 80 8D 86 00 */ lwz r4, data_80450B80(r13) -/* 802C3304 88 04 00 1D */ lbz r0, 0x1d(r4) -/* 802C3308 28 00 00 00 */ cmplwi r0, 0 -/* 802C330C 41 82 00 20 */ beq lbl_802C332C -/* 802C3310 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002005E@ha */ -/* 802C3314 38 04 00 5E */ addi r0, r4, 0x005E /* 0x0002005E@l */ -/* 802C3318 90 01 00 08 */ stw r0, 8(r1) -/* 802C331C 38 81 00 08 */ addi r4, r1, 8 -/* 802C3320 38 A0 00 00 */ li r5, 0 -/* 802C3324 38 C0 FF FF */ li r6, -1 -/* 802C3328 48 00 08 AD */ bl startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc -lbl_802C332C: -/* 802C332C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C3330 7C 08 03 A6 */ mtlr r0 -/* 802C3334 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3338 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setLinkShieldType__14Z2CreatureLinkFll.s b/asm/Z2AudioLib/Z2LinkMgr/setLinkShieldType__14Z2CreatureLinkFll.s deleted file mode 100644 index c47ed4b8e0..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setLinkShieldType__14Z2CreatureLinkFll.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802C328C: -/* 802C328C 98 83 00 C7 */ stb r4, 0xc7(r3) -/* 802C3290 20 05 00 01 */ subfic r0, r5, 1 -/* 802C3294 7C 00 00 34 */ cntlzw r0, r0 -/* 802C3298 54 04 D9 7E */ srwi r4, r0, 5 -/* 802C329C 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C32A0 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c -/* 802C32A4 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C32A8 88 03 00 C6 */ lbz r0, 0xc6(r3) -/* 802C32AC 28 00 00 00 */ cmplwi r0, 0 -/* 802C32B0 41 82 00 2C */ beq lbl_802C32DC -/* 802C32B4 88 03 00 C7 */ lbz r0, 0xc7(r3) -/* 802C32B8 28 00 00 00 */ cmplwi r0, 0 -/* 802C32BC 41 82 00 20 */ beq lbl_802C32DC -/* 802C32C0 88 83 00 CB */ lbz r4, 0xcb(r3) -/* 802C32C4 54 80 EF FF */ rlwinm. r0, r4, 0x1d, 0x1f, 0x1f -/* 802C32C8 40 82 00 14 */ bne lbl_802C32DC -/* 802C32CC 38 00 00 01 */ li r0, 1 -/* 802C32D0 50 04 17 7A */ rlwimi r4, r0, 2, 0x1d, 0x1d -/* 802C32D4 98 83 00 CB */ stb r4, 0xcb(r3) -/* 802C32D8 4E 80 00 20 */ blr -lbl_802C32DC: -/* 802C32DC 38 80 00 00 */ li r4, 0 -/* 802C32E0 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C32E4 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d -/* 802C32E8 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C32EC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setLinkSwordType__14Z2CreatureLinkFll.s b/asm/Z2AudioLib/Z2LinkMgr/setLinkSwordType__14Z2CreatureLinkFll.s deleted file mode 100644 index dd2c0c6549..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setLinkSwordType__14Z2CreatureLinkFll.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802C3228: -/* 802C3228 98 83 00 C6 */ stb r4, 0xc6(r3) -/* 802C322C 20 05 00 01 */ subfic r0, r5, 1 -/* 802C3230 7C 00 00 34 */ cntlzw r0, r0 -/* 802C3234 54 04 D9 7E */ srwi r4, r0, 5 -/* 802C3238 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C323C 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b -/* 802C3240 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C3244 88 03 00 C6 */ lbz r0, 0xc6(r3) -/* 802C3248 28 00 00 00 */ cmplwi r0, 0 -/* 802C324C 41 82 00 2C */ beq lbl_802C3278 -/* 802C3250 88 03 00 C7 */ lbz r0, 0xc7(r3) -/* 802C3254 28 00 00 00 */ cmplwi r0, 0 -/* 802C3258 41 82 00 20 */ beq lbl_802C3278 -/* 802C325C 88 83 00 CB */ lbz r4, 0xcb(r3) -/* 802C3260 54 80 EF FF */ rlwinm. r0, r4, 0x1d, 0x1f, 0x1f -/* 802C3264 40 82 00 14 */ bne lbl_802C3278 -/* 802C3268 38 00 00 01 */ li r0, 1 -/* 802C326C 50 04 17 7A */ rlwimi r4, r0, 2, 0x1d, 0x1d -/* 802C3270 98 83 00 CB */ stb r4, 0xcb(r3) -/* 802C3274 4E 80 00 20 */ blr -lbl_802C3278: -/* 802C3278 38 80 00 00 */ li r4, 0 -/* 802C327C 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C3280 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d -/* 802C3284 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C3288 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setMagnetized__14Z2CreatureLinkFb.s b/asm/Z2AudioLib/Z2LinkMgr/setMagnetized__14Z2CreatureLinkFb.s deleted file mode 100644 index 1504c1cb0f..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setMagnetized__14Z2CreatureLinkFb.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802C3AEC: -/* 802C3AEC 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C3AF0 50 80 07 FE */ rlwimi r0, r4, 0, 0x1f, 0x1f -/* 802C3AF4 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C3AF8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setResumeAttack__14Z2CreatureLinkFb.s b/asm/Z2AudioLib/Z2LinkMgr/setResumeAttack__14Z2CreatureLinkFb.s deleted file mode 100644 index 878ac9c402..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setResumeAttack__14Z2CreatureLinkFb.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802C48D8: -/* 802C48D8 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C48DC 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a -/* 802C48E0 98 03 00 CB */ stb r0, 0xcb(r3) -/* 802C48E4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setRiding__14Z2CreatureLinkFb.s b/asm/Z2AudioLib/Z2LinkMgr/setRiding__14Z2CreatureLinkFb.s deleted file mode 100644 index e13edad8d5..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setRiding__14Z2CreatureLinkFb.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802C3A6C: -/* 802C3A6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C3A70 7C 08 02 A6 */ mflr r0 -/* 802C3A74 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C3A78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C3A7C 93 C1 00 08 */ stw r30, 8(r1) -/* 802C3A80 7C 7E 1B 78 */ mr r30, r3 -/* 802C3A84 7C 9F 23 78 */ mr r31, r4 -/* 802C3A88 88 03 00 CB */ lbz r0, 0xcb(r3) -/* 802C3A8C 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 802C3A90 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802C3A94 7C 03 00 40 */ cmplw r3, r0 -/* 802C3A98 41 82 00 3C */ beq lbl_802C3AD4 -/* 802C3A9C 28 00 00 00 */ cmplwi r0, 0 -/* 802C3AA0 41 82 00 18 */ beq lbl_802C3AB8 -/* 802C3AA4 80 6D 85 C4 */ lwz r3, data_80450B44(r13) -/* 802C3AA8 C0 22 C2 C0 */ lfs f1, lit_3743(r2) -/* 802C3AAC 38 80 00 00 */ li r4, 0 -/* 802C3AB0 4B FF 9E 5D */ bl setTargetVolume__10Z2AudienceFfi -/* 802C3AB4 48 00 00 14 */ b lbl_802C3AC8 -lbl_802C3AB8: -/* 802C3AB8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) -/* 802C3ABC C0 22 C2 A0 */ lfs f1, lit_3723(r2) -/* 802C3AC0 38 80 00 00 */ li r4, 0 -/* 802C3AC4 4B FF 9E 49 */ bl setTargetVolume__10Z2AudienceFfi -lbl_802C3AC8: -/* 802C3AC8 88 1E 00 CB */ lbz r0, 0xcb(r30) -/* 802C3ACC 53 E0 0F BC */ rlwimi r0, r31, 1, 0x1e, 0x1e -/* 802C3AD0 98 1E 00 CB */ stb r0, 0xcb(r30) -lbl_802C3AD4: -/* 802C3AD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C3AD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C3ADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C3AE0 7C 08 03 A6 */ mtlr r0 -/* 802C3AE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3AE8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setWolfEyeOpen__14Z2CreatureLinkFb.s b/asm/Z2AudioLib/Z2LinkMgr/setWolfEyeOpen__14Z2CreatureLinkFb.s index b5e790bf10..cd4267f8e1 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/setWolfEyeOpen__14Z2CreatureLinkFb.s +++ b/asm/Z2AudioLib/Z2LinkMgr/setWolfEyeOpen__14Z2CreatureLinkFb.s @@ -11,7 +11,7 @@ lbl_802C3AFC: /* 802C3B20 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020050@ha */ /* 802C3B24 38 03 00 50 */ addi r0, r3, 0x0050 /* 0x00020050@l */ /* 802C3B28 90 01 00 0C */ stw r0, 0xc(r1) -/* 802C3B2C 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C3B2C 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C3B30 38 81 00 0C */ addi r4, r1, 0xc /* 802C3B34 38 A0 00 00 */ li r5, 0 /* 802C3B38 38 C0 00 00 */ li r6, 0 @@ -22,10 +22,10 @@ lbl_802C3AFC: /* 802C3B4C FC 80 18 90 */ fmr f4, f3 /* 802C3B50 39 00 00 00 */ li r8, 0 /* 802C3B54 4B FE 7E 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802C3B58 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802C3B58 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802C3B5C 38 80 00 01 */ li r4, 1 /* 802C3B60 4B FF 72 BD */ bl setFxForceOff__11Z2FxLineMgrFb -/* 802C3B64 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C3B64 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C3B68 38 80 00 20 */ li r4, 0x20 /* 802C3B6C 4B FF C4 81 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc /* 802C3B70 48 00 00 54 */ b lbl_802C3BC4 @@ -33,7 +33,7 @@ lbl_802C3B74: /* 802C3B74 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020095@ha */ /* 802C3B78 38 03 00 95 */ addi r0, r3, 0x0095 /* 0x00020095@l */ /* 802C3B7C 90 01 00 08 */ stw r0, 8(r1) -/* 802C3B80 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802C3B80 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802C3B84 38 81 00 08 */ addi r4, r1, 8 /* 802C3B88 38 A0 00 00 */ li r5, 0 /* 802C3B8C 38 C0 00 00 */ li r6, 0 @@ -44,10 +44,10 @@ lbl_802C3B74: /* 802C3BA0 FC 80 18 90 */ fmr f4, f3 /* 802C3BA4 39 00 00 00 */ li r8, 0 /* 802C3BA8 4B FE 7D DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 802C3BAC 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802C3BAC 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802C3BB0 38 80 00 00 */ li r4, 0 /* 802C3BB4 4B FF 72 69 */ bl setFxForceOff__11Z2FxLineMgrFb -/* 802C3BB8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C3BB8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C3BBC 38 80 00 10 */ li r4, 0x10 /* 802C3BC0 4B FF C4 2D */ bl setGhostEnemyState__13Z2SoundObjMgrFUc lbl_802C3BC4: diff --git a/asm/Z2AudioLib/Z2LinkMgr/startCollisionSE__14Z2CreatureLinkFUlUl.s b/asm/Z2AudioLib/Z2LinkMgr/startCollisionSE__14Z2CreatureLinkFUlUl.s deleted file mode 100644 index a177e9d99c..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/startCollisionSE__14Z2CreatureLinkFUlUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_802C4784: -/* 802C4784 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C4788 7C 08 02 A6 */ mflr r0 -/* 802C478C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C4790 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C4794 48 09 DA 49 */ bl _savegpr_29 -/* 802C4798 7C 7D 1B 78 */ mr r29, r3 -/* 802C479C 7C 9E 23 78 */ mr r30, r4 -/* 802C47A0 7C BF 2B 78 */ mr r31, r5 -/* 802C47A4 2C 1F 00 28 */ cmpwi r31, 0x28 -/* 802C47A8 40 80 00 10 */ bge lbl_802C47B8 -/* 802C47AC 2C 1F 00 20 */ cmpwi r31, 0x20 -/* 802C47B0 41 82 00 20 */ beq lbl_802C47D0 -/* 802C47B4 48 00 00 34 */ b lbl_802C47E8 -lbl_802C47B8: -/* 802C47B8 2C 1F 00 2B */ cmpwi r31, 0x2b -/* 802C47BC 40 80 00 2C */ bge lbl_802C47E8 -/* 802C47C0 80 6D 86 04 */ lwz r3, data_80450B84(r13) -/* 802C47C4 38 80 00 02 */ li r4, 2 -/* 802C47C8 4B FF 00 7D */ bl setBattleSeqState__8Z2SeqMgrFUc -/* 802C47CC 48 00 00 1C */ b lbl_802C47E8 -lbl_802C47D0: -/* 802C47D0 3C 1E FF FC */ addis r0, r30, 0xfffc -/* 802C47D4 28 00 00 01 */ cmplwi r0, 1 -/* 802C47D8 40 82 00 10 */ bne lbl_802C47E8 -/* 802C47DC 80 6D 86 04 */ lwz r3, data_80450B84(r13) -/* 802C47E0 38 80 00 14 */ li r4, 0x14 -/* 802C47E4 4B FF 03 19 */ bl setBattleLastHit__8Z2SeqMgrFUc -lbl_802C47E8: -/* 802C47E8 38 7D 00 08 */ addi r3, r29, 8 -/* 802C47EC 7F C4 F3 78 */ mr r4, r30 -/* 802C47F0 7F E5 FB 78 */ mr r5, r31 -/* 802C47F4 38 C0 00 00 */ li r6, 0 -/* 802C47F8 4B FF 9C AD */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 802C47FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C4800 48 09 DA 29 */ bl _restgpr_29 -/* 802C4804 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C4808 7C 08 03 A6 */ mtlr r0 -/* 802C480C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C4810 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2LinkMgr/startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc.s index 4c419cef22..f1543709a8 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2LinkMgr/startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc.s @@ -14,11 +14,11 @@ lbl_802C3E68: /* 802C3E98 3C 04 FF FE */ addis r0, r4, 0xfffe /* 802C3E9C 28 00 00 BD */ cmplwi r0, 0xbd /* 802C3EA0 40 82 00 2C */ bne lbl_802C3ECC -/* 802C3EA4 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C3EA4 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C3EA8 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802C3EAC 28 00 00 02 */ cmplwi r0, 2 /* 802C3EB0 41 82 00 14 */ beq lbl_802C3EC4 -/* 802C3EB4 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C3EB4 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C3EB8 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802C3EBC 28 00 00 00 */ cmplwi r0, 0 /* 802C3EC0 40 82 00 0C */ bne lbl_802C3ECC @@ -224,7 +224,7 @@ lbl_802C41A0: /* 802C41B8 4B D7 08 05 */ bl isEventBit__11dSv_event_cCFUs /* 802C41BC 2C 03 00 00 */ cmpwi r3, 0 /* 802C41C0 41 82 00 3C */ beq lbl_802C41FC -/* 802C41C4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C41C4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C41C8 80 63 00 04 */ lwz r3, 4(r3) /* 802C41CC 28 03 00 00 */ cmplwi r3, 0 /* 802C41D0 41 82 00 10 */ beq lbl_802C41E0 @@ -281,7 +281,7 @@ lbl_802C424C: /* 802C4288 48 00 00 44 */ b lbl_802C42CC lbl_802C428C: /* 802C428C C0 25 00 60 */ lfs f1, 0x60(r5) -/* 802C4290 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C4290 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C4294 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802C4298 28 00 00 02 */ cmplwi r0, 2 /* 802C429C 40 82 00 1C */ bne lbl_802C42B8 diff --git a/asm/Z2AudioLib/Z2LinkMgr/startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2LinkMgr/startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc.s index 29fad4c4c5..de6cef5bd2 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2LinkMgr/startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc.s @@ -45,7 +45,7 @@ lbl_802C3C64: /* 802C3C7C 41 82 00 44 */ beq lbl_802C3CC0 /* 802C3C80 48 00 01 BC */ b lbl_802C3E3C lbl_802C3C84: -/* 802C3C84 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802C3C84 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802C3C88 38 80 00 02 */ li r4, 2 /* 802C3C8C 4B FF 0B B9 */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802C3C90 48 00 01 AC */ b lbl_802C3E3C diff --git a/asm/Z2AudioLib/Z2LinkMgr/startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2LinkMgr/startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc.s deleted file mode 100644 index 041e6f2018..0000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_802C46F0: -/* 802C46F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802C46F4 7C 08 02 A6 */ mflr r0 -/* 802C46F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802C46FC 80 E4 00 00 */ lwz r7, 0(r4) -/* 802C4700 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020044@ha */ -/* 802C4704 38 04 00 44 */ addi r0, r4, 0x0044 /* 0x00020044@l */ -/* 802C4708 7C 07 00 00 */ cmpw r7, r0 -/* 802C470C 41 82 00 34 */ beq lbl_802C4740 -/* 802C4710 40 80 00 4C */ bge lbl_802C475C -/* 802C4714 38 04 00 25 */ addi r0, r4, 0x25 -/* 802C4718 7C 07 00 00 */ cmpw r7, r0 -/* 802C471C 41 82 00 08 */ beq lbl_802C4724 -/* 802C4720 48 00 00 3C */ b lbl_802C475C -lbl_802C4724: -/* 802C4724 90 E1 00 10 */ stw r7, 0x10(r1) -/* 802C4728 38 81 00 10 */ addi r4, r1, 0x10 -/* 802C472C 81 83 00 00 */ lwz r12, 0(r3) -/* 802C4730 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802C4734 7D 89 03 A6 */ mtctr r12 -/* 802C4738 4E 80 04 21 */ bctrl -/* 802C473C 48 00 00 38 */ b lbl_802C4774 -lbl_802C4740: -/* 802C4740 90 E1 00 0C */ stw r7, 0xc(r1) -/* 802C4744 38 81 00 0C */ addi r4, r1, 0xc -/* 802C4748 81 83 00 00 */ lwz r12, 0(r3) -/* 802C474C 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802C4750 7D 89 03 A6 */ mtctr r12 -/* 802C4754 4E 80 04 21 */ bctrl -/* 802C4758 48 00 00 1C */ b lbl_802C4774 -lbl_802C475C: -/* 802C475C 90 E1 00 08 */ stw r7, 8(r1) -/* 802C4760 38 81 00 08 */ addi r4, r1, 8 -/* 802C4764 81 83 00 00 */ lwz r12, 0(r3) -/* 802C4768 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802C476C 7D 89 03 A6 */ mtctr r12 -/* 802C4770 4E 80 04 21 */ bctrl -lbl_802C4774: -/* 802C4774 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802C4778 7C 08 03 A6 */ mtlr r0 -/* 802C477C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C4780 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2LinkMgr/startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc.s index 6e90619cfe..84bf0c19a9 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2LinkMgr/startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc.s @@ -63,7 +63,7 @@ lbl_802C4650: /* 802C4688 FC 20 F8 90 */ fmr f1, f31 /* 802C468C 38 80 00 00 */ li r4, 0 /* 802C4690 4B FD E7 25 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802C4694 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802C4694 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802C4698 7F C4 F3 78 */ mr r4, r30 /* 802C469C 38 A0 00 08 */ li r5, 8 /* 802C46A0 57 E6 06 3E */ clrlwi r6, r31, 0x18 diff --git a/asm/Z2AudioLib/Z2LinkMgr/startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc.s b/asm/Z2AudioLib/Z2LinkMgr/startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc.s index 7701aab2f3..3e958e485a 100644 --- a/asm/Z2AudioLib/Z2LinkMgr/startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc.s +++ b/asm/Z2AudioLib/Z2LinkMgr/startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc.s @@ -28,11 +28,11 @@ lbl_802C437C: /* 802C4384 41 82 00 50 */ beq lbl_802C43D4 /* 802C4388 48 00 01 EC */ b lbl_802C4574 lbl_802C438C: -/* 802C438C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802C438C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802C4390 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802C4394 28 00 00 02 */ cmplwi r0, 2 /* 802C4398 41 82 00 14 */ beq lbl_802C43AC -/* 802C439C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802C439C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802C43A0 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802C43A4 28 00 00 00 */ cmplwi r0, 0 /* 802C43A8 40 82 00 0C */ bne lbl_802C43B4 @@ -76,7 +76,7 @@ lbl_802C4424: /* 802C4424 88 1D 00 C2 */ lbz r0, 0xc2(r29) /* 802C4428 28 00 00 03 */ cmplwi r0, 3 /* 802C442C 41 82 01 0C */ beq lbl_802C4538 -/* 802C4430 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802C4430 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802C4434 88 03 00 15 */ lbz r0, 0x15(r3) /* 802C4438 28 00 00 00 */ cmplwi r0, 0 /* 802C443C 40 82 00 FC */ bne lbl_802C4538 diff --git a/asm/Z2AudioLib/Z2SceneMgr/__ct__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/__ct__10Z2SceneMgrFv.s index 901b50d6b7..41e2756df7 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/__ct__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/__ct__10Z2SceneMgrFv.s @@ -1,6 +1,6 @@ lbl_802B6840: /* 802B6840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802B6844 90 6D 86 00 */ stw r3, data_80450B80(r13) +/* 802B6844 90 6D 86 00 */ stw r3, __OSReport_disable-0x18(r13) /* 802B6848 38 00 FF FF */ li r0, -1 /* 802B684C 90 03 00 04 */ stw r0, 4(r3) /* 802B6850 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/Z2AudioLib/Z2SceneMgr/_load1stWaveInner_1__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/_load1stWaveInner_1__10Z2SceneMgrFv.s index ee467d3f48..c1822ecae0 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/_load1stWaveInner_1__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/_load1stWaveInner_1__10Z2SceneMgrFv.s @@ -4,10 +4,10 @@ lbl_802B9D98: /* 802B9DA0 90 01 00 14 */ stw r0, 0x14(r1) /* 802B9DA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802B9DA8 7C 7F 1B 78 */ mr r31, r3 -/* 802B9DAC 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B9DAC 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B9DB0 38 80 00 00 */ li r4, 0 /* 802B9DB4 4B FF 3B 99 */ bl seStopAll__7Z2SeMgrFUl -/* 802B9DB8 80 6D 85 BC */ lwz r3, data_80450B3C(r13) +/* 802B9DB8 80 6D 85 BC */ lwz r3, __OSReport_disable-0x5C(r13) /* 802B9DBC 48 00 CB E1 */ bl resetSceneInner__10Z2EnvSeMgrFv /* 802B9DC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 802B9DC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -125,7 +125,7 @@ lbl_802B9F5C: /* 802B9F5C 88 1F 00 1A */ lbz r0, 0x1a(r31) /* 802B9F60 28 00 00 00 */ cmplwi r0, 0 /* 802B9F64 41 82 00 48 */ beq lbl_802B9FAC -/* 802B9F68 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9F68 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9F6C 38 80 00 00 */ li r4, 0 /* 802B9F70 80 03 00 00 */ lwz r0, 0(r3) /* 802B9F74 28 00 00 00 */ cmplwi r0, 0 diff --git a/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s index 4915629706..baa89ba8af 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/framework__10Z2SceneMgrFv.s @@ -42,7 +42,7 @@ lbl_802B9CE4: /* 802B9CE4 88 1F 00 1B */ lbz r0, 0x1b(r31) /* 802B9CE8 28 00 00 00 */ cmplwi r0, 0 /* 802B9CEC 40 82 00 40 */ bne lbl_802B9D2C -/* 802B9CF0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B9CF0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B9CF4 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802B9CF8 28 00 00 03 */ cmplwi r0, 3 /* 802B9CFC 41 82 00 30 */ beq lbl_802B9D2C @@ -50,12 +50,12 @@ lbl_802B9CE4: /* 802B9D04 88 0D 82 E3 */ lbz r0, struct_80450860+0x3(r13) /* 802B9D08 7C 03 00 00 */ cmpw r3, r0 /* 802B9D0C 40 82 00 20 */ bne lbl_802B9D2C -/* 802B9D10 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9D10 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9D14 38 80 00 00 */ li r4, 0 /* 802B9D18 4B FF A4 4D */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B9D1C 48 00 00 10 */ b lbl_802B9D2C lbl_802B9D20: -/* 802B9D20 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9D20 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9D24 38 80 00 01 */ li r4, 1 /* 802B9D28 4B FF A4 3D */ bl setBattleBgmOff__8Z2SeqMgrFb lbl_802B9D2C: diff --git a/asm/Z2AudioLib/Z2SceneMgr/load1stDynamicWave__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/load1stDynamicWave__10Z2SceneMgrFv.s index 0961c6557e..a10947fd08 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/load1stDynamicWave__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/load1stDynamicWave__10Z2SceneMgrFv.s @@ -6,7 +6,7 @@ lbl_802B9D40: /* 802B9D50 7C 7F 1B 78 */ mr r31, r3 /* 802B9D54 38 00 00 00 */ li r0, 0 /* 802B9D58 90 03 00 08 */ stw r0, 8(r3) -/* 802B9D5C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B9D5C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B9D60 48 00 63 DD */ bl deleteEnemyAll__13Z2SoundObjMgrFv /* 802B9D64 7F E3 FB 78 */ mr r3, r31 /* 802B9D68 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2SceneMgr/sceneBgmStart__10Z2SceneMgrFv.s b/asm/Z2AudioLib/Z2SceneMgr/sceneBgmStart__10Z2SceneMgrFv.s index 021556eebf..a23fa7e3df 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/sceneBgmStart__10Z2SceneMgrFv.s +++ b/asm/Z2AudioLib/Z2SceneMgr/sceneBgmStart__10Z2SceneMgrFv.s @@ -9,12 +9,12 @@ lbl_802BA294: /* 802BA2B0 38 80 00 01 */ li r4, 1 /* 802BA2B4 4B FF C6 2D */ bl setSceneExist__10Z2SceneMgrFb /* 802BA2B8 38 00 00 00 */ li r0, 0 -/* 802BA2BC 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802BA2BC 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802BA2C0 98 03 00 0C */ stb r0, 0xc(r3) /* 802BA2C4 88 1F 00 1A */ lbz r0, 0x1a(r31) /* 802BA2C8 28 00 00 00 */ cmplwi r0, 0 /* 802BA2CC 40 82 00 18 */ bne lbl_802BA2E4 -/* 802BA2D0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA2D0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA2D4 80 9F 00 00 */ lwz r4, 0(r31) /* 802BA2D8 4B FF 9B D5 */ bl checkBgmIDPlaying__8Z2SeqMgrFUl /* 802BA2DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -24,7 +24,7 @@ lbl_802BA2E4: /* 802BA2E8 3C 04 00 01 */ addis r0, r4, 1 /* 802BA2EC 28 00 FF FF */ cmplwi r0, 0xffff /* 802BA2F0 41 82 02 44 */ beq lbl_802BA534 -/* 802BA2F4 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802BA2F4 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802BA2F8 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802BA2FC 28 00 00 0B */ cmplwi r0, 0xb /* 802BA300 41 82 02 34 */ beq lbl_802BA534 @@ -37,7 +37,7 @@ lbl_802BA2E4: /* 802BA31C 48 00 02 18 */ b lbl_802BA534 lbl_802BA320: /* 802BA320 38 E0 00 00 */ li r7, 0 -/* 802BA324 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA324 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA328 80 A3 00 04 */ lwz r5, 4(r3) /* 802BA32C 28 05 00 00 */ cmplwi r5, 0 /* 802BA330 41 82 00 10 */ beq lbl_802BA340 @@ -67,7 +67,7 @@ lbl_802BA37C: /* 802BA37C 38 A0 00 00 */ li r5, 0 /* 802BA380 54 E6 06 3E */ clrlwi r6, r7, 0x18 /* 802BA384 4B FF 4C 8D */ bl bgmStart__8Z2SeqMgrFUlUll -/* 802BA388 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA388 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA38C C0 02 C0 3C */ lfs f0, lit_3512(r2) /* 802BA390 D0 03 00 34 */ stfs f0, 0x34(r3) /* 802BA394 C0 22 C0 38 */ lfs f1, lit_3511(r2) @@ -93,24 +93,24 @@ lbl_802BA37C: /* 802BA3E4 80 1F 00 04 */ lwz r0, 4(r31) /* 802BA3E8 2C 00 00 18 */ cmpwi r0, 0x18 /* 802BA3EC 40 82 00 14 */ bne lbl_802BA400 -/* 802BA3F0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA3F0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA3F4 38 80 00 05 */ li r4, 5 /* 802BA3F8 4B FF 5B 95 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA3FC 48 00 01 38 */ b lbl_802BA534 lbl_802BA400: -/* 802BA400 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA400 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA404 88 9F 00 0C */ lbz r4, 0xc(r31) /* 802BA408 7C 84 07 74 */ extsb r4, r4 /* 802BA40C 4B FF 5B 81 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA410 48 00 01 24 */ b lbl_802BA534 -/* 802BA414 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA414 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA418 38 80 00 00 */ li r4, 0 /* 802BA41C 4B FF 5B 71 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA420 48 00 01 14 */ b lbl_802BA534 /* 802BA424 80 1F 00 04 */ lwz r0, 4(r31) /* 802BA428 2C 00 00 0A */ cmpwi r0, 0xa /* 802BA42C 40 82 01 08 */ bne lbl_802BA534 -/* 802BA430 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA430 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA434 C0 02 C0 54 */ lfs f0, lit_5342(r2) /* 802BA438 D0 03 00 44 */ stfs f0, 0x44(r3) /* 802BA43C D0 23 00 48 */ stfs f1, 0x48(r3) @@ -129,7 +129,7 @@ lbl_802BA464: /* 802BA46C 2C 03 00 19 */ cmpwi r3, 0x19 /* 802BA470 40 82 00 C4 */ bne lbl_802BA534 lbl_802BA474: -/* 802BA474 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA474 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA478 C0 02 C0 54 */ lfs f0, lit_5342(r2) /* 802BA47C D0 03 00 44 */ stfs f0, 0x44(r3) /* 802BA480 C0 02 C0 38 */ lfs f0, lit_3511(r2) @@ -144,12 +144,12 @@ lbl_802BA474: /* 802BA4A4 88 1F 00 0C */ lbz r0, 0xc(r31) /* 802BA4A8 2C 00 00 02 */ cmpwi r0, 2 /* 802BA4AC 40 82 00 14 */ bne lbl_802BA4C0 -/* 802BA4B0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA4B0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA4B4 38 80 00 02 */ li r4, 2 /* 802BA4B8 4B FF 5A D5 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA4BC 48 00 00 78 */ b lbl_802BA534 lbl_802BA4C0: -/* 802BA4C0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA4C0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA4C4 38 80 00 00 */ li r4, 0 /* 802BA4C8 4B FF 5A C5 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA4CC 48 00 00 68 */ b lbl_802BA534 @@ -162,28 +162,28 @@ lbl_802BA4C0: /* 802BA4E8 2C 00 00 0E */ cmpwi r0, 0xe /* 802BA4EC 40 82 00 14 */ bne lbl_802BA500 lbl_802BA4F0: -/* 802BA4F0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA4F0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA4F4 38 80 00 02 */ li r4, 2 /* 802BA4F8 4B FF 5A 95 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA4FC 48 00 00 38 */ b lbl_802BA534 lbl_802BA500: -/* 802BA500 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA500 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA504 38 80 00 00 */ li r4, 0 /* 802BA508 4B FF 5A 85 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BA50C 48 00 00 28 */ b lbl_802BA534 lbl_802BA510: -/* 802BA510 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA510 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA514 4B FF 58 D9 */ bl bgmStreamCheckReady__8Z2SeqMgrFv /* 802BA518 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA51C 40 82 00 10 */ bne lbl_802BA52C -/* 802BA520 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA520 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA524 80 9F 00 00 */ lwz r4, 0(r31) /* 802BA528 4B FF 56 6D */ bl bgmStreamPrepare__8Z2SeqMgrFUl lbl_802BA52C: -/* 802BA52C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA52C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA530 4B FF 58 E9 */ bl bgmStreamPlay__8Z2SeqMgrFv lbl_802BA534: -/* 802BA534 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BA534 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BA538 C0 02 C0 3C */ lfs f0, lit_3512(r2) /* 802BA53C D0 03 00 74 */ stfs f0, 0x74(r3) /* 802BA540 C0 02 C0 38 */ lfs f0, lit_3511(r2) diff --git a/asm/Z2AudioLib/Z2SceneMgr/sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb.s b/asm/Z2AudioLib/Z2SceneMgr/sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb.s index e7a8608656..cb2c1c164e 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb.s +++ b/asm/Z2AudioLib/Z2SceneMgr/sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb.s @@ -7,7 +7,7 @@ lbl_802B9B68: /* 802B9B7C 80 03 00 00 */ lwz r0, 0(r3) /* 802B9B80 7C 0B 00 40 */ cmplw r11, r0 /* 802B9B84 41 82 00 44 */ beq lbl_802B9BC8 -/* 802B9B88 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9B88 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9B8C 80 63 00 00 */ lwz r3, 0(r3) /* 802B9B90 28 03 00 00 */ cmplwi r3, 0 /* 802B9B94 41 82 00 10 */ beq lbl_802B9BA4 @@ -27,7 +27,7 @@ lbl_802B9BBC: /* 802B9BC0 98 0C 00 1A */ stb r0, 0x1a(r12) /* 802B9BC4 48 00 00 54 */ b lbl_802B9C18 lbl_802B9BC8: -/* 802B9BC8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9BC8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9BCC 80 63 00 00 */ lwz r3, 0(r3) /* 802B9BD0 28 03 00 00 */ cmplwi r3, 0 /* 802B9BD4 41 82 00 10 */ beq lbl_802B9BE4 @@ -59,7 +59,7 @@ lbl_802B9C18: /* 802B9C28 99 2C 00 15 */ stb r9, 0x15(r12) /* 802B9C2C 80 04 00 00 */ lwz r0, 0(r4) /* 802B9C30 90 0C 00 00 */ stw r0, 0(r12) -/* 802B9C34 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802B9C34 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802B9C38 80 8C 00 04 */ lwz r4, 4(r12) /* 802B9C3C 48 00 12 7D */ bl setSceneFx__11Z2FxLineMgrFl /* 802B9C40 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/Z2AudioLib/Z2SceneMgr/setFadeInStart__10Z2SceneMgrFUc.s b/asm/Z2AudioLib/Z2SceneMgr/setFadeInStart__10Z2SceneMgrFUc.s index b618ea0e2f..decb29e12a 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/setFadeInStart__10Z2SceneMgrFUc.s +++ b/asm/Z2AudioLib/Z2SceneMgr/setFadeInStart__10Z2SceneMgrFUc.s @@ -7,34 +7,34 @@ lbl_802B6A18: /* 802B6A2C 88 03 00 15 */ lbz r0, 0x15(r3) /* 802B6A30 28 00 00 7F */ cmplwi r0, 0x7f /* 802B6A34 40 82 00 18 */ bne lbl_802B6A4C -/* 802B6A38 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6A38 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6A3C C0 22 C0 38 */ lfs f1, lit_3511(r2) /* 802B6A40 38 80 00 00 */ li r4, 0 /* 802B6A44 4B FF 6F B1 */ bl seMoveVolumeAll__7Z2SeMgrFfUl /* 802B6A48 48 00 00 34 */ b lbl_802B6A7C lbl_802B6A4C: -/* 802B6A4C 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6A4C 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6A50 C0 22 C0 3C */ lfs f1, lit_3512(r2) /* 802B6A54 38 80 00 21 */ li r4, 0x21 /* 802B6A58 4B FF 6F 9D */ bl seMoveVolumeAll__7Z2SeMgrFfUl /* 802B6A5C 88 1F 00 15 */ lbz r0, 0x15(r31) /* 802B6A60 28 00 00 85 */ cmplwi r0, 0x85 /* 802B6A64 40 82 00 18 */ bne lbl_802B6A7C -/* 802B6A68 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B6A68 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B6A6C 38 63 03 EC */ addi r3, r3, 0x3ec /* 802B6A70 C0 22 C0 38 */ lfs f1, lit_3511(r2) /* 802B6A74 38 80 00 00 */ li r4, 0 /* 802B6A78 4B FE C3 3D */ bl moveVolume__18JAISoundParamsMoveFfUl lbl_802B6A7C: /* 802B6A7C C0 02 C0 3C */ lfs f0, lit_3512(r2) -/* 802B6A80 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6A80 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6A84 D0 03 00 B4 */ stfs f0, 0xb4(r3) -/* 802B6A88 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B6A88 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B6A8C 4B FF F6 F1 */ bl menuOut__11Z2StatusMgrFv /* 802B6A90 88 1F 00 1A */ lbz r0, 0x1a(r31) /* 802B6A94 28 00 00 00 */ cmplwi r0, 0 /* 802B6A98 40 82 00 44 */ bne lbl_802B6ADC -/* 802B6A9C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6A9C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6AA0 C0 03 00 74 */ lfs f0, 0x74(r3) /* 802B6AA4 38 00 00 21 */ li r0, 0x21 /* 802B6AA8 90 03 00 80 */ stw r0, 0x80(r3) diff --git a/asm/Z2AudioLib/Z2SceneMgr/setFadeOutStart__10Z2SceneMgrFUc.s b/asm/Z2AudioLib/Z2SceneMgr/setFadeOutStart__10Z2SceneMgrFUc.s index 7e65152070..ef05c60ecd 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/setFadeOutStart__10Z2SceneMgrFUc.s +++ b/asm/Z2AudioLib/Z2SceneMgr/setFadeOutStart__10Z2SceneMgrFUc.s @@ -6,7 +6,7 @@ lbl_802B697C: /* 802B698C 7C 7F 1B 78 */ mr r31, r3 /* 802B6990 38 80 00 00 */ li r4, 0 /* 802B6994 4B FF FF 4D */ bl setSceneExist__10Z2SceneMgrFb -/* 802B6998 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6998 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B699C C0 03 00 74 */ lfs f0, 0x74(r3) /* 802B69A0 38 00 00 21 */ li r0, 0x21 /* 802B69A4 90 03 00 80 */ stw r0, 0x80(r3) @@ -22,11 +22,11 @@ lbl_802B697C: /* 802B69CC EC 02 00 24 */ fdivs f0, f2, f0 /* 802B69D0 D0 03 00 78 */ stfs f0, 0x78(r3) /* 802B69D4 D0 63 00 7C */ stfs f3, 0x7c(r3) -/* 802B69D8 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B69D8 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B69DC C0 22 C0 38 */ lfs f1, lit_3511(r2) /* 802B69E0 38 80 00 21 */ li r4, 0x21 /* 802B69E4 4B FF 70 11 */ bl seMoveVolumeAll__7Z2SeMgrFfUl -/* 802B69E8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B69E8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B69EC 38 80 00 01 */ li r4, 1 /* 802B69F0 4B FF D7 75 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B69F4 38 00 00 28 */ li r0, 0x28 diff --git a/asm/Z2AudioLib/Z2SceneMgr/setInDarkness__10Z2SceneMgrFb.s b/asm/Z2AudioLib/Z2SceneMgr/setInDarkness__10Z2SceneMgrFb.s index 4ff4fca8e2..db43c6d2f4 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/setInDarkness__10Z2SceneMgrFb.s +++ b/asm/Z2AudioLib/Z2SceneMgr/setInDarkness__10Z2SceneMgrFb.s @@ -5,7 +5,7 @@ lbl_802B68B0: /* 802B68BC 98 83 00 1E */ stb r4, 0x1e(r3) /* 802B68C0 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802B68C4 40 82 00 0C */ bne lbl_802B68D0 -/* 802B68C8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B68C8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B68CC 4B FF 3B 65 */ bl resetFilterAll__10Z2SoundMgrFv lbl_802B68D0: /* 802B68D0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/Z2AudioLib/Z2SceneMgr/setSceneExist__10Z2SceneMgrFb.s b/asm/Z2AudioLib/Z2SceneMgr/setSceneExist__10Z2SceneMgrFb.s index 9dd4ad76eb..4532a4c11b 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/setSceneExist__10Z2SceneMgrFb.s +++ b/asm/Z2AudioLib/Z2SceneMgr/setSceneExist__10Z2SceneMgrFb.s @@ -5,7 +5,7 @@ lbl_802B68E0: /* 802B68EC 98 83 00 1D */ stb r4, 0x1d(r3) /* 802B68F0 38 00 00 00 */ li r0, 0 /* 802B68F4 90 03 00 08 */ stw r0, 8(r3) -/* 802B68F8 80 AD 85 E0 */ lwz r5, data_80450B60(r13) +/* 802B68F8 80 AD 85 E0 */ lwz r5, __OSReport_disable-0x38(r13) /* 802B68FC 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802B6900 41 82 00 5C */ beq lbl_802B695C /* 802B6904 38 00 00 01 */ li r0, 1 @@ -21,7 +21,7 @@ lbl_802B68E0: lbl_802B692C: /* 802B692C 28 00 00 7F */ cmplwi r0, 0x7f /* 802B6930 40 82 00 18 */ bne lbl_802B6948 -/* 802B6934 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6934 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6938 C0 22 C0 38 */ lfs f1, lit_3511(r2) /* 802B693C 38 80 00 00 */ li r4, 0 /* 802B6940 4B FF 70 B5 */ bl seMoveVolumeAll__7Z2SeMgrFfUl diff --git a/asm/Z2AudioLib/Z2SceneMgr/setSceneName__10Z2SceneMgrFPcll.s b/asm/Z2AudioLib/Z2SceneMgr/setSceneName__10Z2SceneMgrFPcll.s index 110272b8f6..eb35bcf3fc 100644 --- a/asm/Z2AudioLib/Z2SceneMgr/setSceneName__10Z2SceneMgrFPcll.s +++ b/asm/Z2AudioLib/Z2SceneMgr/setSceneName__10Z2SceneMgrFPcll.s @@ -26,23 +26,23 @@ lbl_802B6AF8: /* 802B6B58 38 00 00 00 */ li r0, 0 /* 802B6B5C 98 1B 00 1B */ stb r0, 0x1b(r27) /* 802B6B60 C3 E2 C0 50 */ lfs f31, lit_5341(r2) -/* 802B6B64 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6B64 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6B68 4B FF D5 C1 */ bl resetBattleBgmParams__8Z2SeqMgrFv -/* 802B6B6C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6B6C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6B70 C0 22 C0 3C */ lfs f1, lit_3512(r2) /* 802B6B74 38 80 00 00 */ li r4, 0 /* 802B6B78 48 00 2F 85 */ bl setWindStoneVol__8Z2SeqMgrFfUl -/* 802B6B7C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6B7C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6B80 C0 22 C0 3C */ lfs f1, lit_3512(r2) /* 802B6B84 48 00 2F 4D */ bl setTwilightGateVol__8Z2SeqMgrFf -/* 802B6B88 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6B88 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6B8C 48 00 2F 39 */ bl resetCrowdSize__7Z2SeMgrFv -/* 802B6B90 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B6B90 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B6B94 38 80 00 00 */ li r4, 0 /* 802B6B98 48 00 94 55 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc -/* 802B6B9C 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6B9C 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6BA0 4B FF 4C 6D */ bl resetModY__7Z2SeMgrFv -/* 802B6BA4 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B6BA4 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B6BA8 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802B6BAC 28 00 00 08 */ cmplwi r0, 8 /* 802B6BB0 40 82 00 14 */ bne lbl_802B6BC4 @@ -102,7 +102,7 @@ lbl_802B6C40: /* 802B6C74 38 61 02 3C */ addi r3, r1, 0x23c /* 802B6C78 48 00 2E 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6C7C 3B E0 00 06 */ li r31, 6 -/* 802B6C80 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6C80 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6C84 38 80 00 00 */ li r4, 0 /* 802B6C88 4B FF 93 05 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B6C8C 48 00 00 38 */ b lbl_802B6CC4 @@ -154,7 +154,7 @@ lbl_802B6D1C: /* 802B6D30 38 61 02 3C */ addi r3, r1, 0x23c /* 802B6D34 48 00 2D 55 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6D38 3B E0 00 06 */ li r31, 6 -/* 802B6D3C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6D3C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6D40 38 80 00 00 */ li r4, 0 /* 802B6D44 4B FF 92 49 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B6D48 48 00 29 70 */ b lbl_802B96B8 @@ -211,7 +211,7 @@ lbl_802B6DAC: /* 802B6E04 38 61 02 3C */ addi r3, r1, 0x23c /* 802B6E08 48 00 2C 81 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6E0C 3B E0 00 06 */ li r31, 6 -/* 802B6E10 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6E10 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6E14 38 80 00 00 */ li r4, 0 /* 802B6E18 4B FF 91 75 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B6E1C 48 00 28 9C */ b lbl_802B96B8 @@ -375,7 +375,7 @@ lbl_802B7058: /* 802B7074 38 61 02 3C */ addi r3, r1, 0x23c /* 802B7078 48 00 2A 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B707C 3B E0 00 06 */ li r31, 6 -/* 802B7080 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7080 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7084 38 80 00 01 */ li r4, 1 /* 802B7088 4B FF 8F 05 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B708C 48 00 00 68 */ b lbl_802B70F4 @@ -432,7 +432,7 @@ lbl_802B70F4: /* 802B714C 38 61 02 3C */ addi r3, r1, 0x23c /* 802B7150 48 00 29 39 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7154 3B E0 00 06 */ li r31, 6 -/* 802B7158 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7158 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B715C 38 80 00 01 */ li r4, 1 /* 802B7160 4B FF 8E 2D */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B7164 48 00 00 84 */ b lbl_802B71E8 @@ -503,7 +503,7 @@ lbl_802B71EC: /* 802B7254 38 61 02 3C */ addi r3, r1, 0x23c /* 802B7258 48 00 28 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B725C 3B E0 00 06 */ li r31, 6 -/* 802B7260 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7260 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7264 38 80 00 00 */ li r4, 0 /* 802B7268 4B FF 8D 25 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B726C 48 00 24 4C */ b lbl_802B96B8 @@ -682,7 +682,7 @@ lbl_802B74C8: /* 802B74E0 48 00 25 A9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B74E4 3B E0 00 0F */ li r31, 0xf /* 802B74E8 3B 00 00 01 */ li r24, 1 -/* 802B74EC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B74EC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B74F0 38 80 00 01 */ li r4, 1 /* 802B74F4 4B FF 8A 99 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B74F8 3B C0 00 32 */ li r30, 0x32 @@ -786,12 +786,12 @@ lbl_802B7640: /* 802B7660 3B 00 00 01 */ li r24, 1 /* 802B7664 2C 1A 00 0E */ cmpwi r26, 0xe /* 802B7668 40 82 00 14 */ bne lbl_802B767C -/* 802B766C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B766C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7670 38 80 00 01 */ li r4, 1 /* 802B7674 4B FF 89 19 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B7678 48 00 20 40 */ b lbl_802B96B8 lbl_802B767C: -/* 802B767C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B767C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7680 38 80 00 00 */ li r4, 0 /* 802B7684 4B FF 89 09 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B7688 48 00 20 30 */ b lbl_802B96B8 @@ -1055,7 +1055,7 @@ lbl_802B7A30: /* 802B7A48 48 00 20 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7A4C 3B E0 00 30 */ li r31, 0x30 /* 802B7A50 3B C0 00 86 */ li r30, 0x86 -/* 802B7A54 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7A54 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7A58 38 80 00 1E */ li r4, 0x1e /* 802B7A5C C0 22 C0 54 */ lfs f1, lit_5342(r2) /* 802B7A60 48 00 1F C5 */ bl muteSceneBgm__8Z2SeqMgrFUlf @@ -1095,7 +1095,7 @@ lbl_802B7ACC: /* 802B7AE0 38 61 02 3C */ addi r3, r1, 0x23c /* 802B7AE4 48 00 1F A5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7AE8 3B E0 00 30 */ li r31, 0x30 -/* 802B7AEC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7AEC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7AF0 38 80 00 1E */ li r4, 0x1e /* 802B7AF4 48 00 1E B9 */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B7AF8 3B 00 00 01 */ li r24, 1 @@ -1141,7 +1141,7 @@ lbl_802B7B58: /* 802B7B8C 48 00 1B 2C */ b lbl_802B96B8 /* 802B7B90 2C 13 00 00 */ cmpwi r19, 0 /* 802B7B94 40 82 00 7C */ bne lbl_802B7C10 -/* 802B7B98 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B7B98 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B7B9C 38 80 00 01 */ li r4, 1 /* 802B7BA0 38 A0 02 BC */ li r5, 0x2bc /* 802B7BA4 38 C0 04 4C */ li r6, 0x44c @@ -1175,7 +1175,7 @@ lbl_802B7C04: lbl_802B7C10: /* 802B7C10 2C 13 00 01 */ cmpwi r19, 1 /* 802B7C14 40 82 00 14 */ bne lbl_802B7C28 -/* 802B7C18 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B7C18 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B7C1C 38 80 00 21 */ li r4, 0x21 /* 802B7C20 38 A0 00 00 */ li r5, 0 /* 802B7C24 4B FF 77 E5 */ bl bgmStop__8Z2SeqMgrFUll @@ -1257,7 +1257,7 @@ lbl_802B7D08: /* 802B7D3C 40 82 00 2C */ bne lbl_802B7D68 /* 802B7D40 38 00 00 01 */ li r0, 1 /* 802B7D44 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B7D48 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B7D48 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B7D4C 38 80 00 01 */ li r4, 1 /* 802B7D50 38 A0 27 10 */ li r5, 0x2710 /* 802B7D54 3C E0 00 01 */ lis r7, 0x0001 /* 0x00009C40@ha */ @@ -1504,7 +1504,7 @@ lbl_802B80AC: /* 802B80C0 38 61 02 3C */ addi r3, r1, 0x23c /* 802B80C4 48 00 19 C5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B80C8 3B E0 00 25 */ li r31, 0x25 -/* 802B80CC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B80CC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B80D0 7F 44 D3 78 */ mr r4, r26 /* 802B80D4 4B FF 7E B9 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B80D8 48 00 15 E0 */ b lbl_802B96B8 @@ -1600,7 +1600,7 @@ lbl_802B820C: /* 802B8220 38 61 02 3C */ addi r3, r1, 0x23c /* 802B8224 48 00 18 65 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8228 3B E0 00 37 */ li r31, 0x37 -/* 802B822C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B822C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8230 38 80 00 00 */ li r4, 0 /* 802B8234 4B FF 7D 59 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B8238 48 00 14 80 */ b lbl_802B96B8 @@ -1633,7 +1633,7 @@ lbl_802B8284: /* 802B8298 38 61 02 3C */ addi r3, r1, 0x23c /* 802B829C 48 00 17 ED */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B82A0 3B E0 00 25 */ li r31, 0x25 -/* 802B82A4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B82A4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B82A8 38 80 00 05 */ li r4, 5 /* 802B82AC 4B FF 7C E1 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B82B0 48 00 14 08 */ b lbl_802B96B8 @@ -1771,7 +1771,7 @@ lbl_802B8468: /* 802B8488 48 00 12 30 */ b lbl_802B96B8 /* 802B848C 2C 1A 00 01 */ cmpwi r26, 1 /* 802B8490 40 82 00 24 */ bne lbl_802B84B4 -/* 802B8494 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8494 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8498 38 80 00 01 */ li r4, 1 /* 802B849C 38 A0 03 E8 */ li r5, 0x3e8 /* 802B84A0 38 C0 07 D0 */ li r6, 0x7d0 @@ -1851,7 +1851,7 @@ lbl_802B8578: /* 802B85A0 38 00 00 01 */ li r0, 1 /* 802B85A4 98 1B 00 1B */ stb r0, 0x1b(r27) /* 802B85A8 C3 E2 C0 3C */ lfs f31, lit_3512(r2) -/* 802B85AC 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B85AC 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B85B0 38 80 00 01 */ li r4, 1 /* 802B85B4 38 A0 02 BC */ li r5, 0x2bc /* 802B85B8 38 C0 04 4C */ li r6, 0x44c @@ -1885,7 +1885,7 @@ lbl_802B8604: /* 802B861C 48 00 10 9C */ b lbl_802B96B8 lbl_802B8620: /* 802B8620 3A 80 00 01 */ li r20, 1 -/* 802B8624 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B8624 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B8628 4B FF E1 0D */ bl checkDayTime__11Z2StatusMgrFv /* 802B862C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B8630 41 82 00 20 */ beq lbl_802B8650 @@ -1990,7 +1990,7 @@ lbl_802B878C: /* 802B8798 C3 E2 C0 3C */ lfs f31, lit_3512(r2) lbl_802B879C: /* 802B879C 3A 80 00 01 */ li r20, 1 -/* 802B87A0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B87A0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B87A4 4B FF DF 91 */ bl checkDayTime__11Z2StatusMgrFv /* 802B87A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B87AC 41 82 00 20 */ beq lbl_802B87CC @@ -2018,7 +2018,7 @@ lbl_802B87E8: /* 802B87FC C3 E2 C0 3C */ lfs f31, lit_3512(r2) /* 802B8800 38 00 00 01 */ li r0, 1 /* 802B8804 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8808 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8808 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B880C 38 80 00 01 */ li r4, 1 /* 802B8810 38 A0 02 BC */ li r5, 0x2bc /* 802B8814 38 C0 04 4C */ li r6, 0x44c @@ -2053,7 +2053,7 @@ lbl_802B8870: lbl_802B887C: /* 802B887C C3 E2 C0 3C */ lfs f31, lit_3512(r2) /* 802B8880 3B C0 00 4D */ li r30, 0x4d -/* 802B8884 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8884 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8888 38 80 00 01 */ li r4, 1 /* 802B888C 38 A0 02 BC */ li r5, 0x2bc /* 802B8890 38 C0 04 4C */ li r6, 0x44c @@ -2108,7 +2108,7 @@ lbl_802B8938: /* 802B8938 3B C0 00 5D */ li r30, 0x5d /* 802B893C 38 00 00 01 */ li r0, 1 /* 802B8940 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8944 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8944 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8948 38 80 00 01 */ li r4, 1 /* 802B894C 38 A0 02 BC */ li r5, 0x2bc /* 802B8950 38 C0 04 4C */ li r6, 0x44c @@ -2126,7 +2126,7 @@ lbl_802B8938: /* 802B8980 3B 20 00 40 */ li r25, 0x40 /* 802B8984 3B A0 00 01 */ li r29, 1 /* 802B8988 3B C0 00 02 */ li r30, 2 -/* 802B898C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B898C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8990 7F 44 D3 78 */ mr r4, r26 /* 802B8994 4B FF 75 F9 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B8998 48 00 0D 20 */ b lbl_802B96B8 @@ -2143,13 +2143,13 @@ lbl_802B8938: /* 802B89C4 3B C0 00 03 */ li r30, 3 /* 802B89C8 38 00 00 01 */ li r0, 1 /* 802B89CC 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B89D0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B89D0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B89D4 38 80 00 01 */ li r4, 1 /* 802B89D8 38 A0 02 BC */ li r5, 0x2bc /* 802B89DC 38 C0 04 4C */ li r6, 0x44c /* 802B89E0 38 E0 05 DC */ li r7, 0x5dc /* 802B89E4 48 00 6F 9D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs -/* 802B89E8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B89E8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B89EC 88 8D 82 E0 */ lbz r4, struct_80450860+0x0(r13) /* 802B89F0 48 00 0F BD */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B89F4 48 00 0C C4 */ b lbl_802B96B8 @@ -2188,14 +2188,14 @@ lbl_802B8A6C: /* 802B8A70 3B C0 00 04 */ li r30, 4 /* 802B8A74 38 00 00 01 */ li r0, 1 /* 802B8A78 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8A7C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8A7C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8A80 38 80 00 01 */ li r4, 1 /* 802B8A84 38 A0 02 BC */ li r5, 0x2bc /* 802B8A88 38 C0 04 4C */ li r6, 0x44c /* 802B8A8C 38 E0 05 DC */ li r7, 0x5dc /* 802B8A90 48 00 6E F1 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs lbl_802B8A94: -/* 802B8A94 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B8A94 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8A98 88 8D 82 E0 */ lbz r4, struct_80450860+0x0(r13) /* 802B8A9C 48 00 0F 11 */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B8AA0 48 00 0C 18 */ b lbl_802B96B8 @@ -2208,7 +2208,7 @@ lbl_802B8A94: /* 802B8ABC 48 00 0F CD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8AC0 3B E0 00 13 */ li r31, 0x13 /* 802B8AC4 3B 20 00 3C */ li r25, 0x3c -/* 802B8AC8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B8AC8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8ACC 7F 44 D3 78 */ mr r4, r26 /* 802B8AD0 4B FF 74 BD */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B8AD4 3B A0 00 05 */ li r29, 5 @@ -2227,7 +2227,7 @@ lbl_802B8A94: /* 802B8B08 3B 20 00 14 */ li r25, 0x14 /* 802B8B0C 38 00 00 01 */ li r0, 1 /* 802B8B10 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8B14 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8B14 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8B18 38 80 00 01 */ li r4, 1 /* 802B8B1C 38 A0 02 BC */ li r5, 0x2bc /* 802B8B20 38 C0 04 4C */ li r6, 0x44c @@ -2269,7 +2269,7 @@ lbl_802B8BA4: /* 802B8BA8 3B C0 00 08 */ li r30, 8 /* 802B8BAC 38 00 00 01 */ li r0, 1 /* 802B8BB0 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8BB4 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8BB4 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8BB8 38 80 00 01 */ li r4, 1 /* 802B8BBC 38 A0 02 BC */ li r5, 0x2bc /* 802B8BC0 38 C0 04 4C */ li r6, 0x44c @@ -2301,7 +2301,7 @@ lbl_802B8BA4: /* 802B8C28 3B C0 00 0B */ li r30, 0xb /* 802B8C2C 38 00 00 01 */ li r0, 1 /* 802B8C30 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8C34 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8C34 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8C38 38 80 00 01 */ li r4, 1 /* 802B8C3C 38 A0 02 BC */ li r5, 0x2bc /* 802B8C40 38 C0 04 4C */ li r6, 0x44c @@ -2343,7 +2343,7 @@ lbl_802B8CC4: /* 802B8CC8 3B C0 00 0C */ li r30, 0xc /* 802B8CCC 38 00 00 01 */ li r0, 1 /* 802B8CD0 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8CD4 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8CD4 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8CD8 38 80 00 01 */ li r4, 1 /* 802B8CDC 38 A0 02 BC */ li r5, 0x2bc /* 802B8CE0 38 C0 04 4C */ li r6, 0x44c @@ -2363,7 +2363,7 @@ lbl_802B8CC4: /* 802B8D18 3B C0 00 0E */ li r30, 0xe /* 802B8D1C 2C 1A 00 01 */ cmpwi r26, 1 /* 802B8D20 40 82 09 98 */ bne lbl_802B96B8 -/* 802B8D24 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8D24 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8D28 38 80 00 01 */ li r4, 1 /* 802B8D2C 38 A0 02 BC */ li r5, 0x2bc /* 802B8D30 38 C0 04 4C */ li r6, 0x44c @@ -2383,7 +2383,7 @@ lbl_802B8CC4: /* 802B8D68 3B C0 00 0F */ li r30, 0xf /* 802B8D6C 38 00 00 01 */ li r0, 1 /* 802B8D70 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8D74 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8D74 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8D78 38 80 00 01 */ li r4, 1 /* 802B8D7C 38 A0 02 BC */ li r5, 0x2bc /* 802B8D80 38 C0 04 4C */ li r6, 0x44c @@ -2425,7 +2425,7 @@ lbl_802B8E04: /* 802B8E08 3B C0 00 10 */ li r30, 0x10 /* 802B8E0C 38 00 00 01 */ li r0, 1 /* 802B8E10 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8E14 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8E14 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8E18 38 80 00 01 */ li r4, 1 /* 802B8E1C 38 A0 02 BC */ li r5, 0x2bc /* 802B8E20 38 C0 04 4C */ li r6, 0x44c @@ -2443,7 +2443,7 @@ lbl_802B8E04: /* 802B8E50 3B 20 00 40 */ li r25, 0x40 /* 802B8E54 3B A0 00 11 */ li r29, 0x11 /* 802B8E58 3B C0 00 12 */ li r30, 0x12 -/* 802B8E5C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B8E5C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8E60 7F 44 D3 78 */ mr r4, r26 /* 802B8E64 4B FF 71 29 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B8E68 48 00 08 50 */ b lbl_802B96B8 @@ -2460,17 +2460,17 @@ lbl_802B8E04: /* 802B8E94 3B C0 00 13 */ li r30, 0x13 /* 802B8E98 38 00 00 01 */ li r0, 1 /* 802B8E9C 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8EA0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8EA0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8EA4 38 80 00 01 */ li r4, 1 /* 802B8EA8 38 A0 02 BC */ li r5, 0x2bc /* 802B8EAC 38 C0 04 4C */ li r6, 0x44c /* 802B8EB0 38 E0 05 DC */ li r7, 0x5dc /* 802B8EB4 48 00 6A CD */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs -/* 802B8EB8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B8EB8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8EBC 7F 44 D3 78 */ mr r4, r26 /* 802B8EC0 4B FF 70 CD */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B8EC4 48 00 07 F4 */ b lbl_802B96B8 -/* 802B8EC8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B8EC8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B8ECC 38 80 00 3C */ li r4, 0x3c /* 802B8ED0 48 00 0A DD */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B8ED4 3B A0 00 11 */ li r29, 0x11 @@ -2508,7 +2508,7 @@ lbl_802B8F48: /* 802B8F4C 3B C0 00 14 */ li r30, 0x14 /* 802B8F50 38 00 00 01 */ li r0, 1 /* 802B8F54 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8F58 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8F58 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8F5C 38 80 00 01 */ li r4, 1 /* 802B8F60 38 A0 02 BC */ li r5, 0x2bc /* 802B8F64 38 C0 04 4C */ li r6, 0x44c @@ -2540,7 +2540,7 @@ lbl_802B8F48: /* 802B8FCC 3B C0 00 17 */ li r30, 0x17 /* 802B8FD0 38 00 00 01 */ li r0, 1 /* 802B8FD4 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B8FD8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B8FD8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B8FDC 38 80 00 01 */ li r4, 1 /* 802B8FE0 38 A0 02 BC */ li r5, 0x2bc /* 802B8FE4 38 C0 04 4C */ li r6, 0x44c @@ -2582,7 +2582,7 @@ lbl_802B9068: /* 802B906C 3B C0 00 18 */ li r30, 0x18 /* 802B9070 38 00 00 01 */ li r0, 1 /* 802B9074 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B9078 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B9078 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B907C 38 80 00 01 */ li r4, 1 /* 802B9080 38 A0 02 BC */ li r5, 0x2bc /* 802B9084 38 C0 04 4C */ li r6, 0x44c @@ -2626,7 +2626,7 @@ lbl_802B90E0: /* 802B9114 3B C0 00 1B */ li r30, 0x1b /* 802B9118 38 00 00 01 */ li r0, 1 /* 802B911C 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B9120 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B9120 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B9124 38 80 00 01 */ li r4, 1 /* 802B9128 38 A0 02 BC */ li r5, 0x2bc /* 802B912C 38 C0 04 4C */ li r6, 0x44c @@ -2668,7 +2668,7 @@ lbl_802B91B0: /* 802B91B4 3B C0 00 1C */ li r30, 0x1c /* 802B91B8 38 00 00 01 */ li r0, 1 /* 802B91BC 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B91C0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B91C0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B91C4 38 80 00 01 */ li r4, 1 /* 802B91C8 38 A0 02 BC */ li r5, 0x2bc /* 802B91CC 38 C0 04 4C */ li r6, 0x44c @@ -2704,7 +2704,7 @@ lbl_802B921C: /* 802B9234 38 61 02 3C */ addi r3, r1, 0x23c /* 802B9238 48 00 08 51 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B923C 3B E0 00 28 */ li r31, 0x28 -/* 802B9240 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9240 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9244 7F 44 D3 78 */ mr r4, r26 /* 802B9248 4B FF 6D 45 */ bl changeBgmStatus__8Z2SeqMgrFl lbl_802B924C: @@ -2724,7 +2724,7 @@ lbl_802B924C: /* 802B9280 3B C0 00 1F */ li r30, 0x1f /* 802B9284 38 00 00 01 */ li r0, 1 /* 802B9288 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B928C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B928C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B9290 38 80 00 01 */ li r4, 1 /* 802B9294 38 A0 02 BC */ li r5, 0x2bc /* 802B9298 38 C0 04 4C */ li r6, 0x44c @@ -2769,7 +2769,7 @@ lbl_802B9300: /* 802B9328 7C 64 1B 78 */ mr r4, r3 /* 802B932C 38 61 02 3C */ addi r3, r1, 0x23c /* 802B9330 48 00 07 59 */ bl __as__10JAISoundIDFRC10JAISoundID -/* 802B9334 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B9334 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B9338 38 63 07 F4 */ addi r3, r3, 0x7f4 /* 802B933C 48 00 06 59 */ bl func_802B9994 /* 802B9340 7C 70 1B 78 */ mr r16, r3 @@ -2804,7 +2804,7 @@ lbl_802B9380: lbl_802B93A8: /* 802B93A8 38 00 00 01 */ li r0, 1 /* 802B93AC 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B93B0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B93B0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B93B4 38 80 00 01 */ li r4, 1 /* 802B93B8 38 A0 02 BC */ li r5, 0x2bc /* 802B93BC 38 C0 04 4C */ li r6, 0x44c @@ -2841,7 +2841,7 @@ lbl_802B9410: /* 802B9430 3A A0 00 01 */ li r21, 1 /* 802B9434 48 00 00 18 */ b lbl_802B944C lbl_802B9438: -/* 802B9438 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9438 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B943C 38 80 00 2D */ li r4, 0x2d /* 802B9440 38 A0 00 00 */ li r5, 0 /* 802B9444 4B FF 5F C5 */ bl bgmStop__8Z2SeqMgrFUll @@ -2851,7 +2851,7 @@ lbl_802B944C: /* 802B9450 3B C0 00 22 */ li r30, 0x22 /* 802B9454 38 00 00 01 */ li r0, 1 /* 802B9458 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B945C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B945C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B9460 38 80 00 01 */ li r4, 1 /* 802B9464 38 A0 02 BC */ li r5, 0x2bc /* 802B9468 38 C0 04 4C */ li r6, 0x44c @@ -2889,7 +2889,7 @@ lbl_802B94D4: /* 802B94D4 3B A0 00 56 */ li r29, 0x56 /* 802B94D8 38 00 00 01 */ li r0, 1 /* 802B94DC 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B94E0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B94E0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B94E4 38 80 00 01 */ li r4, 1 /* 802B94E8 38 A0 02 BC */ li r5, 0x2bc /* 802B94EC 38 C0 04 4C */ li r6, 0x44c @@ -2901,7 +2901,7 @@ lbl_802B94D4: /* 802B9504 3B A0 00 8C */ li r29, 0x8c /* 802B9508 38 00 00 01 */ li r0, 1 /* 802B950C 98 1B 00 1B */ stb r0, 0x1b(r27) -/* 802B9510 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B9510 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B9514 38 80 00 01 */ li r4, 1 /* 802B9518 38 A0 02 BC */ li r5, 0x2bc /* 802B951C 38 C0 04 4C */ li r6, 0x44c @@ -3059,13 +3059,13 @@ lbl_802B9754: /* 802B975C 2C 17 00 19 */ cmpwi r23, 0x19 /* 802B9760 40 82 00 18 */ bne lbl_802B9778 lbl_802B9764: -/* 802B9764 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9764 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B9768 38 80 00 21 */ li r4, 0x21 /* 802B976C C0 22 C0 54 */ lfs f1, lit_5342(r2) /* 802B9770 48 00 02 B5 */ bl muteSceneBgm__8Z2SeqMgrFUlf /* 802B9774 48 00 00 10 */ b lbl_802B9784 lbl_802B9778: -/* 802B9778 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9778 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B977C 38 80 00 21 */ li r4, 0x21 /* 802B9780 48 00 02 2D */ bl unMuteSceneBgm__8Z2SeqMgrFUl lbl_802B9784: @@ -3091,18 +3091,18 @@ lbl_802B97B4: /* 802B97C8 38 61 02 3C */ addi r3, r1, 0x23c /* 802B97CC 48 00 02 BD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B97D0 3B E0 00 37 */ li r31, 0x37 -/* 802B97D4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B97D4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B97D8 38 80 00 01 */ li r4, 1 /* 802B97DC 4B FF 67 B1 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802B97E0 3B 00 00 00 */ li r24, 0 lbl_802B97E4: -/* 802B97E4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B97E4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B97E8 38 63 07 9C */ addi r3, r3, 0x79c /* 802B97EC 48 00 01 8D */ bl isActive__12JAIStreamMgrCFv /* 802B97F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B97F4 41 82 00 64 */ beq lbl_802B9858 -/* 802B97F8 82 6D 85 D8 */ lwz r19, data_80450B58(r13) -/* 802B97FC 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B97F8 82 6D 85 D8 */ lwz r19, __OSReport_disable-0x40(r13) +/* 802B97FC 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B9800 38 63 07 F4 */ addi r3, r3, 0x7f4 /* 802B9804 48 00 01 91 */ bl func_802B9994 /* 802B9808 7C 70 1B 78 */ mr r16, r3 @@ -3130,18 +3130,18 @@ lbl_802B9850: /* 802B9850 28 10 00 00 */ cmplwi r16, 0 /* 802B9854 40 82 FF C0 */ bne lbl_802B9814 lbl_802B9858: -/* 802B9858 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9858 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B985C 7E A4 AB 78 */ mr r4, r21 /* 802B9860 38 A0 00 1E */ li r5, 0x1e /* 802B9864 4B FF 9A B5 */ bl setHeightVolMod__8Z2SeqMgrFbUl -/* 802B9868 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9868 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B986C 7F 04 C3 78 */ mr r4, r24 /* 802B9870 38 A0 00 00 */ li r5, 0 /* 802B9874 4B FF 9B 25 */ bl setTimeProcVolMod__8Z2SeqMgrFbUl -/* 802B9878 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B9878 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B987C 7E 84 A3 78 */ mr r4, r20 /* 802B9880 48 00 00 E9 */ bl setFieldBgmPlay__8Z2SeqMgrFb -/* 802B9884 80 6D 85 BC */ lwz r3, data_80450B3C(r13) +/* 802B9884 80 6D 85 BC */ lwz r3, __OSReport_disable-0x5C(r13) /* 802B9888 7E E4 BB 78 */ mr r4, r23 /* 802B988C 7F 45 07 74 */ extsb r5, r26 /* 802B9890 FC 20 F8 90 */ fmr f1, f31 diff --git a/asm/Z2AudioLib/Z2SeMgr/__ct__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/__ct__7Z2SeMgrFv.s deleted file mode 100644 index 149b0b0fd0..0000000000 --- a/asm/Z2AudioLib/Z2SeMgr/__ct__7Z2SeMgrFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_802AB64C: -/* 802AB64C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB650 7C 08 02 A6 */ mflr r0 -/* 802AB654 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB65C 7C 7F 1B 78 */ mr r31, r3 -/* 802AB660 93 ED 86 08 */ stw r31, data_80450B88(r13) -/* 802AB664 3C 80 80 2A */ lis r4, __ct__14JAISoundHandleFv@ha /* 0x802A4AC4@ha */ -/* 802AB668 38 84 4A C4 */ addi r4, r4, __ct__14JAISoundHandleFv@l /* 0x802A4AC4@l */ -/* 802AB66C 3C A0 80 00 */ lis r5, __dt__14JAISoundHandleFv@ha /* 0x80007838@ha */ -/* 802AB670 38 A5 78 38 */ addi r5, r5, __dt__14JAISoundHandleFv@l /* 0x80007838@l */ -/* 802AB674 38 C0 00 04 */ li r6, 4 -/* 802AB678 38 E0 00 18 */ li r7, 0x18 -/* 802AB67C 48 0B 66 E5 */ bl __construct_array -/* 802AB680 93 FF 00 60 */ stw r31, 0x60(r31) -/* 802AB684 38 00 00 18 */ li r0, 0x18 -/* 802AB688 90 1F 00 64 */ stw r0, 0x64(r31) -/* 802AB68C 38 7F 00 68 */ addi r3, r31, 0x68 -/* 802AB690 3C 80 80 2B */ lis r4, __ct__12Z2MultiSeObjFv@ha /* 0x802AB710@ha */ -/* 802AB694 38 84 B7 10 */ addi r4, r4, __ct__12Z2MultiSeObjFv@l /* 0x802AB710@l */ -/* 802AB698 3C A0 80 00 */ lis r5, __dt__12Z2MultiSeObjFv@ha /* 0x80007888@ha */ -/* 802AB69C 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l /* 0x80007888@l */ -/* 802AB6A0 38 C0 00 24 */ li r6, 0x24 -/* 802AB6A4 38 E0 00 0A */ li r7, 0xa -/* 802AB6A8 48 0B 66 B9 */ bl __construct_array -/* 802AB6AC 38 7F 01 D4 */ addi r3, r31, 0x1d4 -/* 802AB6B0 3C 80 80 2B */ lis r4, __ct__12Z2MultiSeObjFv@ha /* 0x802AB710@ha */ -/* 802AB6B4 38 84 B7 10 */ addi r4, r4, __ct__12Z2MultiSeObjFv@l /* 0x802AB710@l */ -/* 802AB6B8 3C A0 80 00 */ lis r5, __dt__12Z2MultiSeObjFv@ha /* 0x80007888@ha */ -/* 802AB6BC 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l /* 0x80007888@l */ -/* 802AB6C0 38 C0 00 24 */ li r6, 0x24 -/* 802AB6C4 38 E0 00 0A */ li r7, 0xa -/* 802AB6C8 48 0B 66 99 */ bl __construct_array -/* 802AB6CC 38 00 00 00 */ li r0, 0 -/* 802AB6D0 98 1F 03 C0 */ stb r0, 0x3c0(r31) -/* 802AB6D4 98 1F 03 C1 */ stb r0, 0x3c1(r31) -/* 802AB6D8 98 1F 03 C2 */ stb r0, 0x3c2(r31) -/* 802AB6DC 98 1F 03 C3 */ stb r0, 0x3c3(r31) -/* 802AB6E0 98 1F 03 C4 */ stb r0, 0x3c4(r31) -/* 802AB6E4 98 1F 03 C5 */ stb r0, 0x3c5(r31) -/* 802AB6E8 98 1F 03 C9 */ stb r0, 0x3c9(r31) -/* 802AB6EC 98 1F 03 CA */ stb r0, 0x3ca(r31) -/* 802AB6F0 98 1F 03 CB */ stb r0, 0x3cb(r31) -/* 802AB6F4 98 1F 03 CC */ stb r0, 0x3cc(r31) -/* 802AB6F8 7F E3 FB 78 */ mr r3, r31 -/* 802AB6FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB700 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB704 7C 08 03 A6 */ mtlr r0 -/* 802AB708 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB70C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/isSoundCulling__7Z2SeMgrF10JAISoundID.s b/asm/Z2AudioLib/Z2SeMgr/isSoundCulling__7Z2SeMgrF10JAISoundID.s index 08804c5dce..0666004510 100644 --- a/asm/Z2AudioLib/Z2SeMgr/isSoundCulling__7Z2SeMgrF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SeMgr/isSoundCulling__7Z2SeMgrF10JAISoundID.s @@ -4,7 +4,7 @@ lbl_802AE5B0: /* 802AE5B8 90 01 00 24 */ stw r0, 0x24(r1) /* 802AE5BC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802AE5C0 7C 9F 23 78 */ mr r31, r4 -/* 802AE5C4 80 AD 86 04 */ lwz r5, data_80450B84(r13) +/* 802AE5C4 80 AD 86 04 */ lwz r5, __OSReport_disable-0x14(r13) /* 802AE5C8 38 80 00 00 */ li r4, 0 /* 802AE5CC 80 05 00 08 */ lwz r0, 8(r5) /* 802AE5D0 28 00 00 00 */ cmplwi r0, 0 @@ -208,7 +208,7 @@ lbl_802AE878: /* 802AE894 40 80 02 58 */ bge lbl_802AEAEC /* 802AE898 48 00 02 38 */ b lbl_802AEAD0 lbl_802AE89C: -/* 802AE89C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AE89C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AE8A0 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802AE8A4 28 00 00 00 */ cmplwi r0, 0 /* 802AE8A8 40 82 02 44 */ bne lbl_802AEAEC @@ -294,7 +294,7 @@ lbl_802AE9A8: /* 802AE9A8 38 80 00 01 */ li r4, 1 /* 802AE9AC 98 83 03 CA */ stb r4, 0x3ca(r3) /* 802AE9B0 90 01 00 10 */ stw r0, 0x10(r1) -/* 802AE9B4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AE9B4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AE9B8 38 81 00 10 */ addi r4, r1, 0x10 /* 802AE9BC C0 22 BE A8 */ lfs f1, lit_4052(r2) /* 802AE9C0 4B FF C0 29 */ bl multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf @@ -309,12 +309,12 @@ lbl_802AE9DC: /* 802AE9DC 38 80 00 01 */ li r4, 1 /* 802AE9E0 98 83 03 CB */ stb r4, 0x3cb(r3) /* 802AE9E4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802AE9E8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AE9E8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AE9EC 38 81 00 0C */ addi r4, r1, 0xc /* 802AE9F0 4B FF BD ED */ bl stopSoundID__10Z2SoundMgrF10JAISoundID /* 802AE9F4 80 1F 00 00 */ lwz r0, 0(r31) /* 802AE9F8 90 01 00 08 */ stw r0, 8(r1) -/* 802AE9FC 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AE9FC 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AEA00 38 81 00 08 */ addi r4, r1, 8 /* 802AEA04 C0 22 BE A8 */ lfs f1, lit_4052(r2) /* 802AEA08 4B FF BF E1 */ bl multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf diff --git a/asm/Z2AudioLib/Z2SeMgr/menuInSe__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/menuInSe__7Z2SeMgrFv.s index 43219d2162..4d695c336f 100644 --- a/asm/Z2AudioLib/Z2SeMgr/menuInSe__7Z2SeMgrFv.s +++ b/asm/Z2AudioLib/Z2SeMgr/menuInSe__7Z2SeMgrFv.s @@ -3,11 +3,11 @@ lbl_802ADD58: /* 802ADD5C 7C 08 02 A6 */ mflr r0 /* 802ADD60 90 01 00 14 */ stw r0, 0x14(r1) /* 802ADD64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ADD68 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802ADD68 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802ADD6C 88 04 00 1C */ lbz r0, 0x1c(r4) /* 802ADD70 28 00 00 00 */ cmplwi r0, 0 /* 802ADD74 41 82 00 D4 */ beq lbl_802ADE48 -/* 802ADD78 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802ADD78 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802ADD7C 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802ADD80 28 00 00 0D */ cmplwi r0, 0xd /* 802ADD84 40 82 00 10 */ bne lbl_802ADD94 @@ -15,7 +15,7 @@ lbl_802ADD58: /* 802ADD8C 38 80 00 00 */ li r4, 0 /* 802ADD90 4B FF FC 65 */ bl seMoveVolumeAll__7Z2SeMgrFfUl lbl_802ADD94: -/* 802ADD94 83 ED 85 E0 */ lwz r31, data_80450B60(r13) +/* 802ADD94 83 ED 85 E0 */ lwz r31, __OSReport_disable-0x38(r13) /* 802ADD98 38 7F 00 20 */ addi r3, r31, 0x20 /* 802ADD9C C0 2D 82 C0 */ lfs f1, VOL_SE_SYSTEM_PAUSING__7Z2Param(r13) /* 802ADDA0 38 80 00 02 */ li r4, 2 @@ -52,7 +52,7 @@ lbl_802ADD94: /* 802ADE1C C0 2D 82 D8 */ lfs f1, VOL_SE_OBJECT_PAUSING__7Z2Param(r13) /* 802ADE20 38 80 00 02 */ li r4, 2 /* 802ADE24 4B FF 4F 91 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802ADE28 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ADE28 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ADE2C 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ADE30 28 00 00 0C */ cmplwi r0, 0xc /* 802ADE34 41 82 00 14 */ beq lbl_802ADE48 diff --git a/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s b/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s index 14277f0dcd..3d3e326570 100644 --- a/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s +++ b/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s @@ -5,7 +5,7 @@ lbl_802ADB14: /* 802ADB20 7C 88 23 78 */ mr r8, r4 /* 802ADB24 7C A0 2B 78 */ mr r0, r5 /* 802ADB28 7C C7 33 78 */ mr r7, r6 -/* 802ADB2C 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 802ADB2C 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 802ADB30 38 80 00 00 */ li r4, 0 /* 802ADB34 7D 05 43 78 */ mr r5, r8 /* 802ADB38 7C 06 03 78 */ mr r6, r0 diff --git a/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s b/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s index 1e4c01bca2..7cb09fa77c 100644 --- a/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s +++ b/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s @@ -52,7 +52,7 @@ lbl_802AB8C4: /* 802AB8DC D0 06 03 44 */ stfs f0, 0x344(r6) /* 802AB8E0 C0 05 00 08 */ lfs f0, 8(r5) /* 802AB8E4 D0 06 03 48 */ stfs f0, 0x348(r6) -/* 802AB8E8 80 AD 85 C4 */ lwz r5, data_80450B44(r13) +/* 802AB8E8 80 AD 85 C4 */ lwz r5, __OSReport_disable-0x54(r13) /* 802AB8EC E0 25 01 70 */ psq_l f1, 368(r5), 0, 0 /* qr0 */ /* 802AB8F0 C0 05 01 78 */ lfs f0, 0x178(r5) /* 802AB8F4 F0 21 00 08 */ psq_st f1, 8(r1), 0, 0 /* qr0 */ diff --git a/asm/Z2AudioLib/Z2SeMgr/processSeFramework__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/processSeFramework__7Z2SeMgrFv.s index 06a118d8c3..7851075729 100644 --- a/asm/Z2AudioLib/Z2SeMgr/processSeFramework__7Z2SeMgrFv.s +++ b/asm/Z2AudioLib/Z2SeMgr/processSeFramework__7Z2SeMgrFv.s @@ -11,7 +11,7 @@ lbl_802AE184: /* 802AE1A8 39 61 00 30 */ addi r11, r1, 0x30 /* 802AE1AC 48 0B 40 29 */ bl _savegpr_27 /* 802AE1B0 7C 7F 1B 78 */ mr r31, r3 -/* 802AE1B4 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802AE1B4 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802AE1B8 88 04 00 1D */ lbz r0, 0x1d(r4) /* 802AE1BC 28 00 00 00 */ cmplwi r0, 0 /* 802AE1C0 41 82 00 44 */ beq lbl_802AE204 diff --git a/asm/Z2AudioLib/Z2SeMgr/registMultiSePos__12Z2MultiSeMgrFP3Vec.s b/asm/Z2AudioLib/Z2SeMgr/registMultiSePos__12Z2MultiSeMgrFP3Vec.s index c75f929151..55a00cdd9c 100644 --- a/asm/Z2AudioLib/Z2SeMgr/registMultiSePos__12Z2MultiSeMgrFP3Vec.s +++ b/asm/Z2AudioLib/Z2SeMgr/registMultiSePos__12Z2MultiSeMgrFP3Vec.s @@ -19,11 +19,11 @@ lbl_802AEBA4: /* 802AEBB0 38 00 00 00 */ li r0, 0 /* 802AEBB4 98 1F 00 18 */ stb r0, 0x18(r31) lbl_802AEBB8: -/* 802AEBB8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AEBB8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AEBBC 38 A1 00 08 */ addi r5, r1, 8 /* 802AEBC0 38 C0 00 00 */ li r6, 0 /* 802AEBC4 48 00 ED 69 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci -/* 802AEBC8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AEBC8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AEBCC 38 81 00 08 */ addi r4, r1, 8 /* 802AEBD0 C0 3F 00 00 */ lfs f1, 0(r31) /* 802AEBD4 38 A0 00 00 */ li r5, 0 @@ -36,12 +36,12 @@ lbl_802AEBB8: /* 802AEBF0 88 7F 00 18 */ lbz r3, 0x18(r31) /* 802AEBF4 48 00 00 A4 */ b lbl_802AEC98 lbl_802AEBF8: -/* 802AEBF8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AEBF8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AEBFC 38 81 00 08 */ addi r4, r1, 8 /* 802AEC00 38 A0 00 00 */ li r5, 0 /* 802AEC04 48 00 EE 41 */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802AEC08 FF E0 08 90 */ fmr f31, f1 -/* 802AEC0C 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AEC0C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AEC10 38 81 00 08 */ addi r4, r1, 8 /* 802AEC14 38 A0 00 00 */ li r5, 0 /* 802AEC18 48 00 EF 2D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci diff --git a/asm/Z2AudioLib/Z2SeMgr/seMoveVolumeAll__7Z2SeMgrFfUl.s b/asm/Z2AudioLib/Z2SeMgr/seMoveVolumeAll__7Z2SeMgrFfUl.s index 1670e490ed..3cc240a8ef 100644 --- a/asm/Z2AudioLib/Z2SeMgr/seMoveVolumeAll__7Z2SeMgrFfUl.s +++ b/asm/Z2AudioLib/Z2SeMgr/seMoveVolumeAll__7Z2SeMgrFfUl.s @@ -8,13 +8,13 @@ lbl_802AD9F4: /* 802ADA0C 93 C1 00 08 */ stw r30, 8(r1) /* 802ADA10 FF E0 08 90 */ fmr f31, f1 /* 802ADA14 7C 9E 23 78 */ mr r30, r4 -/* 802ADA18 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ADA18 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ADA1C 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ADA20 28 00 00 0D */ cmplwi r0, 0xd /* 802ADA24 40 82 00 08 */ bne lbl_802ADA2C /* 802ADA28 C3 E2 BE 78 */ lfs f31, lit_4040(r2) lbl_802ADA2C: -/* 802ADA2C 83 ED 85 E0 */ lwz r31, data_80450B60(r13) +/* 802ADA2C 83 ED 85 E0 */ lwz r31, __OSReport_disable-0x38(r13) /* 802ADA30 38 7F 00 8C */ addi r3, r31, 0x8c /* 802ADA34 C0 0D 82 7C */ lfs f0, VOL_SE_LINK_VOICE_DEFAULT__7Z2Param(r13) /* 802ADA38 EC 20 07 F2 */ fmuls f1, f0, f31 @@ -55,7 +55,7 @@ lbl_802ADA2C: /* 802ADAC4 EC 20 07 F2 */ fmuls f1, f0, f31 /* 802ADAC8 7F C4 F3 78 */ mr r4, r30 /* 802ADACC 4B FF 52 E9 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802ADAD0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ADAD0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ADAD4 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ADAD8 28 00 00 0C */ cmplwi r0, 0xc /* 802ADADC 41 82 00 18 */ beq lbl_802ADAF4 diff --git a/asm/Z2AudioLib/Z2SeMgr/seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s b/asm/Z2AudioLib/Z2SeMgr/seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s index 80809a2dd6..a6d0401344 100644 --- a/asm/Z2AudioLib/Z2SeMgr/seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s +++ b/asm/Z2AudioLib/Z2SeMgr/seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s @@ -56,11 +56,11 @@ lbl_802AC5C4: /* 802AC5DC 41 82 00 30 */ beq lbl_802AC60C /* 802AC5E0 48 00 00 44 */ b lbl_802AC624 lbl_802AC5E4: -/* 802AC5E4 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AC5E4 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AC5E8 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802AC5EC 28 00 00 02 */ cmplwi r0, 2 /* 802AC5F0 41 82 00 14 */ beq lbl_802AC604 -/* 802AC5F4 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AC5F4 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AC5F8 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802AC5FC 28 00 00 00 */ cmplwi r0, 0 /* 802AC600 40 82 00 0C */ bne lbl_802AC60C @@ -908,12 +908,12 @@ lbl_802AD1D8: /* 802AD244 FF E0 08 90 */ fmr f31, f1 /* 802AD248 48 00 03 34 */ b lbl_802AD57C lbl_802AD24C: -/* 802AD24C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AD24C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AD250 80 03 00 04 */ lwz r0, 4(r3) /* 802AD254 2C 00 00 16 */ cmpwi r0, 0x16 /* 802AD258 40 82 03 24 */ bne lbl_802AD57C lbl_802AD25C: -/* 802AD25C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AD25C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AD260 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802AD264 28 00 00 00 */ cmplwi r0, 0 /* 802AD268 40 82 03 14 */ bne lbl_802AD57C @@ -1010,7 +1010,7 @@ lbl_802AD390: /* 802AD3AC 4B FF C3 49 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign /* 802AD3B0 FC C0 08 90 */ fmr f6, f1 lbl_802AD3B4: -/* 802AD3B4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802AD3B4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802AD3B8 C0 02 BE 78 */ lfs f0, lit_4040(r2) /* 802AD3BC FC 06 00 40 */ fcmpo cr0, f6, f0 /* 802AD3C0 40 80 00 08 */ bge lbl_802AD3C8 @@ -1043,7 +1043,7 @@ lbl_802AD3E4: /* 802AD41C 48 00 01 60 */ b lbl_802AD57C lbl_802AD420: /* 802AD420 C0 82 BE 80 */ lfs f4, lit_4042(r2) -/* 802AD424 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AD424 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AD428 88 03 00 0C */ lbz r0, 0xc(r3) /* 802AD42C 2C 00 00 03 */ cmpwi r0, 3 /* 802AD430 40 82 00 2C */ bne lbl_802AD45C @@ -1058,7 +1058,7 @@ lbl_802AD420: /* 802AD454 4B FF C2 39 */ bl linearTransform__6Z2CalcFfffffb /* 802AD458 FC 80 08 90 */ fmr f4, f1 lbl_802AD45C: -/* 802AD45C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AD45C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AD460 88 03 00 00 */ lbz r0, 0(r3) /* 802AD464 28 00 00 17 */ cmplwi r0, 0x17 /* 802AD468 41 81 00 CC */ bgt lbl_802AD534 @@ -1153,7 +1153,7 @@ lbl_802AD590: /* 802AD5BC 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 802AD5C0 28 00 00 01 */ cmplwi r0, 1 /* 802AD5C4 40 82 00 14 */ bne lbl_802AD5D8 -/* 802AD5C8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AD5C8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AD5CC FC 20 F0 90 */ fmr f1, f30 /* 802AD5D0 48 01 01 35 */ bl calcOffMicSound__10Z2AudienceFf /* 802AD5D4 FF C0 08 90 */ fmr f30, f1 @@ -1188,7 +1188,7 @@ lbl_802AD638: /* 802AD63C 41 82 00 20 */ beq lbl_802AD65C /* 802AD640 80 1F 00 60 */ lwz r0, 0x60(r31) /* 802AD644 7C 80 D2 14 */ add r4, r0, r26 -/* 802AD648 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802AD648 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802AD64C 38 A0 00 06 */ li r5, 6 /* 802AD650 57 86 04 3E */ clrlwi r6, r28, 0x10 /* 802AD654 38 E0 FF FF */ li r7, -1 @@ -1276,7 +1276,7 @@ lbl_802AD764: lbl_802AD77C: /* 802AD77C 80 1B 00 00 */ lwz r0, 0(r27) /* 802AD780 90 01 00 10 */ stw r0, 0x10(r1) -/* 802AD784 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802AD784 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802AD788 38 81 00 10 */ addi r4, r1, 0x10 /* 802AD78C 7F E5 FB 78 */ mr r5, r31 /* 802AD790 80 C1 00 08 */ lwz r6, 8(r1) @@ -1310,7 +1310,7 @@ lbl_802AD77C: /* 802AD800 3C 03 FF F8 */ addis r0, r3, 0xfff8 /* 802AD804 28 00 01 75 */ cmplwi r0, 0x175 /* 802AD808 40 82 00 1C */ bne lbl_802AD824 -/* 802AD80C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802AD80C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802AD810 3C 80 01 00 */ lis r4, 0x0100 /* 0x0100002F@ha */ /* 802AD814 38 84 00 2F */ addi r4, r4, 0x002F /* 0x0100002F@l */ /* 802AD818 38 A0 00 00 */ li r5, 0 @@ -1320,7 +1320,7 @@ lbl_802AD824: /* 802AD824 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 802AD828 28 00 00 01 */ cmplwi r0, 1 /* 802AD82C 40 82 00 10 */ bne lbl_802AD83C -/* 802AD830 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AD830 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AD834 FC 20 F0 90 */ fmr f1, f30 /* 802AD838 48 00 FE CD */ bl calcOffMicSound__10Z2AudienceFf lbl_802AD83C: diff --git a/asm/Z2AudioLib/Z2SeMgr/seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s b/asm/Z2AudioLib/Z2SeMgr/seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s index 0c983bf6d7..a2fe3b0375 100644 --- a/asm/Z2AudioLib/Z2SeMgr/seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s +++ b/asm/Z2AudioLib/Z2SeMgr/seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc.s @@ -226,7 +226,7 @@ lbl_802ABCA8: /* 802ABCB0 41 82 06 04 */ beq lbl_802AC2B4 /* 802ABCB4 48 00 07 2C */ b lbl_802AC3E0 lbl_802ABCB8: -/* 802ABCB8 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ABCB8 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ABCBC 48 00 A4 C1 */ bl menuOut__11Z2StatusMgrFv /* 802ABCC0 48 00 07 20 */ b lbl_802AC3E0 lbl_802ABCC4: @@ -429,11 +429,11 @@ lbl_802ABF7C: /* 802ABF90 48 00 19 21 */ bl seStop__7Z2SeMgrF10JAISoundIDUl /* 802ABF94 48 00 04 4C */ b lbl_802AC3E0 lbl_802ABF98: -/* 802ABF98 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ABF98 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ABF9C 48 00 A1 A1 */ bl menuIn__11Z2StatusMgrFv /* 802ABFA0 48 00 04 40 */ b lbl_802AC3E0 lbl_802ABFA4: -/* 802ABFA4 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ABFA4 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ABFA8 48 00 A1 D5 */ bl menuOut__11Z2StatusMgrFv /* 802ABFAC 48 00 04 34 */ b lbl_802AC3E0 lbl_802ABFB0: @@ -449,14 +449,14 @@ lbl_802ABFC4: /* 802ABFD0 C3 82 BE 90 */ lfs f28, lit_4046(r2) /* 802ABFD4 48 00 04 0C */ b lbl_802AC3E0 lbl_802ABFD8: -/* 802ABFD8 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ABFD8 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ABFDC 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ABFE0 28 00 00 00 */ cmplwi r0, 0 /* 802ABFE4 41 82 03 FC */ beq lbl_802AC3E0 /* 802ABFE8 38 60 00 00 */ li r3, 0 /* 802ABFEC 48 00 04 E8 */ b lbl_802AC4D4 lbl_802ABFF0: -/* 802ABFF0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ABFF0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ABFF4 48 00 A1 C9 */ bl isMovieDemo__11Z2StatusMgrFv /* 802ABFF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802ABFFC 41 82 03 E4 */ beq lbl_802AC3E0 @@ -465,7 +465,7 @@ lbl_802ABFF0: /* 802AC008 90 1B 00 00 */ stw r0, 0(r27) /* 802AC00C 48 00 03 D4 */ b lbl_802AC3E0 lbl_802AC010: -/* 802AC010 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AC010 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AC014 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802AC018 28 00 00 01 */ cmplwi r0, 1 /* 802AC01C 40 82 00 14 */ bne lbl_802AC030 @@ -482,11 +482,11 @@ lbl_802AC030: /* 802AC044 90 1B 00 00 */ stw r0, 0(r27) /* 802AC048 48 00 03 98 */ b lbl_802AC3E0 lbl_802AC04C: -/* 802AC04C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AC04C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AC050 88 03 00 2D */ lbz r0, 0x2d(r3) /* 802AC054 28 00 00 00 */ cmplwi r0, 0 /* 802AC058 41 82 00 14 */ beq lbl_802AC06C -/* 802AC05C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AC05C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AC060 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802AC064 28 00 00 00 */ cmplwi r0, 0 /* 802AC068 40 82 03 78 */ bne lbl_802AC3E0 @@ -494,7 +494,7 @@ lbl_802AC06C: /* 802AC06C 38 60 00 00 */ li r3, 0 /* 802AC070 48 00 04 64 */ b lbl_802AC4D4 lbl_802AC074: -/* 802AC074 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AC074 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AC078 E0 23 01 70 */ psq_l f1, 368(r3), 0, 0 /* qr0 */ /* 802AC07C C0 03 01 78 */ lfs f0, 0x178(r3) /* 802AC080 F0 21 00 88 */ psq_st f1, 136(r1), 0, 0 /* qr0 */ @@ -581,7 +581,7 @@ lbl_802AC17C: /* 802AC1B0 FF A0 08 90 */ fmr f29, f1 /* 802AC1B4 48 00 02 2C */ b lbl_802AC3E0 lbl_802AC1B8: -/* 802AC1B8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AC1B8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AC1BC E0 23 01 70 */ psq_l f1, 368(r3), 0, 0 /* qr0 */ /* 802AC1C0 C0 03 01 78 */ lfs f0, 0x178(r3) /* 802AC1C4 F0 21 00 7C */ psq_st f1, 124(r1), 0, 0 /* qr0 */ @@ -709,7 +709,7 @@ lbl_802AC2F0: /* 802AC398 FF 80 08 90 */ fmr f28, f1 /* 802AC39C 48 00 00 44 */ b lbl_802AC3E0 lbl_802AC3A0: -/* 802AC3A0 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AC3A0 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AC3A4 80 03 00 04 */ lwz r0, 4(r3) /* 802AC3A8 2C 00 00 03 */ cmpwi r0, 3 /* 802AC3AC 40 82 00 14 */ bne lbl_802AC3C0 @@ -768,7 +768,7 @@ lbl_802AC458: lbl_802AC470: /* 802AC470 80 1B 00 00 */ lwz r0, 0(r27) /* 802AC474 90 01 00 08 */ stw r0, 8(r1) -/* 802AC478 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802AC478 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802AC47C 38 81 00 08 */ addi r4, r1, 8 /* 802AC480 7F 86 E3 78 */ mr r6, r28 /* 802AC484 7F A7 EB 78 */ mr r7, r29 diff --git a/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s b/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s index 8febbeed8e..53a92140fd 100644 --- a/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s @@ -5,7 +5,7 @@ lbl_802AD94C: /* 802AD958 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AD95C 93 C1 00 08 */ stw r30, 8(r1) /* 802AD960 7C 9E 23 78 */ mr r30, r4 -/* 802AD964 83 ED 85 E0 */ lwz r31, data_80450B60(r13) +/* 802AD964 83 ED 85 E0 */ lwz r31, __OSReport_disable-0x38(r13) /* 802AD968 38 7F 00 18 */ addi r3, r31, 0x18 /* 802AD96C 4B FF 24 75 */ bl stop__16JAISeCategoryMgrFUl /* 802AD970 38 7F 00 84 */ addi r3, r31, 0x84 diff --git a/asm/Z2AudioLib/Z2SeMgr/setLevObjSE__7Z2SeMgrFUlP3VecSc.s b/asm/Z2AudioLib/Z2SeMgr/setLevObjSE__7Z2SeMgrFUlP3VecSc.s index 81581d12ea..fca010e96b 100644 --- a/asm/Z2AudioLib/Z2SeMgr/setLevObjSE__7Z2SeMgrFUlP3VecSc.s +++ b/asm/Z2AudioLib/Z2SeMgr/setLevObjSE__7Z2SeMgrFUlP3VecSc.s @@ -53,7 +53,7 @@ lbl_802ADED8: /* 802ADF18 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 802ADF1C 48 00 00 2C */ b lbl_802ADF48 lbl_802ADF20: -/* 802ADF20 80 AD 85 C4 */ lwz r5, data_80450B44(r13) +/* 802ADF20 80 AD 85 C4 */ lwz r5, __OSReport_disable-0x54(r13) /* 802ADF24 E0 05 01 70 */ psq_l f0, 368(r5), 0, 0 /* qr0 */ /* 802ADF28 C0 25 01 78 */ lfs f1, 0x178(r5) /* 802ADF2C F0 01 00 08 */ psq_st f0, 8(r1), 0, 0 /* qr0 */ diff --git a/asm/Z2AudioLib/Z2SeMgr/setMultiTriggerSE__7Z2SeMgrFUlP3VecSc.s b/asm/Z2AudioLib/Z2SeMgr/setMultiTriggerSE__7Z2SeMgrFUlP3VecSc.s index 380cbc90af..7c58135187 100644 --- a/asm/Z2AudioLib/Z2SeMgr/setMultiTriggerSE__7Z2SeMgrFUlP3VecSc.s +++ b/asm/Z2AudioLib/Z2SeMgr/setMultiTriggerSE__7Z2SeMgrFUlP3VecSc.s @@ -53,7 +53,7 @@ lbl_802AE070: /* 802AE0B0 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 802AE0B4 48 00 00 2C */ b lbl_802AE0E0 lbl_802AE0B8: -/* 802AE0B8 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802AE0B8 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802AE0BC E0 03 01 70 */ psq_l f0, 368(r3), 0, 0 /* qr0 */ /* 802AE0C0 C0 23 01 78 */ lfs f1, 0x178(r3) /* 802AE0C4 F0 01 00 08 */ psq_st f0, 8(r1), 0, 0 /* qr0 */ diff --git a/asm/Z2AudioLib/Z2SeMgr/talkInSe__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/talkInSe__7Z2SeMgrFv.s index cca2cddbf0..cf6d7b190b 100644 --- a/asm/Z2AudioLib/Z2SeMgr/talkInSe__7Z2SeMgrFv.s +++ b/asm/Z2AudioLib/Z2SeMgr/talkInSe__7Z2SeMgrFv.s @@ -3,11 +3,11 @@ lbl_802ADB50: /* 802ADB54 7C 08 02 A6 */ mflr r0 /* 802ADB58 90 01 00 14 */ stw r0, 0x14(r1) /* 802ADB5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ADB60 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802ADB60 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802ADB64 88 04 00 1C */ lbz r0, 0x1c(r4) /* 802ADB68 28 00 00 00 */ cmplwi r0, 0 /* 802ADB6C 41 82 00 D4 */ beq lbl_802ADC40 -/* 802ADB70 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802ADB70 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802ADB74 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802ADB78 28 00 00 0D */ cmplwi r0, 0xd /* 802ADB7C 40 82 00 10 */ bne lbl_802ADB8C @@ -15,7 +15,7 @@ lbl_802ADB50: /* 802ADB84 38 80 00 00 */ li r4, 0 /* 802ADB88 4B FF FE 6D */ bl seMoveVolumeAll__7Z2SeMgrFfUl lbl_802ADB8C: -/* 802ADB8C 83 ED 85 E0 */ lwz r31, data_80450B60(r13) +/* 802ADB8C 83 ED 85 E0 */ lwz r31, __OSReport_disable-0x38(r13) /* 802ADB90 38 7F 00 20 */ addi r3, r31, 0x20 /* 802ADB94 C0 2D 82 9C */ lfs f1, VOL_SE_SYSTEM_TALKING__7Z2Param(r13) /* 802ADB98 38 80 00 02 */ li r4, 2 @@ -52,7 +52,7 @@ lbl_802ADB8C: /* 802ADC14 C0 2D 82 B4 */ lfs f1, VOL_SE_OBJECT_TALKING__7Z2Param(r13) /* 802ADC18 38 80 00 02 */ li r4, 2 /* 802ADC1C 4B FF 51 99 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802ADC20 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ADC20 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ADC24 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ADC28 28 00 00 0C */ cmplwi r0, 0xc /* 802ADC2C 41 82 00 14 */ beq lbl_802ADC40 diff --git a/asm/Z2AudioLib/Z2SeMgr/talkOutSe__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/talkOutSe__7Z2SeMgrFv.s index 8fc719c0bb..1609eb553c 100644 --- a/asm/Z2AudioLib/Z2SeMgr/talkOutSe__7Z2SeMgrFv.s +++ b/asm/Z2AudioLib/Z2SeMgr/talkOutSe__7Z2SeMgrFv.s @@ -3,11 +3,11 @@ lbl_802ADC54: /* 802ADC58 7C 08 02 A6 */ mflr r0 /* 802ADC5C 90 01 00 14 */ stw r0, 0x14(r1) /* 802ADC60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ADC64 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802ADC64 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802ADC68 88 04 00 1C */ lbz r0, 0x1c(r4) /* 802ADC6C 28 00 00 00 */ cmplwi r0, 0 /* 802ADC70 41 82 00 D4 */ beq lbl_802ADD44 -/* 802ADC74 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802ADC74 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802ADC78 88 04 00 2C */ lbz r0, 0x2c(r4) /* 802ADC7C 28 00 00 0D */ cmplwi r0, 0xd /* 802ADC80 40 82 00 10 */ bne lbl_802ADC90 @@ -15,7 +15,7 @@ lbl_802ADC54: /* 802ADC88 38 80 00 00 */ li r4, 0 /* 802ADC8C 4B FF FD 69 */ bl seMoveVolumeAll__7Z2SeMgrFfUl lbl_802ADC90: -/* 802ADC90 83 ED 85 E0 */ lwz r31, data_80450B60(r13) +/* 802ADC90 83 ED 85 E0 */ lwz r31, __OSReport_disable-0x38(r13) /* 802ADC94 38 7F 00 20 */ addi r3, r31, 0x20 /* 802ADC98 C0 2D 82 78 */ lfs f1, VOL_SE_SYSTEM_DEFAULT__7Z2Param(r13) /* 802ADC9C 38 80 00 02 */ li r4, 2 @@ -52,7 +52,7 @@ lbl_802ADC90: /* 802ADD18 C0 2D 82 90 */ lfs f1, VOL_SE_OBJECT_DEFAULT__7Z2Param(r13) /* 802ADD1C 38 80 00 02 */ li r4, 2 /* 802ADD20 4B FF 50 95 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 802ADD24 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802ADD24 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802ADD28 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802ADD2C 28 00 00 0C */ cmplwi r0, 0xc /* 802ADD30 41 82 00 14 */ beq lbl_802ADD44 diff --git a/asm/Z2AudioLib/Z2SeqMgr/__ct__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/__ct__8Z2SeqMgrFv.s index f8808a49ff..ceb203732a 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/__ct__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/__ct__8Z2SeqMgrFv.s @@ -4,7 +4,7 @@ lbl_802AEEA0: /* 802AEEA8 90 01 00 14 */ stw r0, 0x14(r1) /* 802AEEAC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AEEB0 7C 7F 1B 78 */ mr r31, r3 -/* 802AEEB4 93 ED 86 04 */ stw r31, data_80450B84(r13) +/* 802AEEB4 93 ED 86 04 */ stw r31, __OSReport_disable-0x14(r13) /* 802AEEB8 38 00 00 00 */ li r0, 0 /* 802AEEBC 90 03 00 00 */ stw r0, 0(r3) /* 802AEEC0 90 03 00 04 */ stw r0, 4(r3) diff --git a/asm/Z2AudioLib/Z2SeqMgr/battleBgmFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/battleBgmFramework__8Z2SeqMgrFv.s index 84d46a8cd3..23c5fd4e3a 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/battleBgmFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/battleBgmFramework__8Z2SeqMgrFv.s @@ -44,11 +44,11 @@ lbl_802B4C60: /* 802B4C60 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B4C64 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 802B4C68 40 82 02 34 */ bne lbl_802B4E9C -/* 802B4C6C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B4C6C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B4C70 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B4C74 28 00 00 00 */ cmplwi r0, 0 /* 802B4C78 41 82 02 24 */ beq lbl_802B4E9C -/* 802B4C7C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4C7C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4C80 48 00 AD 15 */ bl searchEnemy__13Z2SoundObjMgrFv /* 802B4C84 80 7F 00 04 */ lwz r3, 4(r31) /* 802B4C88 28 03 00 00 */ cmplwi r3, 0 @@ -81,7 +81,7 @@ lbl_802B4CE0: /* 802B4CE0 3C 03 FF 00 */ addis r0, r3, 0xff00 /* 802B4CE4 28 00 00 00 */ cmplwi r0, 0 /* 802B4CE8 40 82 00 14 */ bne lbl_802B4CFC -/* 802B4CEC 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4CEC 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4CF0 48 00 B4 F5 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4CF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4CF8 41 82 01 A4 */ beq lbl_802B4E9C @@ -139,7 +139,7 @@ lbl_802B4DA8: /* 802B4DB4 7F E3 FB 78 */ mr r3, r31 /* 802B4DB8 38 80 00 00 */ li r4, 0 /* 802B4DBC 4B FF F6 15 */ bl setBattleDistIgnore__8Z2SeqMgrFb -/* 802B4DC0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4DC0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4DC4 48 00 B3 5D */ bl checkBattleFinish__13Z2SoundObjMgrFv /* 802B4DC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4DCC 41 82 00 14 */ beq lbl_802B4DE0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/bgmStart__8Z2SeqMgrFUlUll.s b/asm/Z2AudioLib/Z2SeqMgr/bgmStart__8Z2SeqMgrFUlUll.s index ea6e5153d8..671f9a676d 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/bgmStart__8Z2SeqMgrFUlUll.s +++ b/asm/Z2AudioLib/Z2SeqMgr/bgmStart__8Z2SeqMgrFUlUll.s @@ -88,24 +88,24 @@ lbl_802AF148: /* 802AF148 7C 1D 00 40 */ cmplw r29, r0 /* 802AF14C 41 82 02 A4 */ beq lbl_802AF3F0 /* 802AF150 38 00 00 00 */ li r0, 0 -/* 802AF154 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AF154 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AF158 98 03 00 1C */ stb r0, 0x1c(r3) -/* 802AF15C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AF15C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AF160 38 80 00 00 */ li r4, 0 /* 802AF164 48 00 77 7D */ bl setSceneExist__10Z2SceneMgrFb /* 802AF168 7F 83 E3 78 */ mr r3, r28 /* 802AF16C 38 80 00 01 */ li r4, 1 /* 802AF170 48 00 4F F5 */ bl setBattleBgmOff__8Z2SeqMgrFb -/* 802AF174 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AF174 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AF178 38 63 07 28 */ addi r3, r3, 0x728 /* 802AF17C 38 80 00 00 */ li r4, 0 /* 802AF180 4B FF 2C BD */ bl stop__9JAISeqMgrFUl -/* 802AF184 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AF184 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AF188 38 63 07 9C */ addi r3, r3, 0x79c /* 802AF18C 38 80 00 00 */ li r4, 0 /* 802AF190 4B FF 4E D9 */ bl stop__12JAIStreamMgrFUl /* 802AF194 93 A1 00 10 */ stw r29, 0x10(r1) -/* 802AF198 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AF198 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AF19C 38 81 00 10 */ addi r4, r1, 0x10 /* 802AF1A0 7F 85 E3 78 */ mr r5, r28 /* 802AF1A4 38 C0 00 00 */ li r6, 0 @@ -152,7 +152,7 @@ lbl_802AF224: /* 802AF238 90 1C 00 70 */ stw r0, 0x70(r28) /* 802AF23C D0 1C 00 6C */ stfs f0, 0x6c(r28) lbl_802AF240: -/* 802AF240 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AF240 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AF244 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802AF248 28 00 00 09 */ cmplwi r0, 9 /* 802AF24C 40 82 00 54 */ bne lbl_802AF2A0 @@ -195,7 +195,7 @@ lbl_802AF2C4: /* 802AF2CC 48 00 00 30 */ b lbl_802AF2FC lbl_802AF2D0: /* 802AF2D0 93 A1 00 0C */ stw r29, 0xc(r1) -/* 802AF2D4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AF2D4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AF2D8 38 81 00 0C */ addi r4, r1, 0xc /* 802AF2DC 7F 85 E3 78 */ mr r5, r28 /* 802AF2E0 38 C0 00 00 */ li r6, 0 @@ -253,7 +253,7 @@ lbl_802AF39C: /* 802AF39C 88 1C 00 D0 */ lbz r0, 0xd0(r28) /* 802AF3A0 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802AF3A4 41 82 00 30 */ beq lbl_802AF3D4 -/* 802AF3A8 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AF3A8 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AF3AC 48 00 73 89 */ bl checkDayTime__11Z2StatusMgrFv /* 802AF3B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AF3B4 40 82 00 20 */ bne lbl_802AF3D4 diff --git a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s index ebcc974567..ca21a5a84e 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamPrepare__8Z2SeqMgrFUl.s @@ -13,7 +13,7 @@ lbl_802AFB94: /* 802AFBC0 48 00 03 1D */ bl bgmStreamStop__8Z2SeqMgrFUl lbl_802AFBC4: /* 802AFBC4 93 C1 00 08 */ stw r30, 8(r1) -/* 802AFBC8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AFBC8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AFBCC 38 81 00 08 */ addi r4, r1, 8 /* 802AFBD0 38 BF 00 0C */ addi r5, r31, 0xc /* 802AFBD4 38 C0 00 00 */ li r6, 0 @@ -82,7 +82,7 @@ lbl_802AFCA8: /* 802AFCC0 D0 1F 00 7C */ stfs f0, 0x7c(r31) /* 802AFCC4 48 00 01 10 */ b lbl_802AFDD4 lbl_802AFCC8: -/* 802AFCC8 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AFCC8 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AFCCC 38 80 00 01 */ li r4, 1 /* 802AFCD0 48 00 6C 11 */ bl setSceneExist__10Z2SceneMgrFb /* 802AFCD4 48 00 01 00 */ b lbl_802AFDD4 @@ -125,7 +125,7 @@ lbl_802AFD20: /* 802AFD58 D0 7F 00 6C */ stfs f3, 0x6c(r31) /* 802AFD5C 48 00 00 78 */ b lbl_802AFDD4 lbl_802AFD60: -/* 802AFD60 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AFD60 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AFD64 3C 80 80 3A */ lis r4, Z2SeqMgr__stringBase0@ha /* 0x8039BA08@ha */ /* 802AFD68 38 84 BA 08 */ addi r4, r4, Z2SeqMgr__stringBase0@l /* 0x8039BA08@l */ /* 802AFD6C 38 84 02 6A */ addi r4, r4, 0x26a diff --git a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamStop__8Z2SeqMgrFUl.s b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamStop__8Z2SeqMgrFUl.s index 108007d6d8..6b58b894ab 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/bgmStreamStop__8Z2SeqMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/bgmStreamStop__8Z2SeqMgrFUl.s @@ -30,7 +30,7 @@ lbl_802AFF38: /* 802AFF3C 28 00 00 5C */ cmplwi r0, 0x5c /* 802AFF40 40 82 00 18 */ bne lbl_802AFF58 lbl_802AFF44: -/* 802AFF44 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AFF44 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AFF48 3C 80 80 3A */ lis r4, Z2SeqMgr__stringBase0@ha /* 0x8039BA08@ha */ /* 802AFF4C 38 84 BA 08 */ addi r4, r4, Z2SeqMgr__stringBase0@l /* 0x8039BA08@l */ /* 802AFF50 38 84 02 76 */ addi r4, r4, 0x276 diff --git a/asm/Z2AudioLib/Z2SeqMgr/changeBgmStatus__8Z2SeqMgrFl.s b/asm/Z2AudioLib/Z2SeqMgr/changeBgmStatus__8Z2SeqMgrFl.s index 893696770d..59e9632e09 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/changeBgmStatus__8Z2SeqMgrFl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/changeBgmStatus__8Z2SeqMgrFl.s @@ -282,7 +282,7 @@ lbl_802B0394: lbl_802B03AC: /* 802B03AC 3B E0 00 01 */ li r31, 1 /* 802B03B0 48 00 00 1C */ b lbl_802B03CC -/* 802B03B4 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B03B4 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B03B8 38 80 00 01 */ li r4, 1 /* 802B03BC 38 A0 05 DC */ li r5, 0x5dc /* 802B03C0 38 C0 13 88 */ li r6, 0x1388 @@ -2019,7 +2019,7 @@ lbl_802B1D20: /* 802B1D98 FC 60 10 90 */ fmr f3, f2 /* 802B1D9C 48 00 22 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B1DA0: -/* 802B1DA0 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B1DA0 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B1DA4 7F A4 EB 78 */ mr r4, r29 /* 802B1DA8 38 A0 00 09 */ li r5, 9 /* 802B1DAC 57 C6 04 3E */ clrlwi r6, r30, 0x10 diff --git a/asm/Z2AudioLib/Z2SeqMgr/changeSubBgmStatus__8Z2SeqMgrFl.s b/asm/Z2AudioLib/Z2SeqMgr/changeSubBgmStatus__8Z2SeqMgrFl.s index 0ab460bed0..354607c3ea 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/changeSubBgmStatus__8Z2SeqMgrFl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/changeSubBgmStatus__8Z2SeqMgrFl.s @@ -432,7 +432,7 @@ lbl_802B23E0: /* 802B245C 48 00 1B 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2460 48 00 05 00 */ b lbl_802B2960 lbl_802B2464: -/* 802B2464 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B2464 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B2468 38 9C 00 04 */ addi r4, r28, 4 /* 802B246C 38 A0 00 09 */ li r5, 9 /* 802B2470 38 C0 00 01 */ li r6, 1 @@ -759,7 +759,7 @@ lbl_802B27F8: lbl_802B2960: /* 802B2960 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802B2964 41 82 00 1C */ beq lbl_802B2980 -/* 802B2968 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B2968 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B296C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2970 38 A0 00 09 */ li r5, 9 /* 802B2974 57 A6 04 3E */ clrlwi r6, r29, 0x10 diff --git a/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s index 86785f16f9..2c982c3e10 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/fanfareFramework__8Z2SeqMgrFv.s @@ -96,7 +96,7 @@ lbl_802B2F8C: lbl_802B2F94: /* 802B2F94 80 1F 00 10 */ lwz r0, 0x10(r31) /* 802B2F98 90 01 00 14 */ stw r0, 0x14(r1) -/* 802B2F9C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B2F9C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B2FA0 38 81 00 14 */ addi r4, r1, 0x14 /* 802B2FA4 38 BF 00 08 */ addi r5, r31, 8 /* 802B2FA8 38 C0 00 00 */ li r6, 0 @@ -127,7 +127,7 @@ lbl_802B3004: /* 802B3008 28 00 00 00 */ cmplwi r0, 0 /* 802B300C 40 82 00 30 */ bne lbl_802B303C /* 802B3010 90 A1 00 10 */ stw r5, 0x10(r1) -/* 802B3014 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B3014 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B3018 38 81 00 10 */ addi r4, r1, 0x10 /* 802B301C 38 BF 00 08 */ addi r5, r31, 8 /* 802B3020 38 C0 00 00 */ li r6, 0 @@ -170,7 +170,7 @@ lbl_802B30A0: /* 802B30A8 40 82 00 FC */ bne lbl_802B31A4 /* 802B30AC 80 1F 00 10 */ lwz r0, 0x10(r31) /* 802B30B0 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B30B4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B30B4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B30B8 38 81 00 0C */ addi r4, r1, 0xc /* 802B30BC 38 BF 00 08 */ addi r5, r31, 8 /* 802B30C0 38 C0 00 00 */ li r6, 0 @@ -222,7 +222,7 @@ lbl_802B3170: /* 802B3170 28 00 00 01 */ cmplwi r0, 1 /* 802B3174 40 82 00 30 */ bne lbl_802B31A4 /* 802B3178 90 A1 00 08 */ stw r5, 8(r1) -/* 802B317C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B317C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B3180 38 81 00 08 */ addi r4, r1, 8 /* 802B3184 38 BF 00 08 */ addi r5, r31, 8 /* 802B3188 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/fieldBgmFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/fieldBgmFramework__8Z2SeqMgrFv.s index 6d089ea3ee..3f622863ee 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/fieldBgmFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/fieldBgmFramework__8Z2SeqMgrFv.s @@ -4,7 +4,7 @@ lbl_802B594C: /* 802B5954 90 01 00 34 */ stw r0, 0x34(r1) /* 802B5958 93 E1 00 2C */ stw r31, 0x2c(r1) /* 802B595C 7C 7F 1B 78 */ mr r31, r3 -/* 802B5960 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B5960 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B5964 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B5968 28 00 00 00 */ cmplwi r0, 0 /* 802B596C 41 82 05 00 */ beq lbl_802B5E6C @@ -38,13 +38,13 @@ lbl_802B59CC: /* 802B59CC 3C 04 FF 00 */ addis r0, r4, 0xff00 /* 802B59D0 28 00 00 00 */ cmplwi r0, 0 /* 802B59D4 40 82 02 D4 */ bne lbl_802B5CA8 -/* 802B59D8 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B59D8 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B59DC 7F E4 FB 78 */ mr r4, r31 /* 802B59E0 38 A0 00 0A */ li r5, 0xa /* 802B59E4 38 C0 FF FF */ li r6, -1 /* 802B59E8 4B FF 55 8D */ bl getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc /* 802B59EC 98 7F 00 C4 */ stb r3, 0xc4(r31) -/* 802B59F0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B59F0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B59F4 88 03 00 0C */ lbz r0, 0xc(r3) /* 802B59F8 28 00 00 00 */ cmplwi r0, 0 /* 802B59FC 41 82 00 14 */ beq lbl_802B5A10 @@ -83,7 +83,7 @@ lbl_802B5A50: /* 802B5A78 40 82 00 08 */ bne lbl_802B5A80 /* 802B5A7C 48 00 03 F0 */ b lbl_802B5E6C lbl_802B5A80: -/* 802B5A80 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B5A80 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B5A84 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802B5A88 28 00 00 0A */ cmplwi r0, 0xa /* 802B5A8C 40 82 00 44 */ bne lbl_802B5AD0 @@ -168,7 +168,7 @@ lbl_802B5BA4: /* 802B5BA4 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B5BA8 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f /* 802B5BAC 41 82 02 C0 */ beq lbl_802B5E6C -/* 802B5BB0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B5BB0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B5BB4 88 03 00 17 */ lbz r0, 0x17(r3) /* 802B5BB8 28 00 00 00 */ cmplwi r0, 0 /* 802B5BBC 40 82 02 B0 */ bne lbl_802B5E6C @@ -209,7 +209,7 @@ lbl_802B5C28: /* 802B5C30 41 80 00 34 */ blt lbl_802B5C64 /* 802B5C34 28 04 00 0F */ cmplwi r4, 0xf /* 802B5C38 41 81 00 2C */ bgt lbl_802B5C64 -/* 802B5C3C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B5C3C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B5C40 88 03 00 00 */ lbz r0, 0(r3) /* 802B5C44 28 00 00 14 */ cmplwi r0, 0x14 /* 802B5C48 41 80 00 1C */ blt lbl_802B5C64 @@ -251,7 +251,7 @@ lbl_802B5CC0: /* 802B5CC0 3C 04 FF 00 */ addis r0, r4, 0xff00 /* 802B5CC4 28 00 00 01 */ cmplwi r0, 1 /* 802B5CC8 40 82 00 3C */ bne lbl_802B5D04 -/* 802B5CCC 80 8D 85 FC */ lwz r4, data_80450B7C(r13) +/* 802B5CCC 80 8D 85 FC */ lwz r4, __OSReport_disable-0x1C(r13) /* 802B5CD0 88 04 00 0C */ lbz r0, 0xc(r4) /* 802B5CD4 28 00 00 00 */ cmplwi r0, 0 /* 802B5CD8 40 82 01 94 */ bne lbl_802B5E6C @@ -277,7 +277,7 @@ lbl_802B5D1C: /* 802B5D1C 3C 03 00 01 */ addis r0, r3, 1 /* 802B5D20 28 00 FF FF */ cmplwi r0, 0xffff /* 802B5D24 40 82 01 48 */ bne lbl_802B5E6C -/* 802B5D28 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B5D28 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B5D2C 88 03 00 0C */ lbz r0, 0xc(r3) /* 802B5D30 28 00 00 00 */ cmplwi r0, 0 /* 802B5D34 40 82 01 38 */ bne lbl_802B5E6C @@ -293,7 +293,7 @@ lbl_802B5D1C: /* 802B5D5C 41 80 00 44 */ blt lbl_802B5DA0 /* 802B5D60 3C 00 01 00 */ lis r0, 0x100 /* 802B5D64 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802B5D68 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B5D68 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B5D6C 38 81 00 1C */ addi r4, r1, 0x1c /* 802B5D70 7F E5 FB 78 */ mr r5, r31 /* 802B5D74 38 C0 00 00 */ li r6, 0 @@ -310,7 +310,7 @@ lbl_802B5D1C: lbl_802B5DA0: /* 802B5DA0 3C 00 01 00 */ lis r0, 0x100 /* 802B5DA4 90 01 00 18 */ stw r0, 0x18(r1) -/* 802B5DA8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B5DA8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B5DAC 38 81 00 18 */ addi r4, r1, 0x18 /* 802B5DB0 7F E5 FB 78 */ mr r5, r31 /* 802B5DB4 38 C0 00 00 */ li r6, 0 @@ -355,7 +355,7 @@ lbl_802B5E40: /* 802B5E40 3C 60 01 00 */ lis r3, 0x0100 /* 0x01000001@ha */ /* 802B5E44 38 03 00 01 */ addi r0, r3, 0x0001 /* 0x01000001@l */ /* 802B5E48 90 01 00 14 */ stw r0, 0x14(r1) -/* 802B5E4C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B5E4C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B5E50 38 81 00 14 */ addi r4, r1, 0x14 /* 802B5E54 7F E5 FB 78 */ mr r5, r31 /* 802B5E58 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/fieldBgmStart__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/fieldBgmStart__8Z2SeqMgrFv.s index 13891554fe..336426dc39 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/fieldBgmStart__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/fieldBgmStart__8Z2SeqMgrFv.s @@ -4,20 +4,20 @@ lbl_802B545C: /* 802B5464 90 01 00 24 */ stw r0, 0x24(r1) /* 802B5468 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802B546C 7C 7F 1B 78 */ mr r31, r3 -/* 802B5470 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B5470 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B5474 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B5478 28 00 00 00 */ cmplwi r0, 0 /* 802B547C 41 82 00 DC */ beq lbl_802B5558 /* 802B5480 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B5484 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f /* 802B5488 41 82 00 D0 */ beq lbl_802B5558 -/* 802B548C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B548C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B5490 48 00 12 A5 */ bl checkDayTime__11Z2StatusMgrFv /* 802B5494 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B5498 41 82 00 8C */ beq lbl_802B5524 /* 802B549C 3C 00 01 00 */ lis r0, 0x100 /* 802B54A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B54A4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B54A4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B54A8 38 81 00 0C */ addi r4, r1, 0xc /* 802B54AC 7F E5 FB 78 */ mr r5, r31 /* 802B54B0 38 C0 00 00 */ li r6, 0 @@ -54,7 +54,7 @@ lbl_802B5524: /* 802B5524 3C 60 01 00 */ lis r3, 0x0100 /* 0x01000001@ha */ /* 802B5528 38 03 00 01 */ addi r0, r3, 0x0001 /* 0x01000001@l */ /* 802B552C 90 01 00 08 */ stw r0, 8(r1) -/* 802B5530 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B5530 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B5534 38 81 00 08 */ addi r4, r1, 8 /* 802B5538 7F E5 FB 78 */ mr r5, r31 /* 802B553C 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/fieldRidingMute__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/fieldRidingMute__8Z2SeqMgrFv.s index 0fa3093f1f..4f14e6c48f 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/fieldRidingMute__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/fieldRidingMute__8Z2SeqMgrFv.s @@ -8,7 +8,7 @@ lbl_802B556C: /* 802B5584 F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ /* 802B5588 93 E1 00 0C */ stw r31, 0xc(r1) /* 802B558C 7C 7F 1B 78 */ mr r31, r3 -/* 802B5590 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B5590 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B5594 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B5598 28 00 00 00 */ cmplwi r0, 0 /* 802B559C 41 82 01 90 */ beq lbl_802B572C diff --git a/asm/Z2AudioLib/Z2SeqMgr/onFieldBgmJumpEnd__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/onFieldBgmJumpEnd__8Z2SeqMgrFv.s index d06e2a73ea..4fff794ba4 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/onFieldBgmJumpEnd__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/onFieldBgmJumpEnd__8Z2SeqMgrFv.s @@ -91,10 +91,10 @@ lbl_802B579C: /* 802B5900 C0 42 BF B4 */ lfs f2, lit_4727(r2) /* 802B5904 FC 60 10 90 */ fmr f3, f2 /* 802B5908 4B FF E6 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff -/* 802B590C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B590C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B5910 38 63 07 28 */ addi r3, r3, 0x728 /* 802B5914 4B FE C3 7D */ bl calc__9JAISeqMgrFv -/* 802B5918 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B5918 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B591C 38 63 07 28 */ addi r3, r3, 0x728 /* 802B5920 4B FE C5 DD */ bl mixOut__9JAISeqMgrFv /* 802B5924 88 1F 00 C3 */ lbz r0, 0xc3(r31) diff --git a/asm/Z2AudioLib/Z2SeqMgr/onVariantBgmJumpEnd__8Z2SeqMgrFb.s b/asm/Z2AudioLib/Z2SeqMgr/onVariantBgmJumpEnd__8Z2SeqMgrFb.s index 7fe9843873..1daa4401bf 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/onVariantBgmJumpEnd__8Z2SeqMgrFb.s +++ b/asm/Z2AudioLib/Z2SeqMgr/onVariantBgmJumpEnd__8Z2SeqMgrFb.s @@ -49,10 +49,10 @@ lbl_802B2A3C: /* 802B2A50 FC 60 10 90 */ fmr f3, f2 /* 802B2A54 48 00 15 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B2A58: -/* 802B2A58 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B2A58 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B2A5C 38 63 07 28 */ addi r3, r3, 0x728 /* 802B2A60 4B FE F2 31 */ bl calc__9JAISeqMgrFv -/* 802B2A64 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B2A64 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B2A68 38 63 07 28 */ addi r3, r3, 0x728 /* 802B2A6C 4B FE F4 91 */ bl mixOut__9JAISeqMgrFv /* 802B2A70 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s index 41414b16cb..38b8395f35 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/processBgmFramework__8Z2SeqMgrFv.s @@ -113,7 +113,7 @@ lbl_802B353C: /* 802B353C 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B3540 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802B3544 41 82 00 E8 */ beq lbl_802B362C -/* 802B3548 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B3548 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B354C 48 00 31 E9 */ bl checkDayTime__11Z2StatusMgrFv /* 802B3550 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B3554 41 82 00 68 */ beq lbl_802B35BC @@ -145,7 +145,7 @@ lbl_802B3574: /* 802B35B4 D0 7F 00 AC */ stfs f3, 0xac(r31) /* 802B35B8 48 00 00 74 */ b lbl_802B362C lbl_802B35BC: -/* 802B35BC 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B35BC 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B35C0 48 00 31 75 */ bl checkDayTime__11Z2StatusMgrFv /* 802B35C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B35C8 40 82 00 64 */ bne lbl_802B362C @@ -179,7 +179,7 @@ lbl_802B362C: /* 802B362C 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B3630 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 802B3634 41 82 04 44 */ beq lbl_802B3A78 -/* 802B3638 80 CD 86 00 */ lwz r6, data_80450B80(r13) +/* 802B3638 80 CD 86 00 */ lwz r6, __OSReport_disable-0x18(r13) /* 802B363C 88 06 00 1D */ lbz r0, 0x1d(r6) /* 802B3640 28 00 00 00 */ cmplwi r0, 0 /* 802B3644 41 82 04 34 */ beq lbl_802B3A78 @@ -285,7 +285,7 @@ lbl_802B3780: /* 802B37B4 D0 1F 00 8C */ stfs f0, 0x8c(r31) /* 802B37B8 48 00 02 C0 */ b lbl_802B3A78 lbl_802B37BC: -/* 802B37BC 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802B37BC 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802B37C0 C0 23 00 18 */ lfs f1, 0x18(r3) /* 802B37C4 C0 4D 82 F8 */ lfs f2, sUnderWaterDepthMax(r13) /* 802B37C8 FC 01 10 40 */ fcmpo cr0, f1, f2 diff --git a/asm/Z2AudioLib/Z2SeqMgr/resetBattleBgmParams__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/resetBattleBgmParams__8Z2SeqMgrFv.s index 6f72af8eb8..e0f7d3b7ad 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/resetBattleBgmParams__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/resetBattleBgmParams__8Z2SeqMgrFv.s @@ -2,7 +2,7 @@ lbl_802B4128: /* 802B4128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802B412C 7C 08 02 A6 */ mflr r0 /* 802B4130 90 01 00 14 */ stw r0, 0x14(r1) -/* 802B4134 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4134 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4138 28 03 00 00 */ cmplwi r3, 0 /* 802B413C 41 82 00 18 */ beq lbl_802B4154 /* 802B4140 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s index 314e3c04d6..40cc5178e6 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleDistState__8Z2SeqMgrFUc.s @@ -9,7 +9,7 @@ lbl_802B4498: /* 802B44B4 88 83 00 D0 */ lbz r4, 0xd0(r3) /* 802B44B8 54 80 E7 FF */ rlwinm. r0, r4, 0x1c, 0x1f, 0x1f /* 802B44BC 40 82 03 70 */ bne lbl_802B482C -/* 802B44C0 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B44C0 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B44C4 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B44C8 28 00 00 00 */ cmplwi r0, 0 /* 802B44CC 41 82 03 60 */ beq lbl_802B482C @@ -75,7 +75,7 @@ lbl_802B4544: /* 802B45A8 D0 1E 00 18 */ stfs f0, 0x18(r30) /* 802B45AC D0 5E 00 1C */ stfs f2, 0x1c(r30) lbl_802B45B0: -/* 802B45B0 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B45B0 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B45B4 48 00 BC 31 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45BC 41 82 00 2C */ beq lbl_802B45E8 @@ -92,7 +92,7 @@ lbl_802B45DC: /* 802B45E0 28 00 00 0F */ cmplwi r0, 0xf /* 802B45E4 41 82 00 3C */ beq lbl_802B4620 lbl_802B45E8: -/* 802B45E8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B45E8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B45EC 48 00 BB F9 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B45F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B45F4 40 82 00 40 */ bne lbl_802B4634 @@ -115,7 +115,7 @@ lbl_802B4620: /* 802B462C 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4630 4B FE DB 71 */ bl releaseHandle__8JAISoundFv lbl_802B4634: -/* 802B4634 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4634 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4638 48 00 BB AD */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B463C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4640 40 82 00 2C */ bne lbl_802B466C diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleSearched__8Z2SeqMgrFb.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleSearched__8Z2SeqMgrFb.s index 437e33bab7..f42fce1d88 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleSearched__8Z2SeqMgrFb.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleSearched__8Z2SeqMgrFb.s @@ -9,7 +9,7 @@ lbl_802B421C: /* 802B4238 88 83 00 D0 */ lbz r4, 0xd0(r3) /* 802B423C 54 80 E7 FF */ rlwinm. r0, r4, 0x1c, 0x1f, 0x1f /* 802B4240 40 82 01 78 */ bne lbl_802B43B8 -/* 802B4244 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B4244 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B4248 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802B424C 28 00 00 00 */ cmplwi r0, 0 /* 802B4250 41 82 01 68 */ beq lbl_802B43B8 diff --git a/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s b/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s index a9a64f6f93..80413bbc35 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s +++ b/asm/Z2AudioLib/Z2SeqMgr/setBattleSeqState__8Z2SeqMgrFUc.s @@ -9,7 +9,7 @@ lbl_802B4844: /* 802B4860 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 802B4864 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 802B4868 40 82 02 7C */ bne lbl_802B4AE4 -/* 802B486C 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802B486C 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802B4870 88 04 00 1D */ lbz r0, 0x1d(r4) /* 802B4874 28 00 00 00 */ cmplwi r0, 0 /* 802B4878 41 82 02 6C */ beq lbl_802B4AE4 @@ -48,7 +48,7 @@ lbl_802B48E8: /* 802B48E8 3C 03 FF 00 */ addis r0, r3, 0xff00 /* 802B48EC 28 00 00 00 */ cmplwi r0, 0 /* 802B48F0 40 82 00 14 */ bne lbl_802B4904 -/* 802B48F4 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B48F4 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B48F8 48 00 B8 ED */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B48FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4900 41 82 01 E4 */ beq lbl_802B4AE4 @@ -64,7 +64,7 @@ lbl_802B4920: /* 802B4920 88 1E 00 BF */ lbz r0, 0xbf(r30) /* 802B4924 28 00 00 01 */ cmplwi r0, 1 /* 802B4928 40 82 00 BC */ bne lbl_802B49E4 -/* 802B492C 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B492C 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B4930 38 9E 00 04 */ addi r4, r30, 4 /* 802B4934 38 A0 00 09 */ li r5, 9 /* 802B4938 38 C0 00 01 */ li r6, 1 @@ -160,7 +160,7 @@ lbl_802B4A6C: /* 802B4A98 88 1E 00 BF */ lbz r0, 0xbf(r30) /* 802B4A9C 28 00 00 01 */ cmplwi r0, 1 /* 802B4AA0 40 82 00 20 */ bne lbl_802B4AC0 -/* 802B4AA4 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B4AA4 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B4AA8 38 9E 00 04 */ addi r4, r30, 4 /* 802B4AAC 38 A0 00 09 */ li r5, 9 /* 802B4AB0 38 C0 00 03 */ li r6, 3 @@ -170,7 +170,7 @@ lbl_802B4A6C: lbl_802B4AC0: /* 802B4AC0 28 00 00 02 */ cmplwi r0, 2 /* 802B4AC4 40 82 00 1C */ bne lbl_802B4AE0 -/* 802B4AC8 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802B4AC8 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802B4ACC 38 9E 00 04 */ addi r4, r30, 4 /* 802B4AD0 38 A0 00 09 */ li r5, 9 /* 802B4AD4 38 C0 00 02 */ li r6, 2 diff --git a/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s b/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s index 45a361f156..e911f19595 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s +++ b/asm/Z2AudioLib/Z2SeqMgr/startBattleBgm__8Z2SeqMgrFb.s @@ -9,7 +9,7 @@ lbl_802B4EB0: /* 802B4ECC 88 63 00 D0 */ lbz r3, 0xd0(r3) /* 802B4ED0 54 60 E7 FF */ rlwinm. r0, r3, 0x1c, 0x1f, 0x1f /* 802B4ED4 40 82 03 18 */ bne lbl_802B51EC -/* 802B4ED8 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802B4ED8 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802B4EDC 88 04 00 1D */ lbz r0, 0x1d(r4) /* 802B4EE0 28 00 00 00 */ cmplwi r0, 0 /* 802B4EE4 41 82 03 08 */ beq lbl_802B51EC @@ -28,7 +28,7 @@ lbl_802B4F08: /* 802B4F14 88 04 00 1E */ lbz r0, 0x1e(r4) /* 802B4F18 28 00 00 00 */ cmplwi r0, 0 /* 802B4F1C 40 82 00 14 */ bne lbl_802B4F30 -/* 802B4F20 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4F20 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4F24 48 00 B2 C1 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B4F28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F2C 41 82 00 14 */ beq lbl_802B4F40 @@ -53,7 +53,7 @@ lbl_802B4F5C: /* 802B4F68 38 00 00 01 */ li r0, 1 /* 802B4F6C 98 1C 00 BF */ stb r0, 0xbf(r28) /* 802B4F70 93 61 00 0C */ stw r27, 0xc(r1) -/* 802B4F74 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B4F74 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B4F78 38 81 00 0C */ addi r4, r1, 0xc /* 802B4F7C 38 BC 00 04 */ addi r5, r28, 4 /* 802B4F80 38 C0 00 00 */ li r6, 0 @@ -63,7 +63,7 @@ lbl_802B4F5C: /* 802B4F90 4E 80 04 21 */ bctrl /* 802B4F94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4F98 41 82 02 54 */ beq lbl_802B51EC -/* 802B4F9C 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B4F9C 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B4FA0 48 00 B1 61 */ bl setBattleInit__13Z2SoundObjMgrFv /* 802B4FA4 38 00 00 FF */ li r0, 0xff /* 802B4FA8 98 1C 00 BD */ stb r0, 0xbd(r28) @@ -147,7 +147,7 @@ lbl_802B50A8: /* 802B50D0 4B FF EF 1D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B50D4 48 00 00 30 */ b lbl_802B5104 lbl_802B50D8: -/* 802B50D8 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 802B50D8 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 802B50DC 48 00 B1 09 */ bl isTwilightBattle__13Z2SoundObjMgrFv /* 802B50E0 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 802B50E4 7F 83 E3 78 */ mr r3, r28 diff --git a/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s b/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s index 25119b1b97..cfc4b48661 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s +++ b/asm/Z2AudioLib/Z2SeqMgr/subBgmStart__8Z2SeqMgrFUl.s @@ -40,7 +40,7 @@ lbl_802AF51C: /* 802AF528 3B 80 00 00 */ li r28, 0 /* 802AF52C 3B E0 FF FF */ li r31, -1 /* 802AF530 48 00 01 00 */ b lbl_802AF630 -/* 802AF534 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AF534 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AF538 3C 80 80 3A */ lis r4, Z2SeqMgr__stringBase0@ha /* 0x8039BA08@ha */ /* 802AF53C 38 84 BA 08 */ addi r4, r4, Z2SeqMgr__stringBase0@l /* 0x8039BA08@l */ /* 802AF540 38 84 02 6A */ addi r4, r4, 0x26a @@ -143,7 +143,7 @@ lbl_802AF688: /* 802AF69C 48 00 03 35 */ bl subBgmStopInner__8Z2SeqMgrFv lbl_802AF6A0: /* 802AF6A0 93 C1 00 10 */ stw r30, 0x10(r1) -/* 802AF6A4 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802AF6A4 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802AF6A8 38 81 00 10 */ addi r4, r1, 0x10 /* 802AF6AC 38 BD 00 04 */ addi r5, r29, 4 /* 802AF6B0 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2SeqMgr/subBgmStop__8Z2SeqMgrFv.s b/asm/Z2AudioLib/Z2SeqMgr/subBgmStop__8Z2SeqMgrFv.s index 98ddadff77..96bc666202 100644 --- a/asm/Z2AudioLib/Z2SeqMgr/subBgmStop__8Z2SeqMgrFv.s +++ b/asm/Z2AudioLib/Z2SeqMgr/subBgmStop__8Z2SeqMgrFv.s @@ -24,7 +24,7 @@ lbl_802AF8B4: /* 802AF8D4 7C 09 03 A6 */ mtctr r0 /* 802AF8D8 4E 80 04 20 */ bctr /* 802AF8DC 48 00 00 E0 */ b lbl_802AF9BC -/* 802AF8E0 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AF8E0 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AF8E4 3C 80 80 3A */ lis r4, Z2SeqMgr__stringBase0@ha /* 0x8039BA08@ha */ /* 802AF8E8 38 84 BA 08 */ addi r4, r4, Z2SeqMgr__stringBase0@l /* 0x8039BA08@l */ /* 802AF8EC 38 84 02 76 */ addi r4, r4, 0x276 diff --git a/asm/Z2AudioLib/Z2SoundHandles/getLowPrioSound__14Z2SoundHandlesF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundHandles/getLowPrioSound__14Z2SoundHandlesF10JAISoundID.s index 78387a4e0d..12d9bcdcc1 100644 --- a/asm/Z2AudioLib/Z2SoundHandles/getLowPrioSound__14Z2SoundHandlesF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundHandles/getLowPrioSound__14Z2SoundHandlesF10JAISoundID.s @@ -5,7 +5,7 @@ lbl_802AB3D0: /* 802AB3DC 39 61 00 30 */ addi r11, r1, 0x30 /* 802AB3E0 48 0B 6D F1 */ bl _savegpr_26 /* 802AB3E4 7C 9A 23 78 */ mr r26, r4 -/* 802AB3E8 83 ED 85 DC */ lwz r31, data_80450B5C(r13) +/* 802AB3E8 83 ED 85 DC */ lwz r31, __OSReport_disable-0x3C(r13) /* 802AB3EC 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ /* 802AB3F0 3B A4 FF FF */ addi r29, r4, 0xFFFF /* 0x0000FFFF@l */ /* 802AB3F4 3B 80 00 00 */ li r28, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/__dt__11Z2SoundInfoFv.s b/asm/Z2AudioLib/Z2SoundInfo/__dt__11Z2SoundInfoFv.s index 78371b6b93..46b19eaf7c 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/__dt__11Z2SoundInfoFv.s +++ b/asm/Z2AudioLib/Z2SoundInfo/__dt__11Z2SoundInfoFv.s @@ -20,11 +20,11 @@ lbl_802BBBE0: /* 802BBC28 41 82 00 08 */ beq lbl_802BBC30 /* 802BBC2C 38 63 FF F4 */ addi r3, r3, -12 lbl_802BBC30: -/* 802BBC30 80 0D 85 CC */ lwz r0, data_80450B4C(r13) +/* 802BBC30 80 0D 85 CC */ lwz r0, __OSReport_disable-0x4C(r13) /* 802BBC34 7C 00 18 40 */ cmplw r0, r3 /* 802BBC38 40 82 00 0C */ bne lbl_802BBC44 /* 802BBC3C 38 00 00 00 */ li r0, 0 -/* 802BBC40 90 0D 85 CC */ stw r0, data_80450B4C(r13) +/* 802BBC40 90 0D 85 CC */ stw r0, __OSReport_disable-0x4C(r13) lbl_802BBC44: /* 802BBC44 38 7E 00 08 */ addi r3, r30, 8 /* 802BBC48 38 80 00 00 */ li r4, 0 @@ -36,12 +36,12 @@ lbl_802BBC44: /* 802BBC60 90 1E 00 04 */ stw r0, 4(r30) /* 802BBC64 34 1E 00 04 */ addic. r0, r30, 4 /* 802BBC68 41 82 00 1C */ beq lbl_802BBC84 -/* 802BBC6C 80 6D 85 D0 */ lwz r3, data_80450B50(r13) +/* 802BBC6C 80 6D 85 D0 */ lwz r3, __OSReport_disable-0x48(r13) /* 802BBC70 38 1E 00 04 */ addi r0, r30, 4 /* 802BBC74 7C 03 00 40 */ cmplw r3, r0 /* 802BBC78 40 82 00 0C */ bne lbl_802BBC84 /* 802BBC7C 38 00 00 00 */ li r0, 0 -/* 802BBC80 90 0D 85 D0 */ stw r0, data_80450B50(r13) +/* 802BBC80 90 0D 85 D0 */ stw r0, __OSReport_disable-0x48(r13) lbl_802BBC84: /* 802BBC84 7F C3 F3 78 */ mr r3, r30 /* 802BBC88 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getAudibleSwFull__11Z2SoundInfoF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getAudibleSwFull__11Z2SoundInfoF10JAISoundID.s index 38515fd9f1..089d8f1262 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getAudibleSwFull__11Z2SoundInfoF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getAudibleSwFull__11Z2SoundInfoF10JAISoundID.s @@ -8,7 +8,7 @@ lbl_802BB158: /* 802BB170 7C 9F 23 78 */ mr r31, r4 /* 802BB174 80 04 00 00 */ lwz r0, 0(r4) /* 802BB178 90 01 00 34 */ stw r0, 0x34(r1) -/* 802BB17C 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB17C 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB180 38 81 00 34 */ addi r4, r1, 0x34 /* 802BB184 4B FE BF DD */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB188 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getAudibleSw__11Z2SoundInfoCF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getAudibleSw__11Z2SoundInfoCF10JAISoundID.s index e573ce833e..4762c87905 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getAudibleSw__11Z2SoundInfoCF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getAudibleSw__11Z2SoundInfoCF10JAISoundID.s @@ -8,7 +8,7 @@ lbl_802BB448: /* 802BB460 7C 9F 23 78 */ mr r31, r4 /* 802BB464 80 04 00 00 */ lwz r0, 0(r4) /* 802BB468 90 01 00 34 */ stw r0, 0x34(r1) -/* 802BB46C 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB46C 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB470 38 81 00 34 */ addi r4, r1, 0x34 /* 802BB474 4B FE BC ED */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB478 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID.s index 4cd64f68c5..51e3ca08d2 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID.s @@ -7,13 +7,13 @@ lbl_802BB00C: /* 802BB020 7C 9E 23 78 */ mr r30, r4 /* 802BB024 80 04 00 00 */ lwz r0, 0(r4) /* 802BB028 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BB02C 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB02C 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB030 38 81 00 0C */ addi r4, r1, 0xc /* 802BB034 4B FE C2 59 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB038 7C 7F 1B 78 */ mr r31, r3 /* 802BB03C 80 1E 00 00 */ lwz r0, 0(r30) /* 802BB040 90 01 00 08 */ stw r0, 8(r1) -/* 802BB044 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB044 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB048 38 81 00 08 */ addi r4, r1, 8 /* 802BB04C 4B FE C1 15 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB050 28 1F 00 00 */ cmplwi r31, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getPriority__11Z2SoundInfoCF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getPriority__11Z2SoundInfoCF10JAISoundID.s index 3ea45f80a3..ed89cb1e71 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getPriority__11Z2SoundInfoCF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getPriority__11Z2SoundInfoCF10JAISoundID.s @@ -7,13 +7,13 @@ lbl_802BB0E0: /* 802BB0F4 7C 9E 23 78 */ mr r30, r4 /* 802BB0F8 80 04 00 00 */ lwz r0, 0(r4) /* 802BB0FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BB100 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB100 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB104 38 81 00 0C */ addi r4, r1, 0xc /* 802BB108 4B FE C1 85 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB10C 7C 7F 1B 78 */ mr r31, r3 /* 802BB110 80 1E 00 00 */ lwz r0, 0(r30) /* 802BB114 90 01 00 08 */ stw r0, 8(r1) -/* 802BB118 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB118 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB11C 38 81 00 08 */ addi r4, r1, 8 /* 802BB120 4B FE C0 41 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB124 28 1F 00 00 */ cmplwi r31, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe.s b/asm/Z2AudioLib/Z2SoundInfo/getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe.s index 06aaa712f4..0d84ad3415 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe.s @@ -19,13 +19,13 @@ lbl_802BB70C: /* 802BB71C 48 00 04 2D */ bl getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound /* 802BB720 80 1C 00 00 */ lwz r0, 0(r28) /* 802BB724 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BB728 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB728 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB72C 38 81 00 14 */ addi r4, r1, 0x14 /* 802BB730 4B FE BB 5D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB734 7C 7F 1B 78 */ mr r31, r3 /* 802BB738 80 1C 00 00 */ lwz r0, 0(r28) /* 802BB73C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802BB740 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB740 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB744 38 81 00 10 */ addi r4, r1, 0x10 /* 802BB748 4B FE BA 19 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB74C 28 1F 00 00 */ cmplwi r31, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound.s b/asm/Z2AudioLib/Z2SoundInfo/getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound.s index ca6ab4e4b1..dd4ef2fb48 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound.s @@ -8,13 +8,13 @@ lbl_802BBB48: /* 802BBB60 7C BE 2B 78 */ mr r30, r5 /* 802BBB64 80 04 00 00 */ lwz r0, 0(r4) /* 802BBB68 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BBB6C 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBB6C 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBB70 38 81 00 0C */ addi r4, r1, 0xc /* 802BBB74 4B FE B7 19 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BBB78 7C 7F 1B 78 */ mr r31, r3 /* 802BBB7C 80 1D 00 00 */ lwz r0, 0(r29) /* 802BBB80 90 01 00 08 */ stw r0, 8(r1) -/* 802BBB84 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBB84 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBB88 38 81 00 08 */ addi r4, r1, 8 /* 802BBB8C 4B FE B5 D5 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBB90 28 1F 00 00 */ cmplwi r31, 0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getStreamFilePath__11Z2SoundInfoF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getStreamFilePath__11Z2SoundInfoF10JAISoundID.s index e56abb8f5a..1fa178476f 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getStreamFilePath__11Z2SoundInfoF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getStreamFilePath__11Z2SoundInfoF10JAISoundID.s @@ -6,7 +6,7 @@ lbl_802BBA10: /* 802BBA20 7C 9F 23 78 */ mr r31, r4 /* 802BBA24 80 04 00 00 */ lwz r0, 0(r4) /* 802BBA28 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BBA2C 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBA2C 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBA30 38 81 00 0C */ addi r4, r1, 0xc /* 802BBA34 4B FE B7 2D */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBA38 54 60 06 36 */ rlwinm r0, r3, 0, 0x18, 0x1b @@ -16,10 +16,10 @@ lbl_802BBA10: lbl_802BBA48: /* 802BBA48 80 1F 00 00 */ lwz r0, 0(r31) /* 802BBA4C 90 01 00 08 */ stw r0, 8(r1) -/* 802BBA50 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBA50 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBA54 38 81 00 08 */ addi r4, r1, 8 /* 802BBA58 4B FE B8 35 */ bl getData__13JAUSoundTableCF10JAISoundID -/* 802BBA5C 80 8D 85 D8 */ lwz r4, data_80450B58(r13) +/* 802BBA5C 80 8D 85 D8 */ lwz r4, __OSReport_disable-0x40(r13) /* 802BBA60 80 84 00 00 */ lwz r4, 0(r4) /* 802BBA64 80 03 00 04 */ lwz r0, 4(r3) /* 802BBA68 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/Z2AudioLib/Z2SoundInfo/getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream.s b/asm/Z2AudioLib/Z2SoundInfo/getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream.s index 170a382270..3d77366c2c 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream.s @@ -12,7 +12,7 @@ lbl_802BB8E0: /* 802BB908 48 00 02 41 */ bl getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound /* 802BB90C 80 1B 00 00 */ lwz r0, 0(r27) /* 802BB910 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BB914 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB914 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB918 38 81 00 0C */ addi r4, r1, 0xc /* 802BB91C 4B FE B8 45 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB920 54 60 06 36 */ rlwinm r0, r3, 0, 0x18, 0x1b @@ -22,7 +22,7 @@ lbl_802BB8E0: lbl_802BB930: /* 802BB930 80 1B 00 00 */ lwz r0, 0(r27) /* 802BB934 90 01 00 08 */ stw r0, 8(r1) -/* 802BB938 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BB938 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BB93C 38 81 00 08 */ addi r4, r1, 8 /* 802BB940 4B FE B9 4D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB944 A3 A3 00 02 */ lhz r29, 2(r3) diff --git a/asm/Z2AudioLib/Z2SoundInfo/getSwBit__11Z2SoundInfoCF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundInfo/getSwBit__11Z2SoundInfoCF10JAISoundID.s index bf03bf924d..cd418a56df 100644 --- a/asm/Z2AudioLib/Z2SoundInfo/getSwBit__11Z2SoundInfoCF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundInfo/getSwBit__11Z2SoundInfoCF10JAISoundID.s @@ -7,13 +7,13 @@ lbl_802BBAC8: /* 802BBADC 7C 9E 23 78 */ mr r30, r4 /* 802BBAE0 80 04 00 00 */ lwz r0, 0(r4) /* 802BBAE4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802BBAE8 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBAE8 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBAEC 38 81 00 0C */ addi r4, r1, 0xc /* 802BBAF0 4B FE B7 9D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BBAF4 7C 7F 1B 78 */ mr r31, r3 /* 802BBAF8 80 1E 00 00 */ lwz r0, 0(r30) /* 802BBAFC 90 01 00 08 */ stw r0, 8(r1) -/* 802BBB00 80 6D 85 D8 */ lwz r3, data_80450B58(r13) +/* 802BBB00 80 6D 85 D8 */ lwz r3, __OSReport_disable-0x40(r13) /* 802BBB04 38 81 00 08 */ addi r4, r1, 8 /* 802BBB08 4B FE B6 59 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBB0C 28 1F 00 00 */ cmplwi r31, 0 diff --git a/asm/Z2AudioLib/Z2SoundMgr/__ct__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/__ct__10Z2SoundMgrFv.s index 37469c4c73..6b88a88b59 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/__ct__10Z2SoundMgrFv.s +++ b/asm/Z2AudioLib/Z2SoundMgr/__ct__10Z2SoundMgrFv.s @@ -4,7 +4,7 @@ lbl_802A9E80: /* 802A9E88 90 01 00 14 */ stw r0, 0x14(r1) /* 802A9E8C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A9E90 7C 7F 1B 78 */ mr r31, r3 -/* 802A9E94 93 ED 85 E0 */ stw r31, data_80450B60(r13) +/* 802A9E94 93 ED 85 E0 */ stw r31, __OSReport_disable-0x38(r13) /* 802A9E98 3C 60 80 3D */ lis r3, __vt__10Z2SoundMgr@ha /* 0x803C9D70@ha */ /* 802A9E9C 38 03 9D 70 */ addi r0, r3, __vt__10Z2SoundMgr@l /* 0x803C9D70@l */ /* 802A9EA0 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/Z2AudioLib/Z2SoundMgr/calc__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/calc__10Z2SoundMgrFv.s index 1366369622..6f788b73c2 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/calc__10Z2SoundMgrFv.s +++ b/asm/Z2AudioLib/Z2SoundMgr/calc__10Z2SoundMgrFv.s @@ -16,11 +16,11 @@ lbl_802AA1B0: /* 802AA1E8 48 00 08 DD */ bl isPlayingSoundID__10Z2SoundMgrF10JAISoundID /* 802AA1EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AA1F0 40 82 00 5C */ bne lbl_802AA24C -/* 802AA1F4 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AA1F4 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AA1F8 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802AA1FC 28 00 00 00 */ cmplwi r0, 0 /* 802AA200 41 82 00 44 */ beq lbl_802AA244 -/* 802AA204 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802AA204 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802AA208 C0 03 00 74 */ lfs f0, 0x74(r3) /* 802AA20C 38 00 00 03 */ li r0, 3 /* 802AA210 90 03 00 80 */ stw r0, 0x80(r3) diff --git a/asm/Z2AudioLib/Z2SoundMgr/func_802A9EE8.s b/asm/Z2AudioLib/Z2SoundMgr/func_802A9EE8.s index be7ce9ea21..8c29f32b61 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/func_802A9EE8.s +++ b/asm/Z2AudioLib/Z2SoundMgr/func_802A9EE8.s @@ -10,7 +10,7 @@ lbl_802A9EE8: /* 802A9F08 7C DF 33 78 */ mr r31, r6 /* 802A9F0C 80 04 00 00 */ lwz r0, 0(r4) /* 802A9F10 90 01 00 24 */ stw r0, 0x24(r1) -/* 802A9F14 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802A9F14 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802A9F18 38 81 00 24 */ addi r4, r1, 0x24 /* 802A9F1C 81 83 00 00 */ lwz r12, 0(r3) /* 802A9F20 81 8C 00 08 */ lwz r12, 8(r12) @@ -29,12 +29,12 @@ lbl_802A9F44: lbl_802A9F50: /* 802A9F50 80 1D 00 00 */ lwz r0, 0(r29) /* 802A9F54 90 01 00 20 */ stw r0, 0x20(r1) -/* 802A9F58 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802A9F58 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802A9F5C 38 81 00 20 */ addi r4, r1, 0x20 /* 802A9F60 48 01 1B 69 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802A9F64 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c /* 802A9F68 41 82 00 4C */ beq lbl_802A9FB4 -/* 802A9F6C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9F6C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9F70 C0 03 00 74 */ lfs f0, 0x74(r3) /* 802A9F74 38 00 00 03 */ li r0, 3 /* 802A9F78 90 03 00 80 */ stw r0, 0x80(r3) @@ -66,13 +66,13 @@ lbl_802A9FD4: /* 802A9FD8 3C 04 FF 00 */ addis r0, r4, 0xff00 /* 802A9FDC 28 00 00 6A */ cmplwi r0, 0x6a /* 802A9FE0 40 82 00 78 */ bne lbl_802AA058 -/* 802A9FE4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9FE4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9FE8 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000048@ha */ /* 802A9FEC 38 84 00 48 */ addi r4, r4, 0x0048 /* 0x01000048@l */ /* 802A9FF0 38 A0 00 00 */ li r5, 0 /* 802A9FF4 38 C0 00 00 */ li r6, 0 /* 802A9FF8 48 00 50 19 */ bl bgmStart__8Z2SeqMgrFUlUll -/* 802A9FFC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9FFC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802AA000 C0 22 BE 38 */ lfs f1, lit_3688(r2) /* 802AA004 D0 23 00 34 */ stfs f1, 0x34(r3) /* 802AA008 C0 02 BE 44 */ lfs f0, lit_3905(r2) @@ -84,7 +84,7 @@ lbl_802A9FD4: /* 802AA020 D0 03 00 48 */ stfs f0, 0x48(r3) /* 802AA024 90 03 00 50 */ stw r0, 0x50(r3) /* 802AA028 D0 03 00 4C */ stfs f0, 0x4c(r3) -/* 802AA02C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802AA02C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802AA030 38 80 00 00 */ li r4, 0 /* 802AA034 48 00 5F 59 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802AA038 38 00 00 0B */ li r0, 0xb diff --git a/asm/Z2AudioLib/Z2SoundMgr/isPlayingSoundID__10Z2SoundMgrF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundMgr/isPlayingSoundID__10Z2SoundMgrF10JAISoundID.s index 1b98f12e15..9bccb6416e 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/isPlayingSoundID__10Z2SoundMgrF10JAISoundID.s +++ b/asm/Z2AudioLib/Z2SoundMgr/isPlayingSoundID__10Z2SoundMgrF10JAISoundID.s @@ -14,7 +14,7 @@ lbl_802AAAC4: /* 802AAAF4 48 00 00 88 */ b lbl_802AAB7C lbl_802AAAF8: /* 802AAAF8 90 61 00 10 */ stw r3, 0x10(r1) -/* 802AAAFC 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802AAAFC 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802AAB00 38 81 00 10 */ addi r4, r1, 0x10 /* 802AAB04 81 83 00 00 */ lwz r12, 0(r3) /* 802AAB08 81 8C 00 08 */ lwz r12, 8(r12) @@ -24,7 +24,7 @@ lbl_802AAAF8: /* 802AAB18 40 82 00 60 */ bne lbl_802AAB78 /* 802AAB1C 80 1F 00 00 */ lwz r0, 0(r31) /* 802AAB20 90 01 00 0C */ stw r0, 0xc(r1) -/* 802AAB24 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802AAB24 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802AAB28 38 81 00 0C */ addi r4, r1, 0xc /* 802AAB2C 81 83 00 00 */ lwz r12, 0(r3) /* 802AAB30 81 8C 00 0C */ lwz r12, 0xc(r12) diff --git a/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s index e4757deadf..2eb5ab9401 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s +++ b/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s @@ -8,7 +8,7 @@ lbl_802AA528: /* 802AA540 88 0D 8D C0 */ lbz r0, struct_80451340+0x0(r13) /* 802AA544 28 00 00 00 */ cmplwi r0, 0 /* 802AA548 41 82 01 04 */ beq lbl_802AA64C -/* 802AA54C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AA54C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AA550 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802AA554 28 00 00 00 */ cmplwi r0, 0 /* 802AA558 41 82 00 F4 */ beq lbl_802AA64C diff --git a/asm/Z2AudioLib/Z2SoundMgr/multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf.s b/asm/Z2AudioLib/Z2SoundMgr/multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf.s index 831c4cee97..a454629bbd 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf.s +++ b/asm/Z2AudioLib/Z2SoundMgr/multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf.s @@ -14,7 +14,7 @@ lbl_802AA9E8: /* 802AAA18 28 00 FF FF */ cmplwi r0, 0xffff /* 802AAA1C 41 82 00 88 */ beq lbl_802AAAA4 /* 802AAA20 90 61 00 10 */ stw r3, 0x10(r1) -/* 802AAA24 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802AAA24 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802AAA28 38 81 00 10 */ addi r4, r1, 0x10 /* 802AAA2C 81 83 00 00 */ lwz r12, 0(r3) /* 802AAA30 81 8C 00 08 */ lwz r12, 8(r12) @@ -24,7 +24,7 @@ lbl_802AA9E8: /* 802AAA40 40 82 00 64 */ bne lbl_802AAAA4 /* 802AAA44 80 1F 00 00 */ lwz r0, 0(r31) /* 802AAA48 90 01 00 0C */ stw r0, 0xc(r1) -/* 802AAA4C 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802AAA4C 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802AAA50 38 81 00 0C */ addi r4, r1, 0xc /* 802AAA54 81 83 00 00 */ lwz r12, 0(r3) /* 802AAA58 81 8C 00 0C */ lwz r12, 0xc(r12) diff --git a/asm/Z2AudioLib/Z2SoundMgr/pauseAllGameSound__10Z2SoundMgrFb.s b/asm/Z2AudioLib/Z2SoundMgr/pauseAllGameSound__10Z2SoundMgrFb.s index 755557edc2..9bc5b07756 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/pauseAllGameSound__10Z2SoundMgrFb.s +++ b/asm/Z2AudioLib/Z2SoundMgr/pauseAllGameSound__10Z2SoundMgrFb.s @@ -43,7 +43,7 @@ lbl_802AA6B0: /* 802AA754 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 802AA758 98 1E 07 9C */ stb r0, 0x79c(r30) /* 802AA75C 41 82 00 38 */ beq lbl_802AA794 -/* 802AA760 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802AA760 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802AA764 C0 22 BE 44 */ lfs f1, lit_3905(r2) /* 802AA768 38 80 00 0A */ li r4, 0xa /* 802AA76C 48 00 32 89 */ bl seMoveVolumeAll__7Z2SeMgrFfUl @@ -57,7 +57,7 @@ lbl_802AA6B0: /* 802AA78C 4B FF 86 29 */ bl moveVolume__18JAISoundParamsMoveFfUl /* 802AA790 48 00 00 34 */ b lbl_802AA7C4 lbl_802AA794: -/* 802AA794 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802AA794 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802AA798 C0 22 BE 38 */ lfs f1, lit_3688(r2) /* 802AA79C 38 80 00 0A */ li r4, 0xa /* 802AA7A0 48 00 32 55 */ bl seMoveVolumeAll__7Z2SeMgrFfUl diff --git a/asm/Z2AudioLib/Z2SoundMgr/seqCallback__FP8JASTrackUs.s b/asm/Z2AudioLib/Z2SoundMgr/seqCallback__FP8JASTrackUs.s index 76d9cbc153..4666af6af6 100644 --- a/asm/Z2AudioLib/Z2SoundMgr/seqCallback__FP8JASTrackUs.s +++ b/asm/Z2AudioLib/Z2SoundMgr/seqCallback__FP8JASTrackUs.s @@ -15,7 +15,7 @@ lbl_802A9BC8: /* 802A9BFC 7C 03 00 2E */ lwzx r0, r3, r0 /* 802A9C00 7C 09 03 A6 */ mtctr r0 /* 802A9C04 4E 80 04 20 */ bctr -/* 802A9C08 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9C08 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9C0C 38 83 00 04 */ addi r4, r3, 4 /* 802A9C10 38 A0 00 03 */ li r5, 3 /* 802A9C14 C0 22 BE 38 */ lfs f1, lit_3688(r2) @@ -23,32 +23,32 @@ lbl_802A9BC8: /* 802A9C1C C0 42 BE 3C */ lfs f2, lit_3689(r2) /* 802A9C20 FC 60 10 90 */ fmr f3, f2 /* 802A9C24 48 00 A3 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff -/* 802A9C28 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802A9C28 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802A9C2C 38 63 07 28 */ addi r3, r3, 0x728 /* 802A9C30 4B FF 80 61 */ bl calc__9JAISeqMgrFv -/* 802A9C34 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802A9C34 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802A9C38 38 63 07 28 */ addi r3, r3, 0x728 /* 802A9C3C 4B FF 82 C1 */ bl mixOut__9JAISeqMgrFv /* 802A9C40 48 00 01 58 */ b lbl_802A9D98 -/* 802A9C44 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9C44 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9C48 48 00 BB 09 */ bl onFieldBgmJumpStart__8Z2SeqMgrFv /* 802A9C4C 48 00 01 4C */ b lbl_802A9D98 -/* 802A9C50 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9C50 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9C54 48 00 BB 49 */ bl onFieldBgmJumpEnd__8Z2SeqMgrFv /* 802A9C58 48 00 01 40 */ b lbl_802A9D98 -/* 802A9C5C 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 802A9C5C 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 802A9C60 38 80 00 01 */ li r4, 1 /* 802A9C64 48 02 25 2D */ bl speakOneWord__12Z2SpeechMgr2Fb /* 802A9C68 48 00 01 30 */ b lbl_802A9D98 -/* 802A9C6C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9C6C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9C70 38 80 00 01 */ li r4, 1 /* 802A9C74 48 00 8D 29 */ bl onVariantBgmJumpEnd__8Z2SeqMgrFb /* 802A9C78 48 00 01 20 */ b lbl_802A9D98 -/* 802A9C7C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9C7C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9C80 38 80 00 00 */ li r4, 0 /* 802A9C84 48 00 8D 19 */ bl onVariantBgmJumpEnd__8Z2SeqMgrFb /* 802A9C88 48 00 01 10 */ b lbl_802A9D98 -/* 802A9C8C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802A9C8C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802A9C90 83 C3 02 8C */ lwz r30, 0x28c(r3) /* 802A9C94 3C 60 00 05 */ lis r3, 0x0005 /* 0x000500F7@ha */ /* 802A9C98 3B A3 00 F7 */ addi r29, r3, 0x00F7 /* 0x000500F7@l */ @@ -86,7 +86,7 @@ lbl_802A9D04: /* 802A9D04 28 1E 00 00 */ cmplwi r30, 0 /* 802A9D08 40 82 FF 98 */ bne lbl_802A9CA0 /* 802A9D0C 48 00 00 8C */ b lbl_802A9D98 -/* 802A9D10 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802A9D10 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802A9D14 83 83 02 8C */ lwz r28, 0x28c(r3) /* 802A9D18 3C 60 00 05 */ lis r3, 0x0005 /* 0x000500F9@ha */ /* 802A9D1C 3B C3 00 F9 */ addi r30, r3, 0x00F9 /* 0x000500F9@l */ @@ -115,11 +115,11 @@ lbl_802A9D68: /* 802A9D68 28 1C 00 00 */ cmplwi r28, 0 /* 802A9D6C 40 82 FF BC */ bne lbl_802A9D28 /* 802A9D70 48 00 00 28 */ b lbl_802A9D98 -/* 802A9D74 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9D74 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9D78 38 80 00 07 */ li r4, 7 /* 802A9D7C 48 00 62 11 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802A9D80 48 00 00 18 */ b lbl_802A9D98 -/* 802A9D84 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802A9D84 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802A9D88 38 80 00 08 */ li r4, 8 /* 802A9D8C 48 00 62 01 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802A9D90 48 00 00 08 */ b lbl_802A9D98 @@ -160,7 +160,7 @@ lbl_802A9E00: /* 802A9E0C 90 01 00 0C */ stw r0, 0xc(r1) /* 802A9E10 90 01 00 24 */ stw r0, 0x24(r1) lbl_802A9E14: -/* 802A9E14 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802A9E14 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802A9E18 80 A3 02 F8 */ lwz r5, 0x2f8(r3) /* 802A9E1C 80 81 00 24 */ lwz r4, 0x24(r1) /* 802A9E20 48 00 00 3C */ b lbl_802A9E5C diff --git a/asm/Z2AudioLib/Z2SoundObjMgr/__ct__13Z2SoundObjMgrFv.s b/asm/Z2AudioLib/Z2SoundObjMgr/__ct__13Z2SoundObjMgrFv.s index c33b5ca862..61452e9bb9 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr/__ct__13Z2SoundObjMgrFv.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr/__ct__13Z2SoundObjMgrFv.s @@ -4,7 +4,7 @@ lbl_802BF920: /* 802BF928 90 01 00 14 */ stw r0, 0x14(r1) /* 802BF92C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BF930 7C 7F 1B 78 */ mr r31, r3 -/* 802BF934 93 ED 85 C8 */ stw r31, data_80450B48(r13) +/* 802BF934 93 ED 85 C8 */ stw r31, __OSReport_disable-0x50(r13) /* 802BF938 48 01 C5 DD */ bl initiate__10JSUPtrListFv /* 802BF93C 38 00 00 00 */ li r0, 0 /* 802BF940 98 1F 00 19 */ stb r0, 0x19(r31) diff --git a/asm/Z2AudioLib/Z2SoundObjMgr/searchEnemy__13Z2SoundObjMgrFv.s b/asm/Z2AudioLib/Z2SoundObjMgr/searchEnemy__13Z2SoundObjMgrFv.s index 9f6e105d20..765d5c1890 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr/searchEnemy__13Z2SoundObjMgrFv.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr/searchEnemy__13Z2SoundObjMgrFv.s @@ -16,7 +16,7 @@ lbl_802BF994: /* 802BF9CC 80 0D 8D E0 */ lwz r0, mLinkPtr__14Z2CreatureLink(r13) /* 802BF9D0 28 00 00 00 */ cmplwi r0, 0 /* 802BF9D4 40 82 00 18 */ bne lbl_802BF9EC -/* 802BF9D8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BF9D8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BF9DC 38 80 00 01 */ li r4, 1 /* 802BF9E0 38 A0 00 01 */ li r5, 1 /* 802BF9E4 4B FF 58 21 */ bl stopBattleBgm__8Z2SeqMgrFUcUc @@ -25,7 +25,7 @@ lbl_802BF9EC: /* 802BF9EC 3B C0 00 00 */ li r30, 0 /* 802BF9F0 3B A0 00 00 */ li r29, 0 /* 802BF9F4 3B 80 00 00 */ li r28, 0 -/* 802BF9F8 80 8D 86 04 */ lwz r4, data_80450B84(r13) +/* 802BF9F8 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) /* 802BF9FC 80 64 00 00 */ lwz r3, 0(r4) /* 802BFA00 28 03 00 00 */ cmplwi r3, 0 /* 802BFA04 41 82 00 10 */ beq lbl_802BFA14 @@ -116,12 +116,12 @@ lbl_802BFAF4: /* 802BFB30 7C 03 00 2E */ lwzx r0, r3, r0 /* 802BFB34 7C 09 03 A6 */ mtctr r0 /* 802BFB38 4E 80 04 20 */ bctr -/* 802BFB3C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802BFB3C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802BFB40 80 03 00 04 */ lwz r0, 4(r3) /* 802BFB44 2C 00 00 1C */ cmpwi r0, 0x1c /* 802BFB48 41 82 02 F8 */ beq lbl_802BFE40 /* 802BFB4C 48 00 00 50 */ b lbl_802BFB9C -/* 802BFB50 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802BFB50 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802BFB54 80 03 00 04 */ lwz r0, 4(r3) /* 802BFB58 2C 00 00 1E */ cmpwi r0, 0x1e /* 802BFB5C 41 82 02 E4 */ beq lbl_802BFE40 @@ -273,7 +273,7 @@ lbl_802BFD78: /* 802BFD84 98 17 00 1B */ stb r0, 0x1b(r23) /* 802BFD88 48 00 00 10 */ b lbl_802BFD98 lbl_802BFD8C: -/* 802BFD8C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFD8C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFD90 88 97 00 1B */ lbz r4, 0x1b(r23) /* 802BFD94 4B FF 20 61 */ bl changeSubBgmStatus__8Z2SeqMgrFl lbl_802BFD98: @@ -334,12 +334,12 @@ lbl_802BFE44: /* 802BFE5C 88 17 00 16 */ lbz r0, 0x16(r23) /* 802BFE60 7C 03 00 40 */ cmplw r3, r0 /* 802BFE64 41 80 00 14 */ blt lbl_802BFE78 -/* 802BFE68 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFE68 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFE6C 38 80 00 00 */ li r4, 0 /* 802BFE70 4B FF 45 71 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE74 48 00 00 34 */ b lbl_802BFEA8 lbl_802BFE78: -/* 802BFE78 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFE78 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFE7C 38 80 00 01 */ li r4, 1 /* 802BFE80 4B FF 45 61 */ bl setBattleGhostMute__8Z2SeqMgrFb /* 802BFE84 48 00 00 24 */ b lbl_802BFEA8 @@ -359,12 +359,12 @@ lbl_802BFEA8: /* 802BFEB4 88 17 00 14 */ lbz r0, 0x14(r23) /* 802BFEB8 28 00 00 00 */ cmplwi r0, 0 /* 802BFEBC 41 82 00 14 */ beq lbl_802BFED0 -/* 802BFEC0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFEC0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFEC4 38 80 00 01 */ li r4, 1 /* 802BFEC8 4B FF 1F 2D */ bl changeSubBgmStatus__8Z2SeqMgrFl /* 802BFECC 48 00 00 F0 */ b lbl_802BFFBC lbl_802BFED0: -/* 802BFED0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFED0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFED4 38 80 00 00 */ li r4, 0 /* 802BFED8 4B FF 1F 1D */ bl changeSubBgmStatus__8Z2SeqMgrFl /* 802BFEDC 48 00 00 E0 */ b lbl_802BFFBC @@ -374,12 +374,12 @@ lbl_802BFEE0: /* 802BFEE8 88 17 00 15 */ lbz r0, 0x15(r23) /* 802BFEEC 28 00 00 00 */ cmplwi r0, 0 /* 802BFEF0 41 82 00 14 */ beq lbl_802BFF04 -/* 802BFEF4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFEF4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFEF8 38 80 00 01 */ li r4, 1 /* 802BFEFC 4B FF 1E F9 */ bl changeSubBgmStatus__8Z2SeqMgrFl /* 802BFF00 48 00 00 BC */ b lbl_802BFFBC lbl_802BFF04: -/* 802BFF04 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF04 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF08 38 80 00 00 */ li r4, 0 /* 802BFF0C 4B FF 1E E9 */ bl changeSubBgmStatus__8Z2SeqMgrFl /* 802BFF10 48 00 00 AC */ b lbl_802BFFBC @@ -389,25 +389,25 @@ lbl_802BFF14: /* 802BFF1C 88 17 00 16 */ lbz r0, 0x16(r23) /* 802BFF20 28 00 00 00 */ cmplwi r0, 0 /* 802BFF24 41 82 00 14 */ beq lbl_802BFF38 -/* 802BFF28 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF28 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF2C 38 80 00 01 */ li r4, 1 /* 802BFF30 4B FF 00 5D */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BFF34 48 00 00 88 */ b lbl_802BFFBC lbl_802BFF38: -/* 802BFF38 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF38 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF3C 38 80 00 00 */ li r4, 0 /* 802BFF40 4B FF 00 4D */ bl changeBgmStatus__8Z2SeqMgrFl /* 802BFF44 48 00 00 78 */ b lbl_802BFFBC lbl_802BFF48: /* 802BFF48 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802BFF4C 40 82 00 70 */ bne lbl_802BFFBC -/* 802BFF50 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF50 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF54 7F A4 EB 78 */ mr r4, r29 /* 802BFF58 4B FF 42 C5 */ bl setBattleSearched__8Z2SeqMgrFb /* 802BFF5C 88 17 00 14 */ lbz r0, 0x14(r23) /* 802BFF60 28 00 00 00 */ cmplwi r0, 0 /* 802BFF64 41 82 00 14 */ beq lbl_802BFF78 -/* 802BFF68 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF68 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF6C 38 80 00 00 */ li r4, 0 /* 802BFF70 4B FF 45 29 */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFF74 48 00 00 48 */ b lbl_802BFFBC @@ -415,7 +415,7 @@ lbl_802BFF78: /* 802BFF78 88 17 00 15 */ lbz r0, 0x15(r23) /* 802BFF7C 28 00 00 00 */ cmplwi r0, 0 /* 802BFF80 41 82 00 14 */ beq lbl_802BFF94 -/* 802BFF84 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFF84 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFF88 38 80 00 01 */ li r4, 1 /* 802BFF8C 4B FF 45 0D */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFF90 48 00 00 2C */ b lbl_802BFFBC @@ -423,12 +423,12 @@ lbl_802BFF94: /* 802BFF94 88 17 00 16 */ lbz r0, 0x16(r23) /* 802BFF98 28 00 00 00 */ cmplwi r0, 0 /* 802BFF9C 41 82 00 14 */ beq lbl_802BFFB0 -/* 802BFFA0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFFA0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFFA4 38 80 00 02 */ li r4, 2 /* 802BFFA8 4B FF 44 F1 */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFFAC 48 00 00 10 */ b lbl_802BFFBC lbl_802BFFB0: -/* 802BFFB0 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802BFFB0 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802BFFB4 38 80 00 03 */ li r4, 3 /* 802BFFB8 4B FF 44 E1 */ bl setBattleDistState__8Z2SeqMgrFUc lbl_802BFFBC: diff --git a/asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s b/asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s index f048e1be21..ddbb352027 100644 --- a/asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s +++ b/asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s @@ -16,7 +16,7 @@ lbl_802BE090: /* 802BE0A4 41 82 00 34 */ beq lbl_802BE0D8 /* 802BE0A8 80 03 00 18 */ lwz r0, 0x18(r3) /* 802BE0AC 90 01 00 08 */ stw r0, 8(r1) -/* 802BE0B0 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802BE0B0 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802BE0B4 38 81 00 08 */ addi r4, r1, 8 /* 802BE0B8 4B FF DA 11 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BE0BC 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 diff --git a/asm/Z2AudioLib/Z2SoundObject/func_802BF660.s b/asm/Z2AudioLib/Z2SoundObject/func_802BF660.s index 0ec1e04b1f..678f836cf8 100644 --- a/asm/Z2AudioLib/Z2SoundObject/func_802BF660.s +++ b/asm/Z2AudioLib/Z2SoundObject/func_802BF660.s @@ -60,7 +60,7 @@ lbl_802BF708: /* 802BF734 48 00 01 5D */ bl func_802BF890 /* 802BF738 7C 77 1B 78 */ mr r23, r3 /* 802BF73C 92 E1 00 0C */ stw r23, 0xc(r1) -/* 802BF740 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802BF740 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802BF744 38 81 00 0C */ addi r4, r1, 0xc /* 802BF748 4B FE EE 69 */ bl isSoundCulling__7Z2SeMgrF10JAISoundID /* 802BF74C 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/asm/Z2AudioLib/Z2SoundObject/startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase.s b/asm/Z2AudioLib/Z2SoundObject/startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase.s index 4e62a6f1fe..7a4a6ec701 100644 --- a/asm/Z2AudioLib/Z2SoundObject/startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase.s +++ b/asm/Z2AudioLib/Z2SoundObject/startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase.s @@ -18,7 +18,7 @@ lbl_802BE4DC: /* 802BE4E0 40 81 00 08 */ ble lbl_802BE4E8 /* 802BE4E4 3B C0 00 00 */ li r30, 0 lbl_802BE4E8: -/* 802BE4E8 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802BE4E8 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802BE4EC 83 E3 02 20 */ lwz r31, 0x220(r3) /* 802BE4F0 48 00 00 30 */ b lbl_802BE520 lbl_802BE4F4: diff --git a/asm/Z2AudioLib/Z2SoundObject/startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2SoundObject/startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s index 72e9d1d106..c22d97ecdd 100644 --- a/asm/Z2AudioLib/Z2SoundObject/startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2SoundObject/startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s @@ -62,7 +62,7 @@ lbl_802BE384: lbl_802BE3B4: /* 802BE3B4 80 1C 00 00 */ lwz r0, 0(r28) /* 802BE3B8 90 01 00 10 */ stw r0, 0x10(r1) -/* 802BE3BC 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802BE3BC 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802BE3C0 38 81 00 10 */ addi r4, r1, 0x10 /* 802BE3C4 4B FF 01 ED */ bl isSoundCulling__7Z2SeMgrF10JAISoundID /* 802BE3C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/asm/Z2AudioLib/Z2SoundObject/startSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s b/asm/Z2AudioLib/Z2SoundObject/startSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s index 3538dbfceb..54fa3a0d35 100644 --- a/asm/Z2AudioLib/Z2SoundObject/startSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s +++ b/asm/Z2AudioLib/Z2SoundObject/startSound__14Z2SoundObjBaseF10JAISoundIDUlSc.s @@ -18,7 +18,7 @@ lbl_802BE144: lbl_802BE184: /* 802BE184 80 1E 00 00 */ lwz r0, 0(r30) /* 802BE188 90 01 00 18 */ stw r0, 0x18(r1) -/* 802BE18C 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802BE18C 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802BE190 38 81 00 18 */ addi r4, r1, 0x18 /* 802BE194 4B FF 04 1D */ bl isSoundCulling__7Z2SeMgrF10JAISoundID /* 802BE198 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -53,7 +53,7 @@ lbl_802BE1C0: /* 802BE200 41 82 00 30 */ beq lbl_802BE230 /* 802BE204 80 1E 00 00 */ lwz r0, 0(r30) /* 802BE208 90 01 00 10 */ stw r0, 0x10(r1) -/* 802BE20C 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802BE20C 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802BE210 38 81 00 10 */ addi r4, r1, 0x10 /* 802BE214 4B FF D8 B5 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BE218 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 diff --git a/asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s b/asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s index 968da8ab99..b8631e97a9 100644 --- a/asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s +++ b/asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s @@ -5,7 +5,7 @@ lbl_802BE104: /* 802BE110 80 64 00 00 */ lwz r3, 0(r4) /* 802BE114 80 03 00 18 */ lwz r0, 0x18(r3) /* 802BE118 90 01 00 08 */ stw r0, 8(r1) -/* 802BE11C 80 6D 85 CC */ lwz r3, data_80450B4C(r13) +/* 802BE11C 80 6D 85 CC */ lwz r3, __OSReport_disable-0x4C(r13) /* 802BE120 38 81 00 08 */ addi r4, r1, 8 /* 802BE124 4B FF D9 A5 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID /* 802BE128 54 60 04 20 */ rlwinm r0, r3, 0, 0x10, 0x10 diff --git a/asm/Z2AudioLib/Z2SoundStarter/__ct__14Z2SoundStarterFb.s b/asm/Z2AudioLib/Z2SoundStarter/__ct__14Z2SoundStarterFb.s index b9ea054917..397b73272e 100644 --- a/asm/Z2AudioLib/Z2SoundStarter/__ct__14Z2SoundStarterFb.s +++ b/asm/Z2AudioLib/Z2SoundStarter/__ct__14Z2SoundStarterFb.s @@ -13,7 +13,7 @@ lbl_802AAB94: /* 802AABC0 41 82 00 08 */ beq lbl_802AABC8 /* 802AABC4 38 63 FF FC */ addi r3, r3, -4 lbl_802AABC8: -/* 802AABC8 90 6D 85 F4 */ stw r3, data_80450B74(r13) +/* 802AABC8 90 6D 85 F4 */ stw r3, __OSReport_disable-0x24(r13) lbl_802AABCC: /* 802AABCC 3C 60 80 3D */ lis r3, __vt__14Z2SoundStarter@ha /* 0x803C9D80@ha */ /* 802AABD0 38 03 9D 80 */ addi r0, r3, __vt__14Z2SoundStarter@l /* 0x803C9D80@l */ diff --git a/asm/Z2AudioLib/Z2SoundStarter/__dt__14Z2SoundStarterFv.s b/asm/Z2AudioLib/Z2SoundStarter/__dt__14Z2SoundStarterFv.s index b0361f1342..1a17565d17 100644 --- a/asm/Z2AudioLib/Z2SoundStarter/__dt__14Z2SoundStarterFv.s +++ b/asm/Z2AudioLib/Z2SoundStarter/__dt__14Z2SoundStarterFv.s @@ -16,11 +16,11 @@ lbl_802AAFF0: /* 802AB028 41 82 00 08 */ beq lbl_802AB030 /* 802AB02C 38 63 FF FC */ addi r3, r3, -4 lbl_802AB030: -/* 802AB030 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802AB030 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802AB034 7C 00 18 40 */ cmplw r0, r3 /* 802AB038 40 82 00 0C */ bne lbl_802AB044 /* 802AB03C 38 00 00 00 */ li r0, 0 -/* 802AB040 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802AB040 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802AB044: /* 802AB044 7F C3 F3 78 */ mr r3, r30 /* 802AB048 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2SoundStarter/func_802AAC3C.s b/asm/Z2AudioLib/Z2SoundStarter/func_802AAC3C.s index faa50cf73b..eee09a8ef2 100644 --- a/asm/Z2AudioLib/Z2SoundStarter/func_802AAC3C.s +++ b/asm/Z2AudioLib/Z2SoundStarter/func_802AAC3C.s @@ -62,14 +62,14 @@ lbl_802AAD10: /* 802AAD18 41 82 00 88 */ beq lbl_802AADA0 /* 802AAD1C 28 00 00 09 */ cmplwi r0, 9 /* 802AAD20 41 82 00 80 */ beq lbl_802AADA0 -/* 802AAD24 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802AAD24 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802AAD28 88 03 00 1E */ lbz r0, 0x1e(r3) /* 802AAD2C 28 00 00 00 */ cmplwi r0, 0 /* 802AAD30 41 82 00 0C */ beq lbl_802AAD3C /* 802AAD34 C3 62 BE 5C */ lfs f27, lit_3598(r2) /* 802AAD38 48 00 00 68 */ b lbl_802AADA0 lbl_802AAD3C: -/* 802AAD3C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802AAD3C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802AAD40 C0 03 00 1C */ lfs f0, 0x1c(r3) /* 802AAD44 C0 42 BE 58 */ lfs f2, lit_3597(r2) /* 802AAD48 FC 00 10 40 */ fcmpo cr0, f0, f2 @@ -86,7 +86,7 @@ lbl_802AAD3C: /* 802AAD74 FF 60 00 90 */ fmr f27, f0 /* 802AAD78 48 00 00 28 */ b lbl_802AADA0 lbl_802AAD7C: -/* 802AAD7C 80 6D 85 BC */ lwz r3, data_80450B3C(r13) +/* 802AAD7C 80 6D 85 BC */ lwz r3, __OSReport_disable-0x5C(r13) /* 802AAD80 48 01 E6 65 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802AAD84 C0 02 BE 64 */ lfs f0, lit_3713(r2) /* 802AAD88 EC 00 00 72 */ fmuls f0, f0, f1 diff --git a/asm/Z2AudioLib/Z2SpeechMgr2/__ct__12Z2SpeechMgr2Fv.s b/asm/Z2AudioLib/Z2SpeechMgr2/__ct__12Z2SpeechMgr2Fv.s index 30e18b2453..666747ed42 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2/__ct__12Z2SpeechMgr2Fv.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2/__ct__12Z2SpeechMgr2Fv.s @@ -4,7 +4,7 @@ lbl_802CBC60: /* 802CBC68 90 01 00 14 */ stw r0, 0x14(r1) /* 802CBC6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CBC70 7C 7F 1B 78 */ mr r31, r3 -/* 802CBC74 93 ED 85 F0 */ stw r31, data_80450B70(r13) +/* 802CBC74 93 ED 85 F0 */ stw r31, __OSReport_disable-0x28(r13) /* 802CBC78 38 00 00 00 */ li r0, 0 /* 802CBC7C 90 03 00 00 */ stw r0, 0(r3) /* 802CBC80 90 03 00 04 */ stw r0, 4(r3) diff --git a/asm/Z2AudioLib/Z2SpeechMgr2/__dt__15Z2SpeechStarterFv.s b/asm/Z2AudioLib/Z2SpeechMgr2/__dt__15Z2SpeechStarterFv.s index cfe0050cc9..93fc1e6097 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2/__dt__15Z2SpeechStarterFv.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2/__dt__15Z2SpeechStarterFv.s @@ -20,11 +20,11 @@ lbl_802CBCEC: /* 802CBD34 41 82 00 08 */ beq lbl_802CBD3C /* 802CBD38 38 63 FF FC */ addi r3, r3, -4 lbl_802CBD3C: -/* 802CBD3C 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 802CBD3C 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 802CBD40 7C 00 18 40 */ cmplw r0, r3 /* 802CBD44 40 82 00 0C */ bne lbl_802CBD50 /* 802CBD48 38 00 00 00 */ li r0, 0 -/* 802CBD4C 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 802CBD4C 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_802CBD50: /* 802CBD50 7F C3 F3 78 */ mr r3, r30 /* 802CBD54 38 80 00 00 */ li r4, 0 diff --git a/asm/Z2AudioLib/Z2SpeechMgr2/func_802CCFF8.s b/asm/Z2AudioLib/Z2SpeechMgr2/func_802CCFF8.s index 88d3873801..5ea19c096a 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2/func_802CCFF8.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2/func_802CCFF8.s @@ -25,7 +25,7 @@ lbl_802CCFF8: /* 802CD054 FF C0 20 90 */ fmr f30, f4 /* 802CD058 FF E0 28 90 */ fmr f31, f5 /* 802CD05C 7D 1F 43 78 */ mr r31, r8 -/* 802CD060 80 8D 86 00 */ lwz r4, data_80450B80(r13) +/* 802CD060 80 8D 86 00 */ lwz r4, __OSReport_disable-0x18(r13) /* 802CD064 88 04 00 1E */ lbz r0, 0x1e(r4) /* 802CD068 28 00 00 00 */ cmplwi r0, 0 /* 802CD06C 41 82 00 20 */ beq lbl_802CD08C @@ -37,7 +37,7 @@ lbl_802CCFF8: /* 802CD084 C3 62 C5 34 */ lfs f27, lit_3837(r2) /* 802CD088 48 00 00 84 */ b lbl_802CD10C lbl_802CD08C: -/* 802CD08C 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 802CD08C 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 802CD090 C0 03 00 1C */ lfs f0, 0x1c(r3) /* 802CD094 C0 42 C5 30 */ lfs f2, lit_3836(r2) /* 802CD098 FC 00 10 40 */ fcmpo cr0, f0, f2 @@ -63,7 +63,7 @@ lbl_802CD0E0: /* 802CD0E0 C3 62 C5 50 */ lfs f27, lit_4571(r2) /* 802CD0E4 48 00 00 28 */ b lbl_802CD10C lbl_802CD0E8: -/* 802CD0E8 80 6D 85 BC */ lwz r3, data_80450B3C(r13) +/* 802CD0E8 80 6D 85 BC */ lwz r3, __OSReport_disable-0x5C(r13) /* 802CD0EC 4B FF C2 F9 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802CD0F0 C0 02 C5 54 */ lfs f0, lit_4572(r2) /* 802CD0F4 EC 00 00 72 */ fmuls f0, f0, f1 diff --git a/asm/Z2AudioLib/Z2SpeechMgr2/playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc.s b/asm/Z2AudioLib/Z2SpeechMgr2/playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc.s index fa00c584ed..fc76a081c4 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2/playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2/playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc.s @@ -12,7 +12,7 @@ lbl_802CCA18: /* 802CCA40 7C DF 33 78 */ mr r31, r6 /* 802CCA44 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802CCA48 41 82 05 20 */ beq lbl_802CCF68 -/* 802CCA4C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802CCA4C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802CCA50 88 63 00 0C */ lbz r3, 0xc(r3) /* 802CCA54 7C 63 07 74 */ extsb r3, r3 /* 802CCA58 4B D6 06 15 */ bl dComIfGp_getReverb__Fi @@ -197,7 +197,7 @@ lbl_802CCCC8: /* 802CCCC8 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 802CCCCC 28 00 00 01 */ cmplwi r0, 1 /* 802CCCD0 40 82 02 1C */ bne lbl_802CCEEC -/* 802CCCD4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CCCD4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CCCD8 3C 80 01 00 */ lis r4, 0x0100 /* 0x0100000B@ha */ /* 802CCCDC 38 84 00 0B */ addi r4, r4, 0x000B /* 0x0100000B@l */ /* 802CCCE0 4B FE 27 BD */ bl subBgmStart__8Z2SeqMgrFUl diff --git a/asm/Z2AudioLib/Z2SpeechMgr2/speakOneWord__12Z2SpeechMgr2Fb.s b/asm/Z2AudioLib/Z2SpeechMgr2/speakOneWord__12Z2SpeechMgr2Fb.s index f68d09eed9..f33372e914 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2/speakOneWord__12Z2SpeechMgr2Fb.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2/speakOneWord__12Z2SpeechMgr2Fb.s @@ -6,7 +6,7 @@ lbl_802CC190: /* 802CC1A0 48 09 60 3D */ bl _savegpr_29 /* 802CC1A4 7C 7E 1B 78 */ mr r30, r3 /* 802CC1A8 7C 9F 23 78 */ mr r31, r4 -/* 802CC1AC 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802CC1AC 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802CC1B0 88 03 00 1D */ lbz r0, 0x1d(r3) /* 802CC1B4 28 00 00 00 */ cmplwi r0, 0 /* 802CC1B8 41 82 01 2C */ beq lbl_802CC2E4 @@ -39,7 +39,7 @@ lbl_802CC20C: lbl_802CC21C: /* 802CC21C A0 7E 03 FC */ lhz r3, 0x3fc(r30) /* 802CC220 3F A3 00 05 */ addis r29, r3, 5 -/* 802CC224 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802CC224 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802CC228 88 63 00 0C */ lbz r3, 0xc(r3) /* 802CC22C 7C 63 07 74 */ extsb r3, r3 /* 802CC230 3B BD 00 A1 */ addi r29, r29, 0xa1 diff --git a/asm/Z2AudioLib/Z2StatusMgr/__ct__11Z2StatusMgrFv.s b/asm/Z2AudioLib/Z2StatusMgr/__ct__11Z2StatusMgrFv.s deleted file mode 100644 index bb624b67ba..0000000000 --- a/asm/Z2AudioLib/Z2StatusMgr/__ct__11Z2StatusMgrFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802B5F1C: -/* 802B5F1C 90 6D 85 FC */ stw r3, data_80450B7C(r13) -/* 802B5F20 38 80 00 00 */ li r4, 0 -/* 802B5F24 98 83 00 00 */ stb r4, 0(r3) -/* 802B5F28 98 83 00 01 */ stb r4, 1(r3) -/* 802B5F2C 98 83 00 02 */ stb r4, 2(r3) -/* 802B5F30 98 83 00 03 */ stb r4, 3(r3) -/* 802B5F34 38 00 0C 00 */ li r0, 0xc00 -/* 802B5F38 B0 03 00 04 */ sth r0, 4(r3) -/* 802B5F3C 90 83 00 08 */ stw r4, 8(r3) -/* 802B5F40 98 83 00 0C */ stb r4, 0xc(r3) -/* 802B5F44 90 83 00 10 */ stw r4, 0x10(r3) -/* 802B5F48 C0 02 C0 18 */ lfs f0, lit_3395(r2) -/* 802B5F4C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 802B5F50 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 802B5F54 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 802B5F58 C0 02 C0 1C */ lfs f0, lit_3396(r2) -/* 802B5F5C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 802B5F60 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 802B5F64 98 83 00 2C */ stb r4, 0x2c(r3) -/* 802B5F68 98 83 00 2D */ stb r4, 0x2d(r3) -/* 802B5F6C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s b/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s index 1fc4c275e6..acfcf318f8 100644 --- a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s +++ b/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s @@ -22,7 +22,7 @@ lbl_802B5FBC: /* 802B5FC8 88 83 00 C3 */ lbz r4, 0xc3(r3) /* 802B5FCC 28 04 00 00 */ cmplwi r4, 0 /* 802B5FD0 41 82 00 EC */ beq lbl_802B60BC -/* 802B5FD4 80 AD 86 04 */ lwz r5, data_80450B84(r13) +/* 802B5FD4 80 AD 86 04 */ lwz r5, __OSReport_disable-0x14(r13) /* 802B5FD8 38 60 00 00 */ li r3, 0 /* 802B5FDC 80 05 00 08 */ lwz r0, 8(r5) /* 802B5FE0 28 00 00 00 */ cmplwi r0, 0 @@ -39,7 +39,7 @@ lbl_802B5FF8: /* 802B6004 41 81 00 3C */ bgt lbl_802B6040 /* 802B6008 38 00 00 36 */ li r0, 0x36 /* 802B600C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802B6010 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6010 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6014 38 81 00 10 */ addi r4, r1, 0x10 /* 802B6018 38 A0 00 00 */ li r5, 0 /* 802B601C 38 C0 00 00 */ li r6, 0 @@ -56,7 +56,7 @@ lbl_802B6040: /* 802B6044 41 81 00 3C */ bgt lbl_802B6080 /* 802B6048 38 00 00 35 */ li r0, 0x35 /* 802B604C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802B6050 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6050 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6054 38 81 00 0C */ addi r4, r1, 0xc /* 802B6058 38 A0 00 00 */ li r5, 0 /* 802B605C 38 C0 00 00 */ li r6, 0 @@ -73,7 +73,7 @@ lbl_802B6080: /* 802B6084 41 81 00 38 */ bgt lbl_802B60BC /* 802B6088 38 00 00 34 */ li r0, 0x34 /* 802B608C 90 01 00 08 */ stw r0, 8(r1) -/* 802B6090 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6090 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6094 38 81 00 08 */ addi r4, r1, 8 /* 802B6098 38 A0 00 00 */ li r5, 0 /* 802B609C 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s b/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s index 49c62c9df0..4c9c011046 100644 --- a/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s +++ b/asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s @@ -11,7 +11,7 @@ lbl_802B6788: /* 802B67AC FC 02 F8 00 */ fcmpu cr0, f2, f31 /* 802B67B0 40 82 00 18 */ bne lbl_802B67C8 /* 802B67B4 D0 5F 00 1C */ stfs f2, 0x1c(r31) -/* 802B67B8 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802B67B8 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802B67BC 38 80 00 00 */ li r4, 0 /* 802B67C0 48 00 46 89 */ bl setUnderWaterFx__11Z2FxLineMgrFb /* 802B67C4 48 00 00 5C */ b lbl_802B6820 @@ -37,7 +37,7 @@ lbl_802B67FC: /* 802B680C 4B FF 2E E9 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign /* 802B6810 D0 3F 00 1C */ stfs f1, 0x1c(r31) lbl_802B6814: -/* 802B6814 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 802B6814 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 802B6818 38 80 00 01 */ li r4, 1 /* 802B681C 48 00 46 2D */ bl setUnderWaterFx__11Z2FxLineMgrFb lbl_802B6820: diff --git a/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s b/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s index 2aee328e65..cf1009431e 100644 --- a/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s +++ b/asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s @@ -11,7 +11,7 @@ lbl_802B61E8: /* 802B620C 40 82 00 20 */ bne lbl_802B622C /* 802B6210 38 00 00 00 */ li r0, 0 /* 802B6214 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6218 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B6218 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B621C 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802B6220 28 00 00 00 */ cmplwi r0, 0 /* 802B6224 41 82 00 08 */ beq lbl_802B622C @@ -22,7 +22,7 @@ lbl_802B622C: /* 802B6234 88 1D 00 2C */ lbz r0, 0x2c(r29) /* 802B6238 28 00 00 03 */ cmplwi r0, 3 /* 802B623C 40 82 00 14 */ bne lbl_802B6250 -/* 802B6240 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B6240 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6244 38 80 00 00 */ li r4, 0 /* 802B6248 4B FF DF 1D */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B624C 48 00 00 AC */ b lbl_802B62F8 @@ -30,7 +30,7 @@ lbl_802B6250: /* 802B6250 28 00 00 04 */ cmplwi r0, 4 /* 802B6254 40 82 00 7C */ bne lbl_802B62D0 /* 802B6258 88 6D 82 E1 */ lbz r3, struct_80450860+0x1(r13) -/* 802B625C 80 8D 86 04 */ lwz r4, data_80450B84(r13) +/* 802B625C 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) /* 802B6260 C0 62 C0 20 */ lfs f3, lit_3467(r2) /* 802B6264 D0 64 00 34 */ stfs f3, 0x34(r4) /* 802B6268 C0 02 C0 1C */ lfs f0, lit_3396(r2) @@ -63,13 +63,13 @@ lbl_802B62BC: lbl_802B62D0: /* 802B62D0 28 00 00 05 */ cmplwi r0, 5 /* 802B62D4 40 82 00 10 */ bne lbl_802B62E4 -/* 802B62D8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B62D8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B62DC 4B FF 95 A9 */ bl subBgmStop__8Z2SeqMgrFv /* 802B62E0 48 00 00 18 */ b lbl_802B62F8 lbl_802B62E4: /* 802B62E4 28 00 00 09 */ cmplwi r0, 9 /* 802B62E8 40 82 00 10 */ bne lbl_802B62F8 -/* 802B62EC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B62EC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B62F0 38 80 00 3C */ li r4, 0x3c /* 802B62F4 4B FF 9B E9 */ bl bgmStreamStop__8Z2SeqMgrFUl lbl_802B62F8: @@ -131,7 +131,7 @@ lbl_802B638C: lbl_802B63C4: /* 802B63C4 38 00 00 04 */ li r0, 4 /* 802B63C8 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B63CC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B63CC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B63D0 C0 03 00 44 */ lfs f0, 0x44(r3) /* 802B63D4 38 00 00 1E */ li r0, 0x1e /* 802B63D8 90 03 00 50 */ stw r0, 0x50(r3) @@ -158,7 +158,7 @@ lbl_802B6410: /* 802B6428 40 82 00 24 */ bne lbl_802B644C /* 802B642C 38 00 00 0C */ li r0, 0xc /* 802B6430 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6434 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802B6434 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802B6438 38 63 03 EC */ addi r3, r3, 0x3ec /* 802B643C C0 22 C0 1C */ lfs f1, lit_3396(r2) /* 802B6440 38 80 00 00 */ li r4, 0 @@ -175,7 +175,7 @@ lbl_802B644C: /* 802B6468 40 82 00 20 */ bne lbl_802B6488 /* 802B646C 38 00 00 0D */ li r0, 0xd /* 802B6470 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B6474 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802B6474 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802B6478 C0 22 C0 1C */ lfs f1, lit_3396(r2) /* 802B647C 38 80 00 00 */ li r4, 0 /* 802B6480 4B FF 75 75 */ bl seMoveVolumeAll__7Z2SeMgrFfUl @@ -248,7 +248,7 @@ lbl_802B6554: /* 802B6574 98 1D 00 2C */ stb r0, 0x2c(r29) /* 802B6578 48 00 01 8C */ b lbl_802B6704 lbl_802B657C: -/* 802B657C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802B657C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802B6580 80 63 00 04 */ lwz r3, 4(r3) /* 802B6584 38 03 FF FC */ addi r0, r3, -4 /* 802B6588 28 00 00 2D */ cmplwi r0, 0x2d @@ -268,7 +268,7 @@ lbl_802B657C: /* 802B65C0 40 82 01 10 */ bne lbl_802B66D0 /* 802B65C4 38 00 00 05 */ li r0, 5 /* 802B65C8 98 1D 00 2C */ stb r0, 0x2c(r29) -/* 802B65CC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B65CC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B65D0 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000056@ha */ /* 802B65D4 38 84 00 56 */ addi r4, r4, 0x0056 /* 0x01000056@l */ /* 802B65D8 4B FF 8E C5 */ bl subBgmStart__8Z2SeqMgrFUl @@ -280,11 +280,11 @@ lbl_802B657C: /* 802B65F0 48 0B 23 A5 */ bl strcmp /* 802B65F4 2C 03 00 00 */ cmpwi r3, 0 /* 802B65F8 40 82 00 D8 */ bne lbl_802B66D0 -/* 802B65FC 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B65FC 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6600 3C 80 02 00 */ lis r4, 0x0200 /* 0x0200005F@ha */ /* 802B6604 38 84 00 5F */ addi r4, r4, 0x005F /* 0x0200005F@l */ /* 802B6608 4B FF 95 8D */ bl bgmStreamPrepare__8Z2SeqMgrFUl -/* 802B660C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B660C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B6610 4B FF 98 09 */ bl bgmStreamPlay__8Z2SeqMgrFv /* 802B6614 38 00 00 09 */ li r0, 9 /* 802B6618 98 1D 00 2C */ stb r0, 0x2c(r29) @@ -336,7 +336,7 @@ lbl_802B657C: lbl_802B66D0: /* 802B66D0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802B66D4 41 82 00 1C */ beq lbl_802B66F0 -/* 802B66D8 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802B66D8 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802B66DC 38 80 00 01 */ li r4, 1 /* 802B66E0 4B FF DA 85 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B66E4 38 00 00 03 */ li r0, 3 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s index 54547bd716..ba1561f582 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/__ct__13Z2WolfHowlMgrFv.s @@ -1,5 +1,5 @@ lbl_802CAAC0: -/* 802CAAC0 90 6D 85 B8 */ stw r3, data_80450B38(r13) +/* 802CAAC0 90 6D 85 B8 */ stw r3, __OSReport_disable-0x60(r13) /* 802CAAC4 38 A0 00 00 */ li r5, 0 /* 802CAAC8 90 A3 00 00 */ stw r5, 0(r3) /* 802CAACC 90 A3 00 04 */ stw r5, 4(r3) diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s index 5ac8a26d8d..0b76eac974 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s @@ -16,7 +16,7 @@ lbl_802CB3C0: /* 802CB3C0 38 60 FF FF */ li r3, -1 /* 802CB3C4 48 00 02 74 */ b lbl_802CB638 lbl_802CB3C8: -/* 802CB3C8 80 AD 86 04 */ lwz r5, data_80450B84(r13) +/* 802CB3C8 80 AD 86 04 */ lwz r5, __OSReport_disable-0x14(r13) /* 802CB3CC 38 80 00 00 */ li r4, 0 /* 802CB3D0 80 05 00 08 */ lwz r0, 8(r5) /* 802CB3D4 28 00 00 00 */ cmplwi r0, 0 @@ -76,7 +76,7 @@ lbl_802CB45C: lbl_802CB490: /* 802CB490 38 00 00 0D */ li r0, 0xd /* 802CB494 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CB498 80 6D 86 08 */ lwz r3, data_80450B88(r13) +/* 802CB498 80 6D 86 08 */ lwz r3, __OSReport_disable-0x10(r13) /* 802CB49C 38 81 00 14 */ addi r4, r1, 0x14 /* 802CB4A0 38 A0 00 00 */ li r5, 0 /* 802CB4A4 38 C0 00 00 */ li r6, 0 @@ -91,7 +91,7 @@ lbl_802CB490: /* 802CB4C8 7C 00 07 74 */ extsb r0, r0 /* 802CB4CC 2C 00 00 02 */ cmpwi r0, 2 /* 802CB4D0 40 81 00 30 */ ble lbl_802CB500 -/* 802CB4D4 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 802CB4D4 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 802CB4D8 80 63 00 04 */ lwz r3, 4(r3) /* 802CB4DC 2C 03 00 21 */ cmpwi r3, 0x21 /* 802CB4E0 40 82 00 38 */ bne lbl_802CB518 @@ -99,7 +99,7 @@ lbl_802CB490: /* 802CB4E8 3C 60 80 43 */ lis r3, sCorrectDuo@ha /* 0x80434240@ha */ /* 802CB4EC 38 63 42 40 */ addi r3, r3, sCorrectDuo@l /* 0x80434240@l */ /* 802CB4F0 7C 83 00 2E */ lwzx r4, r3, r0 -/* 802CB4F4 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CB4F4 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CB4F8 4B FE 3F A5 */ bl subBgmStart__8Z2SeqMgrFUl /* 802CB4FC 48 00 00 1C */ b lbl_802CB518 lbl_802CB500: @@ -107,7 +107,7 @@ lbl_802CB500: /* 802CB504 3C 60 80 43 */ lis r3, sCorrectPhrase@ha /* 0x804341F8@ha */ /* 802CB508 38 63 41 F8 */ addi r3, r3, sCorrectPhrase@l /* 0x804341F8@l */ /* 802CB50C 7C 83 00 2E */ lwzx r4, r3, r0 -/* 802CB510 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CB510 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CB514 4B FE 3F 89 */ bl subBgmStart__8Z2SeqMgrFUl lbl_802CB518: /* 802CB518 38 00 FF FF */ li r0, -1 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s index 8c94403a29..ef0a1f25ea 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/skipCorrectDemo__13Z2WolfHowlMgrFv.s @@ -2,7 +2,7 @@ lbl_802CBB58: /* 802CBB58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802CBB5C 7C 08 02 A6 */ mflr r0 /* 802CBB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CBB64 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CBB64 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CBB68 4B FE 77 15 */ bl stopWolfHowlSong__8Z2SeqMgrFv /* 802CBB6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CBB70 7C 08 03 A6 */ mtlr r0 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s index d0da356ece..b7dbccaa40 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/startGuideMelody__13Z2WolfHowlMgrFb.s @@ -4,7 +4,7 @@ lbl_802CBA88: /* 802CBA90 90 01 00 24 */ stw r0, 0x24(r1) /* 802CBA94 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802CBA98 7C 7F 1B 78 */ mr r31, r3 -/* 802CBA9C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CBA9C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CBAA0 C0 02 C4 60 */ lfs f0, lit_3485(r2) /* 802CBAA4 D0 03 00 94 */ stfs f0, 0x94(r3) /* 802CBAA8 D0 03 00 98 */ stfs f0, 0x98(r3) @@ -20,7 +20,7 @@ lbl_802CBA88: /* 802CBAD0 38 63 42 1C */ addi r3, r3, sWindStoneSound@l /* 0x8043421C@l */ /* 802CBAD4 7C 03 00 2E */ lwzx r0, r3, r0 /* 802CBAD8 90 01 00 08 */ stw r0, 8(r1) -/* 802CBADC 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802CBADC 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802CBAE0 38 81 00 08 */ addi r4, r1, 8 /* 802CBAE4 38 BF 00 08 */ addi r5, r31, 8 /* 802CBAE8 38 C0 00 00 */ li r6, 0 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s index a391311f8a..0a8a367696 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/startWindStoneSound__13Z2WolfHowlMgrFScP3Vec.s @@ -16,7 +16,7 @@ lbl_802CB6EC: /* 802CB724 40 82 00 08 */ bne lbl_802CB72C /* 802CB728 48 00 03 48 */ b lbl_802CBA70 lbl_802CB72C: -/* 802CB72C 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 802CB72C 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 802CB730 E0 23 01 70 */ psq_l f1, 368(r3), 0, 0 /* qr0 */ /* 802CB734 C0 03 01 78 */ lfs f0, 0x178(r3) /* 802CB738 F0 21 00 14 */ psq_st f1, 20(r1), 0, 0 /* qr0 */ @@ -117,7 +117,7 @@ lbl_802CB868: /* 802CB88C 38 63 42 1C */ addi r3, r3, sWindStoneSound@l /* 0x8043421C@l */ /* 802CB890 7C 03 00 2E */ lwzx r0, r3, r0 /* 802CB894 90 01 00 10 */ stw r0, 0x10(r1) -/* 802CB898 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 802CB898 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 802CB89C 38 81 00 10 */ addi r4, r1, 0x10 /* 802CB8A0 38 BD 00 04 */ addi r5, r29, 4 /* 802CB8A4 7F E6 FB 78 */ mr r6, r31 @@ -229,7 +229,7 @@ lbl_802CBA08: /* 802CBA20 4B FD DC D5 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign /* 802CBA24 FC C0 08 90 */ fmr f6, f1 lbl_802CBA28: -/* 802CBA28 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CBA28 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CBA2C D0 C3 00 94 */ stfs f6, 0x94(r3) /* 802CBA30 C0 02 C4 60 */ lfs f0, lit_3485(r2) /* 802CBA34 D0 03 00 98 */ stfs f0, 0x98(r3) diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s index 8fc66936ee..82b475d6ca 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s @@ -13,7 +13,7 @@ lbl_802CAED4: /* 802CAF00 7C 00 07 74 */ extsb r0, r0 /* 802CAF04 2C 00 00 01 */ cmpwi r0, 1 /* 802CAF08 40 81 00 20 */ ble lbl_802CAF28 -/* 802CAF0C 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 802CAF0C 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 802CAF10 C0 02 C4 60 */ lfs f0, lit_3485(r2) /* 802CAF14 D0 03 00 94 */ stfs f0, 0x94(r3) /* 802CAF18 D0 03 00 98 */ stfs f0, 0x98(r3) @@ -21,7 +21,7 @@ lbl_802CAED4: /* 802CAF20 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802CAF24 D0 03 00 9C */ stfs f0, 0x9c(r3) lbl_802CAF28: -/* 802CAF28 80 8D 86 04 */ lwz r4, data_80450B84(r13) +/* 802CAF28 80 8D 86 04 */ lwz r4, __OSReport_disable-0x14(r13) /* 802CAF2C 38 60 00 00 */ li r3, 0 /* 802CAF30 80 04 00 08 */ lwz r0, 8(r4) /* 802CAF34 28 00 00 00 */ cmplwi r0, 0 @@ -80,7 +80,7 @@ lbl_802CAFD4: /* 802CAFEC 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010035@ha */ /* 802CAFF0 38 03 00 35 */ addi r0, r3, 0x0035 /* 0x00010035@l */ /* 802CAFF4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802CAFF8 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802CAFF8 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802CAFFC 38 81 00 0C */ addi r4, r1, 0xc /* 802CB000 7F E5 FB 78 */ mr r5, r31 /* 802CB004 38 C0 00 00 */ li r6, 0 @@ -112,7 +112,7 @@ lbl_802CB044: /* 802CB060 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010035@ha */ /* 802CB064 38 03 00 35 */ addi r0, r3, 0x0035 /* 0x00010035@l */ /* 802CB068 90 01 00 08 */ stw r0, 8(r1) -/* 802CB06C 80 6D 85 F4 */ lwz r3, data_80450B74(r13) +/* 802CB06C 80 6D 85 F4 */ lwz r3, __OSReport_disable-0x24(r13) /* 802CB070 38 81 00 08 */ addi r4, r1, 8 /* 802CB074 7F E5 FB 78 */ mr r5, r31 /* 802CB078 38 C0 00 00 */ li r6, 0 diff --git a/asm/d/a/d_a_alink/__dt__9daAlink_cFv.s b/asm/d/a/d_a_alink/__dt__9daAlink_cFv.s index 9738e9b0af..fbda345dcb 100644 --- a/asm/d/a/d_a_alink/__dt__9daAlink_cFv.s +++ b/asm/d/a/d_a_alink/__dt__9daAlink_cFv.s @@ -198,12 +198,12 @@ lbl_800CDA84: lbl_800CDA94: /* 800CDA94 34 1F 2D 84 */ addic. r0, r31, 0x2d84 /* 800CDA98 41 82 00 1C */ beq lbl_800CDAB4 -/* 800CDA9C 80 6D 85 B8 */ lwz r3, data_80450B38(r13) +/* 800CDA9C 80 6D 85 B8 */ lwz r3, __OSReport_disable-0x60(r13) /* 800CDAA0 38 1F 2D 84 */ addi r0, r31, 0x2d84 /* 800CDAA4 7C 03 00 40 */ cmplw r3, r0 /* 800CDAA8 40 82 00 0C */ bne lbl_800CDAB4 /* 800CDAAC 38 00 00 00 */ li r0, 0 -/* 800CDAB0 90 0D 85 B8 */ stw r0, data_80450B38(r13) +/* 800CDAB0 90 0D 85 B8 */ stw r0, __OSReport_disable-0x60(r13) lbl_800CDAB4: /* 800CDAB4 38 7F 2C A8 */ addi r3, r31, 0x2ca8 /* 800CDAB8 38 80 FF FF */ li r4, -1 diff --git a/asm/d/a/d_a_alink/procMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMove__9daAlink_cFv.s deleted file mode 100644 index 92ac3e609d..0000000000 --- a/asm/d/a/d_a_alink/procMove__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800C3730: -/* 800C3730 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3734 7C 08 02 A6 */ mflr r0 -/* 800C3738 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C373C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3740 7C 7F 1B 78 */ mr r31, r3 -/* 800C3744 38 80 00 03 */ li r4, 3 -/* 800C3748 48 05 DA 79 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C374C 7F E3 FB 78 */ mr r3, r31 -/* 800C3750 38 80 00 00 */ li r4, 0 -/* 800C3754 4B FF 69 7D */ bl checkNextAction__9daAlink_cFi -/* 800C3758 2C 03 00 00 */ cmpwi r3, 0 -/* 800C375C 40 82 00 9C */ bne lbl_800C37F8 -/* 800C3760 7F E3 FB 78 */ mr r3, r31 -/* 800C3764 4B FF 32 CD */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 800C3768 2C 03 00 00 */ cmpwi r3, 0 -/* 800C376C 40 82 00 8C */ bne lbl_800C37F8 -/* 800C3770 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C3774 28 00 00 02 */ cmplwi r0, 2 -/* 800C3778 40 82 00 28 */ bne lbl_800C37A0 -/* 800C377C C0 5F 33 98 */ lfs f2, 0x3398(r31) -/* 800C3780 C0 3F 05 94 */ lfs f1, 0x594(r31) -/* 800C3784 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C3788 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C378C C0 03 00 28 */ lfs f0, 0x28(r3) -/* 800C3790 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C3794 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800C3798 40 81 00 08 */ ble lbl_800C37A0 -/* 800C379C D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_800C37A0: -/* 800C37A0 7F E3 FB 78 */ mr r3, r31 -/* 800C37A4 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C37A8 4B FE A6 6D */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C37AC 80 1F 31 74 */ lwz r0, 0x3174(r31) -/* 800C37B0 2C 00 00 08 */ cmpwi r0, 8 -/* 800C37B4 41 82 00 44 */ beq lbl_800C37F8 -/* 800C37B8 3C 60 80 39 */ lis r3, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C37BC 38 63 D6 64 */ addi r3, r3, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C37C0 A8 83 00 06 */ lha r4, 6(r3) -/* 800C37C4 A8 63 00 04 */ lha r3, 4(r3) -/* 800C37C8 A8 1F 2F F0 */ lha r0, 0x2ff0(r31) -/* 800C37CC 7C 00 0E 70 */ srawi r0, r0, 1 -/* 800C37D0 7C 05 07 34 */ extsh r5, r0 -/* 800C37D4 7C 05 18 00 */ cmpw r5, r3 -/* 800C37D8 40 80 00 08 */ bge lbl_800C37E0 -/* 800C37DC 48 00 00 18 */ b lbl_800C37F4 -lbl_800C37E0: -/* 800C37E0 7C 80 07 34 */ extsh r0, r4 -/* 800C37E4 7C 05 00 00 */ cmpw r5, r0 -/* 800C37E8 40 81 00 08 */ ble lbl_800C37F0 -/* 800C37EC 7C 85 23 78 */ mr r5, r4 -lbl_800C37F0: -/* 800C37F0 7C A3 2B 78 */ mr r3, r5 -lbl_800C37F4: -/* 800C37F4 B0 7F 30 A0 */ sth r3, 0x30a0(r31) -lbl_800C37F8: -/* 800C37F8 38 60 00 01 */ li r3, 1 -/* 800C37FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3800 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3804 7C 08 03 A6 */ mtlr r0 -/* 800C3808 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C380C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s deleted file mode 100644 index 05452b2095..0000000000 --- a/asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80104EB8: -/* 80104EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80104EBC 7C 08 02 A6 */ mflr r0 -/* 80104EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80104EC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80104EC8 7C 7F 1B 78 */ mr r31, r3 -/* 80104ECC 38 80 00 7E */ li r4, 0x7e -/* 80104ED0 4B FB DE D5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80104ED4 2C 03 00 00 */ cmpwi r3, 0 -/* 80104ED8 40 82 00 0C */ bne lbl_80104EE4 -/* 80104EDC 38 60 00 00 */ li r3, 0 -/* 80104EE0 48 00 00 D0 */ b lbl_80104FB0 -lbl_80104EE4: -/* 80104EE4 7F E3 FB 78 */ mr r3, r31 -/* 80104EE8 4B FA EA 1D */ bl checkZeroSpeedF__9daAlink_cCFv -/* 80104EEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80104EF0 41 82 00 10 */ beq lbl_80104F00 -/* 80104EF4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80104EF8 60 00 00 01 */ ori r0, r0, 1 -/* 80104EFC 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_80104F00: -/* 80104F00 7F E3 FB 78 */ mr r3, r31 -/* 80104F04 38 80 00 00 */ li r4, 0 -/* 80104F08 48 00 41 E5 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi -/* 80104F0C 38 00 FF FF */ li r0, -1 -/* 80104F10 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80104F14 38 00 00 05 */ li r0, 5 -/* 80104F18 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 80104F1C A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 80104F20 2C 00 00 00 */ cmpwi r0, 0 -/* 80104F24 40 82 00 0C */ bne lbl_80104F30 -/* 80104F28 7F E3 FB 78 */ mr r3, r31 -/* 80104F2C 4B FF E7 6D */ bl setSwimMoveAnime__9daAlink_cFv -lbl_80104F30: -/* 80104F30 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104F34 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80104F38 41 82 00 14 */ beq lbl_80104F4C -/* 80104F3C C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 80104F40 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80104F44 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80104F48 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_80104F4C: -/* 80104F4C 38 00 00 00 */ li r0, 0 -/* 80104F50 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80104F54 A8 9F 30 80 */ lha r4, 0x3080(r31) -/* 80104F58 7C 80 07 35 */ extsh. r0, r4 -/* 80104F5C 41 82 00 1C */ beq lbl_80104F78 -/* 80104F60 7F E3 FB 78 */ mr r3, r31 -/* 80104F64 38 A0 00 00 */ li r5, 0 -/* 80104F68 38 C0 00 00 */ li r6, 0 -/* 80104F6C 4B FA 8C 0D */ bl setOldRootQuaternion__9daAlink_cFsss -/* 80104F70 38 00 00 00 */ li r0, 0 -/* 80104F74 B0 1F 30 80 */ sth r0, 0x3080(r31) -lbl_80104F78: -/* 80104F78 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104F7C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104F80 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 80104F84 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 80104F88 38 00 00 00 */ li r0, 0 -/* 80104F8C B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80104F90 B0 1F 30 D0 */ sth r0, 0x30d0(r31) -/* 80104F94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104F98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104F9C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80104FA0 64 00 00 10 */ oris r0, r0, 0x10 -/* 80104FA4 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80104FA8 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104FAC 38 60 00 01 */ li r3, 1 -lbl_80104FB0: -/* 80104FB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104FB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80104FB8 7C 08 03 A6 */ mtlr r0 -/* 80104FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80104FC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s deleted file mode 100644 index cfeca4c895..0000000000 --- a/asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s +++ /dev/null @@ -1,135 +0,0 @@ -lbl_80104FC4: -/* 80104FC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80104FC8 7C 08 02 A6 */ mflr r0 -/* 80104FCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80104FD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80104FD4 7C 7F 1B 78 */ mr r31, r3 -/* 80104FD8 48 00 3F 8D */ bl cancelHookshotMove__9daAlink_cFv -/* 80104FDC 7F E3 FB 78 */ mr r3, r31 -/* 80104FE0 48 00 3A 39 */ bl checkHookshotWait__9daAlink_cCFv -/* 80104FE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80104FE8 41 82 00 20 */ beq lbl_80105008 -/* 80104FEC 7F E3 FB 78 */ mr r3, r31 -/* 80104FF0 4B FB AD C1 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80104FF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80104FF8 40 82 00 10 */ bne lbl_80105008 -/* 80104FFC 7F E3 FB 78 */ mr r3, r31 -/* 80105000 38 80 00 12 */ li r4, 0x12 -/* 80105004 4B FA E2 4D */ bl setDoStatus__9daAlink_cFUc -lbl_80105008: -/* 80105008 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 8010500C 2C 00 00 00 */ cmpwi r0, 0 -/* 80105010 40 82 00 14 */ bne lbl_80105024 -/* 80105014 7F E3 FB 78 */ mr r3, r31 -/* 80105018 4B FF D3 CD */ bl setSpeedAndAngleSwim__9daAlink_cFv -/* 8010501C 7F E3 FB 78 */ mr r3, r31 -/* 80105020 4B FF E6 79 */ bl setSwimMoveAnime__9daAlink_cFv -lbl_80105024: -/* 80105024 7F E3 FB 78 */ mr r3, r31 -/* 80105028 4B FF E0 31 */ bl checkSwimUpAction__9daAlink_cFv -/* 8010502C 2C 03 00 00 */ cmpwi r3, 0 -/* 80105030 41 82 00 0C */ beq lbl_8010503C -/* 80105034 38 60 00 01 */ li r3, 1 -/* 80105038 48 00 01 50 */ b lbl_80105188 -lbl_8010503C: -/* 8010503C 7F E3 FB 78 */ mr r3, r31 -/* 80105040 4B FF EE A1 */ bl checkSwimButtonAccept__9daAlink_cFv -/* 80105044 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80105048 41 82 00 1C */ beq lbl_80105064 -/* 8010504C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 80105050 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80105054 41 82 00 10 */ beq lbl_80105064 -/* 80105058 7F E3 FB 78 */ mr r3, r31 -/* 8010505C 4B FF F8 FD */ bl procSwimDiveInit__9daAlink_cFv -/* 80105060 48 00 01 28 */ b lbl_80105188 -lbl_80105064: -/* 80105064 7F E3 FB 78 */ mr r3, r31 -/* 80105068 4B FF EE A1 */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 8010506C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80105070 41 82 00 24 */ beq lbl_80105094 -/* 80105074 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 80105078 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8010507C 41 82 00 18 */ beq lbl_80105094 -/* 80105080 38 00 00 1E */ li r0, 0x1e -/* 80105084 B0 1F 30 00 */ sth r0, 0x3000(r31) -/* 80105088 7F E3 FB 78 */ mr r3, r31 -/* 8010508C 4B FF F5 E5 */ bl procSwimMoveInit__9daAlink_cFv -/* 80105090 48 00 00 F8 */ b lbl_80105188 -lbl_80105094: -/* 80105094 7F E3 FB 78 */ mr r3, r31 -/* 80105098 48 00 39 81 */ bl checkHookshotWait__9daAlink_cCFv -/* 8010509C 2C 03 00 00 */ cmpwi r3, 0 -/* 801050A0 40 82 00 14 */ bne lbl_801050B4 -/* 801050A4 7F E3 FB 78 */ mr r3, r31 -/* 801050A8 48 00 39 41 */ bl checkBossOctaIealRoom__9daAlink_cFv -/* 801050AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801050B0 41 82 00 10 */ beq lbl_801050C0 -lbl_801050B4: -/* 801050B4 7F E3 FB 78 */ mr r3, r31 -/* 801050B8 38 80 00 00 */ li r4, 0 -/* 801050BC 4B FA E6 79 */ bl setShapeAngleToAtnActor__9daAlink_cFi -lbl_801050C0: -/* 801050C0 7F E3 FB 78 */ mr r3, r31 -/* 801050C4 4B FB 4C 69 */ bl checkNextActionFromButton__9daAlink_cFv -/* 801050C8 2C 03 00 00 */ cmpwi r3, 0 -/* 801050CC 41 82 00 0C */ beq lbl_801050D8 -/* 801050D0 38 60 00 01 */ li r3, 1 -/* 801050D4 48 00 00 B4 */ b lbl_80105188 -lbl_801050D8: -/* 801050D8 38 60 00 00 */ li r3, 0 -/* 801050DC A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 801050E0 28 00 01 8D */ cmplwi r0, 0x18d -/* 801050E4 41 82 00 10 */ beq lbl_801050F4 -/* 801050E8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 801050EC 28 00 01 8C */ cmplwi r0, 0x18c -/* 801050F0 40 82 00 08 */ bne lbl_801050F8 -lbl_801050F4: -/* 801050F4 38 60 00 01 */ li r3, 1 -lbl_801050F8: -/* 801050F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801050FC 40 82 00 14 */ bne lbl_80105110 -/* 80105100 7F E3 FB 78 */ mr r3, r31 -/* 80105104 38 80 00 00 */ li r4, 0 -/* 80105108 4B FF F1 F1 */ bl procSwimWaitInit__9daAlink_cFi -/* 8010510C 48 00 00 7C */ b lbl_80105188 -lbl_80105110: -/* 80105110 7F E3 FB 78 */ mr r3, r31 -/* 80105114 48 00 44 B5 */ bl checkNextActionHookshot__9daAlink_cFv -/* 80105118 2C 03 00 00 */ cmpwi r3, 0 -/* 8010511C 40 82 00 68 */ bne lbl_80105184 -/* 80105120 7F E3 FB 78 */ mr r3, r31 -/* 80105124 4B FA E7 E1 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 80105128 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010512C 41 82 00 14 */ beq lbl_80105140 -/* 80105130 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80105134 60 00 00 01 */ ori r0, r0, 1 -/* 80105138 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 8010513C 48 00 00 10 */ b lbl_8010514C -lbl_80105140: -/* 80105140 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80105144 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80105148 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_8010514C: -/* 8010514C 7F E3 FB 78 */ mr r3, r31 -/* 80105150 48 00 38 C9 */ bl checkHookshotWait__9daAlink_cCFv -/* 80105154 2C 03 00 00 */ cmpwi r3, 0 -/* 80105158 40 82 00 20 */ bne lbl_80105178 -/* 8010515C 80 1F 27 EC */ lwz r0, 0x27ec(r31) -/* 80105160 28 00 00 00 */ cmplwi r0, 0 -/* 80105164 41 82 00 20 */ beq lbl_80105184 -/* 80105168 7F E3 FB 78 */ mr r3, r31 -/* 8010516C 48 00 38 7D */ bl checkBossOctaIealRoom__9daAlink_cFv -/* 80105170 2C 03 00 00 */ cmpwi r3, 0 -/* 80105174 41 82 00 10 */ beq lbl_80105184 -lbl_80105178: -/* 80105178 7F E3 FB 78 */ mr r3, r31 -/* 8010517C 38 80 00 00 */ li r4, 0 -/* 80105180 4B FB 61 31 */ bl setBodyAngleXReadyAnime__9daAlink_cFi -lbl_80105184: -/* 80105184 38 60 00 01 */ li r3, 1 -lbl_80105188: -/* 80105188 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010518C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80105190 7C 08 03 A6 */ mtlr r0 -/* 80105194 38 21 00 10 */ addi r1, r1, 0x10 -/* 80105198 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s deleted file mode 100644 index 8f83fbbbbc..0000000000 --- a/asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80104C50: -/* 80104C50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80104C54 7C 08 02 A6 */ mflr r0 -/* 80104C58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80104C5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80104C60 7C 7F 1B 78 */ mr r31, r3 -/* 80104C64 38 80 00 7D */ li r4, 0x7d -/* 80104C68 4B FB E1 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80104C6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80104C70 40 82 00 0C */ bne lbl_80104C7C -/* 80104C74 38 60 00 00 */ li r3, 0 -/* 80104C78 48 00 00 F0 */ b lbl_80104D68 -lbl_80104C7C: -/* 80104C7C 7F E3 FB 78 */ mr r3, r31 -/* 80104C80 38 80 00 01 */ li r4, 1 -/* 80104C84 48 00 44 69 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi -/* 80104C88 7F E3 FB 78 */ mr r3, r31 -/* 80104C8C 38 80 00 14 */ li r4, 0x14 -/* 80104C90 4B FA 78 C9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 80104C94 2C 03 00 00 */ cmpwi r3, 0 -/* 80104C98 40 82 00 28 */ bne lbl_80104CC0 -/* 80104C9C 7F E3 FB 78 */ mr r3, r31 -/* 80104CA0 38 80 00 14 */ li r4, 0x14 -/* 80104CA4 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104CA8 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104CAC C0 25 00 90 */ lfs f1, 0x90(r5) -/* 80104CB0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_hookshot_c0@ha /* 0x8038E9C0@ha */ -/* 80104CB4 38 A5 E9 C0 */ addi r5, r5, m__22daAlinkHIO_hookshot_c0@l /* 0x8038E9C0@l */ -/* 80104CB8 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 80104CBC 4B FA 83 25 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_80104CC0: -/* 80104CC0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80104CC4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 80104CC8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80104CCC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80104CD0 A8 9F 30 80 */ lha r4, 0x3080(r31) -/* 80104CD4 7C 80 07 35 */ extsh. r0, r4 -/* 80104CD8 41 82 00 1C */ beq lbl_80104CF4 -/* 80104CDC 7F E3 FB 78 */ mr r3, r31 -/* 80104CE0 38 A0 00 00 */ li r5, 0 -/* 80104CE4 38 C0 00 00 */ li r6, 0 -/* 80104CE8 4B FA 8E 91 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 80104CEC 38 00 00 00 */ li r0, 0 -/* 80104CF0 B0 1F 30 80 */ sth r0, 0x3080(r31) -lbl_80104CF4: -/* 80104CF4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104CF8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80104CFC 41 82 00 14 */ beq lbl_80104D10 -/* 80104D00 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 80104D04 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80104D08 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80104D0C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_80104D10: -/* 80104D10 38 00 00 00 */ li r0, 0 -/* 80104D14 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80104D18 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80104D1C 7F E3 FB 78 */ mr r3, r31 -/* 80104D20 4B FF CC F9 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv -/* 80104D24 D0 3F 05 94 */ stfs f1, 0x594(r31) -/* 80104D28 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104D2C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104D30 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 80104D34 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 80104D38 38 00 00 00 */ li r0, 0 -/* 80104D3C B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80104D40 B0 1F 30 D0 */ sth r0, 0x30d0(r31) -/* 80104D44 7F E3 FB 78 */ mr r3, r31 -/* 80104D48 48 00 43 29 */ bl setHookshotReadyMaterial__9daAlink_cFv -/* 80104D4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104D50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104D54 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80104D58 64 00 00 10 */ oris r0, r0, 0x10 -/* 80104D5C 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80104D60 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104D64 38 60 00 01 */ li r3, 1 -lbl_80104D68: -/* 80104D68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104D6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80104D70 7C 08 03 A6 */ mtlr r0 -/* 80104D74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80104D78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s deleted file mode 100644 index a30ea3453c..0000000000 --- a/asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_80104D7C: -/* 80104D7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80104D80 7C 08 02 A6 */ mflr r0 -/* 80104D84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80104D88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80104D8C 7C 7F 1B 78 */ mr r31, r3 -/* 80104D90 4B FF CD 19 */ bl getSwimMaxFallSpeed__9daAlink_cCFv -/* 80104D94 D0 3F 05 34 */ stfs f1, 0x534(r31) -/* 80104D98 7F E3 FB 78 */ mr r3, r31 -/* 80104D9C 4B FF CC 7D */ bl getSwimFrontMaxSpeed__9daAlink_cCFv -/* 80104DA0 D0 3F 05 94 */ stfs f1, 0x594(r31) -/* 80104DA4 7F E3 FB 78 */ mr r3, r31 -/* 80104DA8 48 00 3C 71 */ bl checkHookshotWait__9daAlink_cCFv -/* 80104DAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80104DB0 41 82 00 10 */ beq lbl_80104DC0 -/* 80104DB4 7F E3 FB 78 */ mr r3, r31 -/* 80104DB8 38 80 00 12 */ li r4, 0x12 -/* 80104DBC 4B FA E4 95 */ bl setDoStatus__9daAlink_cFUc -lbl_80104DC0: -/* 80104DC0 7F E3 FB 78 */ mr r3, r31 -/* 80104DC4 38 80 00 00 */ li r4, 0 -/* 80104DC8 4B FA E9 6D */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 80104DCC 38 00 00 00 */ li r0, 0 -/* 80104DD0 98 1F 20 68 */ stb r0, 0x2068(r31) -/* 80104DD4 7F E3 FB 78 */ mr r3, r31 -/* 80104DD8 4B FF E2 81 */ bl checkSwimUpAction__9daAlink_cFv -/* 80104DDC 2C 03 00 00 */ cmpwi r3, 0 -/* 80104DE0 41 82 00 0C */ beq lbl_80104DEC -/* 80104DE4 38 60 00 01 */ li r3, 1 -/* 80104DE8 48 00 00 BC */ b lbl_80104EA4 -lbl_80104DEC: -/* 80104DEC 7F E3 FB 78 */ mr r3, r31 -/* 80104DF0 4B FB 4F 3D */ bl checkNextActionFromButton__9daAlink_cFv -/* 80104DF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80104DF8 41 82 00 0C */ beq lbl_80104E04 -/* 80104DFC 38 60 00 01 */ li r3, 1 -/* 80104E00 48 00 00 A4 */ b lbl_80104EA4 -lbl_80104E04: -/* 80104E04 38 60 00 00 */ li r3, 0 -/* 80104E08 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 80104E0C 28 00 01 8D */ cmplwi r0, 0x18d -/* 80104E10 41 82 00 10 */ beq lbl_80104E20 -/* 80104E14 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 80104E18 28 00 01 8C */ cmplwi r0, 0x18c -/* 80104E1C 40 82 00 08 */ bne lbl_80104E24 -lbl_80104E20: -/* 80104E20 38 60 00 01 */ li r3, 1 -lbl_80104E24: -/* 80104E24 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80104E28 40 82 00 14 */ bne lbl_80104E3C -/* 80104E2C 7F E3 FB 78 */ mr r3, r31 -/* 80104E30 38 80 00 00 */ li r4, 0 -/* 80104E34 4B FF F4 C5 */ bl procSwimWaitInit__9daAlink_cFi -/* 80104E38 48 00 00 6C */ b lbl_80104EA4 -lbl_80104E3C: -/* 80104E3C 7F E3 FB 78 */ mr r3, r31 -/* 80104E40 48 00 47 89 */ bl checkNextActionHookshot__9daAlink_cFv -/* 80104E44 2C 03 00 00 */ cmpwi r3, 0 -/* 80104E48 40 82 00 58 */ bne lbl_80104EA0 -/* 80104E4C 7F E3 FB 78 */ mr r3, r31 -/* 80104E50 48 00 3B C9 */ bl checkHookshotWait__9daAlink_cCFv -/* 80104E54 2C 03 00 00 */ cmpwi r3, 0 -/* 80104E58 41 82 00 34 */ beq lbl_80104E8C -/* 80104E5C 7F E3 FB 78 */ mr r3, r31 -/* 80104E60 4B FC 9A 41 */ bl setBodyAngleToCamera__9daAlink_cFv -/* 80104E64 2C 03 00 00 */ cmpwi r3, 0 -/* 80104E68 41 82 00 0C */ beq lbl_80104E74 -/* 80104E6C 7F E3 FB 78 */ mr r3, r31 -/* 80104E70 48 00 3F 45 */ bl setHookshotSight__9daAlink_cFv -lbl_80104E74: -/* 80104E74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104E78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104E7C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80104E80 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc -/* 80104E84 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104E88 48 00 00 18 */ b lbl_80104EA0 -lbl_80104E8C: -/* 80104E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104E94 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80104E98 64 00 00 04 */ oris r0, r0, 4 -/* 80104E9C 90 03 5F 18 */ stw r0, 0x5f18(r3) -lbl_80104EA0: -/* 80104EA0 38 60 00 01 */ li r3, 1 -lbl_80104EA4: -/* 80104EA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104EA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80104EAC 7C 08 03 A6 */ mtlr r0 -/* 80104EB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80104EB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s deleted file mode 100644 index ca058df6b8..0000000000 --- a/asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80104670: -/* 80104670 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80104674 7C 08 02 A6 */ mflr r0 -/* 80104678 90 01 00 24 */ stw r0, 0x24(r1) -/* 8010467C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80104680 48 25 DB 59 */ bl _savegpr_28 -/* 80104684 7C 7F 1B 78 */ mr r31, r3 -/* 80104688 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 8010468C 54 1E 03 5A */ rlwinm r30, r0, 0, 0xd, 0xd -/* 80104690 A0 83 2F E8 */ lhz r4, 0x2fe8(r3) -/* 80104694 20 04 00 16 */ subfic r0, r4, 0x16 -/* 80104698 7C 00 00 34 */ cntlzw r0, r0 -/* 8010469C 54 1D D9 7E */ srwi r29, r0, 5 -/* 801046A0 20 04 00 7C */ subfic r0, r4, 0x7c -/* 801046A4 7C 00 00 34 */ cntlzw r0, r0 -/* 801046A8 54 1C D9 7E */ srwi r28, r0, 5 -/* 801046AC 38 80 00 7B */ li r4, 0x7b -/* 801046B0 4B FB D8 BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801046B4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 801046B8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 801046BC 41 82 00 10 */ beq lbl_801046CC -/* 801046C0 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 801046C4 54 00 02 4E */ rlwinm r0, r0, 0, 9, 7 -/* 801046C8 90 1F 05 70 */ stw r0, 0x570(r31) -lbl_801046CC: -/* 801046CC 28 1E 00 00 */ cmplwi r30, 0 -/* 801046D0 40 82 00 1C */ bne lbl_801046EC -/* 801046D4 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801046D8 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801046DC C0 03 00 60 */ lfs f0, 0x60(r3) -/* 801046E0 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 801046E4 38 00 00 00 */ li r0, 0 -/* 801046E8 B0 1F 30 10 */ sth r0, 0x3010(r31) -lbl_801046EC: -/* 801046EC 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 801046F0 40 82 00 0C */ bne lbl_801046FC -/* 801046F4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 801046F8 41 82 00 4C */ beq lbl_80104744 -lbl_801046FC: -/* 801046FC 38 00 00 C7 */ li r0, 0xc7 -/* 80104700 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80104704 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80104708 41 82 00 44 */ beq lbl_8010474C -/* 8010470C 38 00 28 00 */ li r0, 0x2800 -/* 80104710 B0 1F 30 80 */ sth r0, 0x3080(r31) -/* 80104714 A8 1F 30 80 */ lha r0, 0x3080(r31) -/* 80104718 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8010471C 38 00 00 01 */ li r0, 1 -/* 80104720 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80104724 7F E3 FB 78 */ mr r3, r31 -/* 80104728 A8 1F 30 80 */ lha r0, 0x3080(r31) -/* 8010472C 7C 00 00 D0 */ neg r0, r0 -/* 80104730 7C 04 07 34 */ extsh r4, r0 -/* 80104734 38 A0 00 00 */ li r5, 0 -/* 80104738 38 C0 00 00 */ li r6, 0 -/* 8010473C 4B FA 94 3D */ bl setOldRootQuaternion__9daAlink_cFsss -/* 80104740 48 00 00 0C */ b lbl_8010474C -lbl_80104744: -/* 80104744 38 00 FF FF */ li r0, -1 -/* 80104748 90 1F 31 98 */ stw r0, 0x3198(r31) -lbl_8010474C: -/* 8010474C 38 00 00 05 */ li r0, 5 -/* 80104750 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 80104754 7F E3 FB 78 */ mr r3, r31 -/* 80104758 4B FF EF 41 */ bl setSwimMoveAnime__9daAlink_cFv -/* 8010475C 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104760 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80104764 41 82 00 14 */ beq lbl_80104778 -/* 80104768 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 8010476C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80104770 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80104774 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_80104778: -/* 80104778 7F E3 FB 78 */ mr r3, r31 -/* 8010477C 4B FF D1 B9 */ bl swimDeleteItem__9daAlink_cFv -/* 80104780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104788 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 8010478C 64 00 00 10 */ oris r0, r0, 0x10 -/* 80104790 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104794 38 00 00 00 */ li r0, 0 -/* 80104798 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8010479C 38 60 00 01 */ li r3, 1 -/* 801047A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801047A4 48 25 DA 81 */ bl _restgpr_28 -/* 801047A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801047AC 7C 08 03 A6 */ mtlr r0 -/* 801047B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801047B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s deleted file mode 100644 index d2bae4399e..0000000000 --- a/asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_801047B8: -/* 801047B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801047BC 7C 08 02 A6 */ mflr r0 -/* 801047C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801047C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801047C8 7C 7F 1B 78 */ mr r31, r3 -/* 801047CC 4B FF DC 19 */ bl setSpeedAndAngleSwim__9daAlink_cFv -/* 801047D0 7F E3 FB 78 */ mr r3, r31 -/* 801047D4 4B FF F7 35 */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 801047D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801047DC 41 82 00 18 */ beq lbl_801047F4 -/* 801047E0 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 801047E4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 801047E8 41 82 00 0C */ beq lbl_801047F4 -/* 801047EC 38 00 00 1E */ li r0, 0x1e -/* 801047F0 B0 1F 30 00 */ sth r0, 0x3000(r31) -lbl_801047F4: -/* 801047F4 7F E3 FB 78 */ mr r3, r31 -/* 801047F8 4B FF EE A1 */ bl setSwimMoveAnime__9daAlink_cFv -/* 801047FC 7F E3 FB 78 */ mr r3, r31 -/* 80104800 4B FF E8 59 */ bl checkSwimUpAction__9daAlink_cFv -/* 80104804 2C 03 00 00 */ cmpwi r3, 0 -/* 80104808 41 82 00 0C */ beq lbl_80104814 -/* 8010480C 38 60 00 01 */ li r3, 1 -/* 80104810 48 00 01 34 */ b lbl_80104944 -lbl_80104814: -/* 80104814 7F E3 FB 78 */ mr r3, r31 -/* 80104818 4B FF E1 B1 */ bl checkNextActionSwim__9daAlink_cFv -/* 8010481C 2C 03 00 00 */ cmpwi r3, 0 -/* 80104820 41 82 00 0C */ beq lbl_8010482C -/* 80104824 38 60 00 01 */ li r3, 1 -/* 80104828 48 00 01 1C */ b lbl_80104944 -lbl_8010482C: -/* 8010482C C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 80104830 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 80104834 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80104838 40 81 00 28 */ ble lbl_80104860 -/* 8010483C 7F E3 FB 78 */ mr r3, r31 -/* 80104840 4B FB 21 F1 */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 80104844 2C 03 00 00 */ cmpwi r3, 0 -/* 80104848 41 82 00 18 */ beq lbl_80104860 -/* 8010484C 7F E3 FB 78 */ mr r3, r31 -/* 80104850 38 80 00 01 */ li r4, 1 -/* 80104854 4B FF EA 75 */ bl swimOutAfter__9daAlink_cFi -/* 80104858 38 60 00 01 */ li r3, 1 -/* 8010485C 48 00 00 E8 */ b lbl_80104944 -lbl_80104860: -/* 80104860 7F E3 FB 78 */ mr r3, r31 -/* 80104864 4B FF F6 7D */ bl checkSwimButtonAccept__9daAlink_cFv -/* 80104868 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010486C 41 82 00 2C */ beq lbl_80104898 -/* 80104870 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 80104874 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80104878 41 82 00 20 */ beq lbl_80104898 -/* 8010487C 7F E3 FB 78 */ mr r3, r31 -/* 80104880 4B FF D1 39 */ bl getZoraSwim__9daAlink_cCFv -/* 80104884 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80104888 40 82 00 10 */ bne lbl_80104898 -/* 8010488C 7F E3 FB 78 */ mr r3, r31 -/* 80104890 48 00 00 C9 */ bl procSwimDiveInit__9daAlink_cFv -/* 80104894 48 00 00 AC */ b lbl_80104940 -lbl_80104898: -/* 80104898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8010489C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801048A0 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 801048A4 28 00 00 09 */ cmplwi r0, 9 -/* 801048A8 40 82 00 48 */ bne lbl_801048F0 -/* 801048AC 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 801048B0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 801048B4 41 82 00 3C */ beq lbl_801048F0 -/* 801048B8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 801048BC 64 00 00 40 */ oris r0, r0, 0x40 -/* 801048C0 90 1F 05 74 */ stw r0, 0x574(r31) -/* 801048C4 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801048C8 38 A3 ED 2C */ addi r5, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801048CC A8 05 00 5C */ lha r0, 0x5c(r5) -/* 801048D0 B0 1F 30 D0 */ sth r0, 0x30d0(r31) -/* 801048D4 7F E3 FB 78 */ mr r3, r31 -/* 801048D8 38 80 00 C6 */ li r4, 0xc6 -/* 801048DC 38 A5 00 3C */ addi r5, r5, 0x3c -/* 801048E0 4B FA 88 15 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 801048E4 38 00 00 C6 */ li r0, 0xc6 -/* 801048E8 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 801048EC 48 00 00 54 */ b lbl_80104940 -lbl_801048F0: -/* 801048F0 7F E3 FB 78 */ mr r3, r31 -/* 801048F4 4B FF F6 A1 */ bl checkZoraSwimMove__9daAlink_cFv -/* 801048F8 2C 03 00 00 */ cmpwi r3, 0 -/* 801048FC 40 82 00 44 */ bne lbl_80104940 -/* 80104900 7F E3 FB 78 */ mr r3, r31 -/* 80104904 4B FF F6 05 */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 80104908 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010490C 41 82 00 10 */ beq lbl_8010491C -/* 80104910 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 80104914 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80104918 40 82 00 28 */ bne lbl_80104940 -lbl_8010491C: -/* 8010491C C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 80104920 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104924 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104928 C0 03 00 C8 */ lfs f0, 0xc8(r3) -/* 8010492C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80104930 40 80 00 10 */ bge lbl_80104940 -/* 80104934 7F E3 FB 78 */ mr r3, r31 -/* 80104938 38 80 00 00 */ li r4, 0 -/* 8010493C 4B FF F9 BD */ bl procSwimWaitInit__9daAlink_cFi -lbl_80104940: -/* 80104940 38 60 00 01 */ li r3, 1 -lbl_80104944: -/* 80104944 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104948 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010494C 7C 08 03 A6 */ mtlr r0 -/* 80104950 38 21 00 10 */ addi r1, r1, 0x10 -/* 80104954 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s deleted file mode 100644 index 363d7d340c..0000000000 --- a/asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_801040F8: -/* 801040F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801040FC 7C 08 02 A6 */ mflr r0 -/* 80104100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80104104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80104108 7C 7F 1B 78 */ mr r31, r3 -/* 8010410C 38 80 00 79 */ li r4, 0x79 -/* 80104110 4B FB DE 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80104114 A8 1F 30 00 */ lha r0, 0x3000(r31) -/* 80104118 2C 00 00 00 */ cmpwi r0, 0 -/* 8010411C 41 82 00 1C */ beq lbl_80104138 -/* 80104120 7F E3 FB 78 */ mr r3, r31 -/* 80104124 4B FB BC 8D */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80104128 2C 03 00 00 */ cmpwi r3, 0 -/* 8010412C 40 82 00 0C */ bne lbl_80104138 -/* 80104130 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80104134 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_80104138: -/* 80104138 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8010413C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80104140 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 80104144 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80104148 38 60 00 00 */ li r3, 0 -/* 8010414C B0 7F 30 80 */ sth r3, 0x3080(r31) -/* 80104150 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104154 60 00 01 00 */ ori r0, r0, 0x100 -/* 80104158 90 1F 05 70 */ stw r0, 0x570(r31) -/* 8010415C 88 1F 2D 73 */ lbz r0, 0x2d73(r31) -/* 80104160 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 80104164 98 1F 2D 73 */ stb r0, 0x2d73(r31) -/* 80104168 7F E3 FB 78 */ mr r3, r31 -/* 8010416C 38 80 00 C2 */ li r4, 0xc2 -/* 80104170 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104174 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104178 4B FA 8F 7D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 8010417C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104180 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104184 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80104188 64 00 00 10 */ oris r0, r0, 0x10 -/* 8010418C 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104190 38 00 00 00 */ li r0, 0 -/* 80104194 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80104198 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8010419C 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801041A0 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801041A4 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 801041A8 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 801041AC B0 1F 30 00 */ sth r0, 0x3000(r31) -/* 801041B0 7F E3 FB 78 */ mr r3, r31 -/* 801041B4 3C 80 00 03 */ lis r4, 0x0003 /* 0x0003001D@ha */ -/* 801041B8 38 84 00 1D */ addi r4, r4, 0x001D /* 0x0003001D@l */ -/* 801041BC 4B FB AF D9 */ bl seStartMapInfo__9daAlink_cFUl -/* 801041C0 7F E3 FB 78 */ mr r3, r31 -/* 801041C4 4B FF D7 71 */ bl swimDeleteItem__9daAlink_cFv -/* 801041C8 38 00 00 0F */ li r0, 0xf -/* 801041CC 98 1F 2F CD */ stb r0, 0x2fcd(r31) -/* 801041D0 38 60 00 01 */ li r3, 1 -/* 801041D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801041D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801041DC 7C 08 03 A6 */ mtlr r0 -/* 801041E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801041E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s deleted file mode 100644 index 8aa54db7c0..0000000000 --- a/asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_801041E8: -/* 801041E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801041EC 7C 08 02 A6 */ mflr r0 -/* 801041F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801041F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801041F8 93 C1 00 08 */ stw r30, 8(r1) -/* 801041FC 7C 7E 1B 78 */ mr r30, r3 -/* 80104200 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80104204 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80104208 3C 80 80 39 */ lis r4, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 8010420C 38 84 ED 2C */ addi r4, r4, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104210 C0 44 00 80 */ lfs f2, 0x80(r4) -/* 80104214 4B FA F7 11 */ bl setNormalSpeedF__9daAlink_cFff -/* 80104218 7F C3 F3 78 */ mr r3, r30 -/* 8010421C 38 80 00 45 */ li r4, 0x45 -/* 80104220 4B FB BF 45 */ bl checkSetItemTrigger__9daAlink_cFi -/* 80104224 2C 03 00 00 */ cmpwi r3, 0 -/* 80104228 41 82 00 10 */ beq lbl_80104238 -/* 8010422C 7F C3 F3 78 */ mr r3, r30 -/* 80104230 38 80 00 01 */ li r4, 1 -/* 80104234 4B FD E3 4D */ bl setHeavyBoots__9daAlink_cFi -lbl_80104238: -/* 80104238 7F C3 F3 78 */ mr r3, r30 -/* 8010423C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80104240 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 80104244 7D 89 03 A6 */ mtctr r12 -/* 80104248 4E 80 04 21 */ bctrl -/* 8010424C 2C 03 00 00 */ cmpwi r3, 0 -/* 80104250 41 82 00 30 */ beq lbl_80104280 -/* 80104254 C0 3E 33 AC */ lfs f1, 0x33ac(r30) -/* 80104258 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 8010425C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80104260 40 81 00 10 */ ble lbl_80104270 -/* 80104264 7F C3 F3 78 */ mr r3, r30 -/* 80104268 48 00 04 09 */ bl procSwimMoveInit__9daAlink_cFv -/* 8010426C 48 00 00 70 */ b lbl_801042DC -lbl_80104270: -/* 80104270 7F C3 F3 78 */ mr r3, r30 -/* 80104274 38 80 00 00 */ li r4, 0 -/* 80104278 48 00 00 81 */ bl procSwimWaitInit__9daAlink_cFi -/* 8010427C 48 00 00 60 */ b lbl_801042DC -lbl_80104280: -/* 80104280 7F E3 FB 78 */ mr r3, r31 -/* 80104284 48 05 A2 49 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80104288 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010428C 41 82 00 14 */ beq lbl_801042A0 -/* 80104290 7F C3 F3 78 */ mr r3, r30 -/* 80104294 38 80 00 00 */ li r4, 0 -/* 80104298 48 00 00 61 */ bl procSwimWaitInit__9daAlink_cFi -/* 8010429C 48 00 00 40 */ b lbl_801042DC -lbl_801042A0: -/* 801042A0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 801042A4 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801042A8 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801042AC C0 03 00 10 */ lfs f0, 0x10(r3) -/* 801042B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801042B4 40 81 00 20 */ ble lbl_801042D4 -/* 801042B8 C0 3E 33 AC */ lfs f1, 0x33ac(r30) -/* 801042BC C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 801042C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801042C4 40 81 00 10 */ ble lbl_801042D4 -/* 801042C8 7F C3 F3 78 */ mr r3, r30 -/* 801042CC 48 00 03 A5 */ bl procSwimMoveInit__9daAlink_cFv -/* 801042D0 48 00 00 0C */ b lbl_801042DC -lbl_801042D4: -/* 801042D4 C0 1E 33 B4 */ lfs f0, 0x33b4(r30) -/* 801042D8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_801042DC: -/* 801042DC 38 60 00 01 */ li r3, 1 -/* 801042E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801042E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801042E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801042EC 7C 08 03 A6 */ mtlr r0 -/* 801042F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801042F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s deleted file mode 100644 index 9c6d0193fe..0000000000 --- a/asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_801042F8: -/* 801042F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801042FC 7C 08 02 A6 */ mflr r0 -/* 80104300 90 01 00 24 */ stw r0, 0x24(r1) -/* 80104304 39 61 00 20 */ addi r11, r1, 0x20 -/* 80104308 48 25 DE D5 */ bl _savegpr_29 -/* 8010430C 7C 7F 1B 78 */ mr r31, r3 -/* 80104310 7C 9D 23 78 */ mr r29, r4 -/* 80104314 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80104318 54 1E 03 5A */ rlwinm r30, r0, 0, 0xd, 0xd -/* 8010431C 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80104320 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 80104324 41 82 00 28 */ beq lbl_8010434C -/* 80104328 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8010432C 54 00 02 4E */ rlwinm r0, r0, 0, 9, 7 -/* 80104330 90 1F 05 70 */ stw r0, 0x570(r31) -/* 80104334 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80104338 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 8010433C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104340 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 80104344 EC 01 00 2A */ fadds f0, f1, f0 -/* 80104348 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -lbl_8010434C: -/* 8010434C 7F E3 FB 78 */ mr r3, r31 -/* 80104350 38 80 00 7A */ li r4, 0x7a -/* 80104354 4B FB DC 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80104358 2C 1D 00 00 */ cmpwi r29, 0 -/* 8010435C 41 82 00 30 */ beq lbl_8010438C -/* 80104360 7F E3 FB 78 */ mr r3, r31 -/* 80104364 3C 80 00 03 */ lis r4, 0x0003 /* 0x0003001C@ha */ -/* 80104368 38 84 00 1C */ addi r4, r4, 0x001C /* 0x0003001C@l */ -/* 8010436C 4B FB AE 29 */ bl seStartMapInfo__9daAlink_cFUl -/* 80104370 38 00 00 00 */ li r0, 0 -/* 80104374 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80104378 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 8010437C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104380 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 80104384 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 80104388 48 00 00 24 */ b lbl_801043AC -lbl_8010438C: -/* 8010438C 28 1E 00 00 */ cmplwi r30, 0 -/* 80104390 40 82 00 1C */ bne lbl_801043AC -/* 80104394 38 00 00 00 */ li r0, 0 -/* 80104398 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8010439C 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801043A0 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801043A4 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 801043A8 D0 1F 34 80 */ stfs f0, 0x3480(r31) -lbl_801043AC: -/* 801043AC 7F E3 FB 78 */ mr r3, r31 -/* 801043B0 4B FF D5 85 */ bl swimDeleteItem__9daAlink_cFv -/* 801043B4 7F E3 FB 78 */ mr r3, r31 -/* 801043B8 38 80 00 14 */ li r4, 0x14 -/* 801043BC 4B FA 81 9D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 801043C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801043C4 40 82 00 24 */ bne lbl_801043E8 -/* 801043C8 7F E3 FB 78 */ mr r3, r31 -/* 801043CC 38 80 00 14 */ li r4, 0x14 -/* 801043D0 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801043D4 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801043D8 C0 25 00 90 */ lfs f1, 0x90(r5) -/* 801043DC C0 45 00 94 */ lfs f2, 0x94(r5) -/* 801043E0 4B FA 8C 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 801043E4 48 00 00 30 */ b lbl_80104414 -lbl_801043E8: -/* 801043E8 C0 3F 1F DC */ lfs f1, 0x1fdc(r31) -/* 801043EC C0 02 93 A0 */ lfs f0, lit_9054(r2) -/* 801043F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801043F4 40 80 00 20 */ bge lbl_80104414 -/* 801043F8 7F E3 FB 78 */ mr r3, r31 -/* 801043FC 38 80 00 14 */ li r4, 0x14 -/* 80104400 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80104404 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104408 C0 25 00 90 */ lfs f1, 0x90(r5) -/* 8010440C C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 80104410 4B FA 8B D1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_80104414: -/* 80104414 38 00 00 00 */ li r0, 0 -/* 80104418 B0 1F 30 D0 */ sth r0, 0x30d0(r31) -/* 8010441C 38 00 00 14 */ li r0, 0x14 -/* 80104420 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80104424 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 80104428 90 1F 32 CC */ stw r0, 0x32cc(r31) -/* 8010442C A8 9F 30 80 */ lha r4, 0x3080(r31) -/* 80104430 7C 80 07 35 */ extsh. r0, r4 -/* 80104434 41 82 00 1C */ beq lbl_80104450 -/* 80104438 7F E3 FB 78 */ mr r3, r31 -/* 8010443C 38 A0 00 00 */ li r5, 0 -/* 80104440 38 C0 00 00 */ li r6, 0 -/* 80104444 4B FA 97 35 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 80104448 38 00 00 00 */ li r0, 0 -/* 8010444C B0 1F 30 80 */ sth r0, 0x3080(r31) -lbl_80104450: -/* 80104450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80104454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80104458 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 8010445C 64 00 00 10 */ oris r0, r0, 0x10 -/* 80104460 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80104464 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104468 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8010446C 41 82 00 14 */ beq lbl_80104480 -/* 80104470 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 80104474 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80104478 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8010447C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_80104480: -/* 80104480 38 00 00 00 */ li r0, 0 -/* 80104484 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80104488 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8010448C 7F E3 FB 78 */ mr r3, r31 -/* 80104490 4B FF D5 89 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv -/* 80104494 D0 3F 05 94 */ stfs f1, 0x594(r31) -/* 80104498 38 60 00 01 */ li r3, 1 -/* 8010449C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801044A0 48 25 DD 89 */ bl _restgpr_29 -/* 801044A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801044A8 7C 08 03 A6 */ mtlr r0 -/* 801044AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801044B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s deleted file mode 100644 index 3f2c57d2c1..0000000000 --- a/asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_801044B4: -/* 801044B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801044B8 7C 08 02 A6 */ mflr r0 -/* 801044BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801044C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801044C4 7C 7F 1B 78 */ mr r31, r3 -/* 801044C8 80 03 06 14 */ lwz r0, 0x614(r3) -/* 801044CC 28 00 00 06 */ cmplwi r0, 6 -/* 801044D0 41 82 00 0C */ beq lbl_801044DC -/* 801044D4 28 00 00 08 */ cmplwi r0, 8 -/* 801044D8 40 82 00 14 */ bne lbl_801044EC -lbl_801044DC: -/* 801044DC 7F E3 FB 78 */ mr r3, r31 -/* 801044E0 48 01 40 8D */ bl setShapeAngleToTalkActor__9daAlink_cFv -/* 801044E4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801044E8 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_801044EC: -/* 801044EC 7F E3 FB 78 */ mr r3, r31 -/* 801044F0 4B FF D5 B9 */ bl getSwimMaxFallSpeed__9daAlink_cCFv -/* 801044F4 D0 3F 05 34 */ stfs f1, 0x534(r31) -/* 801044F8 7F E3 FB 78 */ mr r3, r31 -/* 801044FC 4B FF D5 1D */ bl getSwimFrontMaxSpeed__9daAlink_cCFv -/* 80104500 D0 3F 05 94 */ stfs f1, 0x594(r31) -/* 80104504 7F E3 FB 78 */ mr r3, r31 -/* 80104508 4B FF DE DD */ bl setSpeedAndAngleSwim__9daAlink_cFv -/* 8010450C A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 80104510 80 1F 32 CC */ lwz r0, 0x32cc(r31) -/* 80104514 7C 03 00 40 */ cmplw r3, r0 -/* 80104518 41 82 00 24 */ beq lbl_8010453C -/* 8010451C 90 7F 32 CC */ stw r3, 0x32cc(r31) -/* 80104520 7F E3 FB 78 */ mr r3, r31 -/* 80104524 38 80 00 14 */ li r4, 0x14 -/* 80104528 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 8010452C 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104530 C0 25 00 90 */ lfs f1, 0x90(r5) -/* 80104534 C0 45 00 94 */ lfs f2, 0x94(r5) -/* 80104538 4B FA 8A A9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_8010453C: -/* 8010453C 7F E3 FB 78 */ mr r3, r31 -/* 80104540 4B FF FA F5 */ bl setSwimUpDownOffset__9daAlink_cFv -/* 80104544 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80104548 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8010454C 41 82 00 1C */ beq lbl_80104568 -/* 80104550 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 80104554 28 00 00 FF */ cmplwi r0, 0xff -/* 80104558 41 82 00 10 */ beq lbl_80104568 -/* 8010455C 7F E3 FB 78 */ mr r3, r31 -/* 80104560 38 80 00 04 */ li r4, 4 -/* 80104564 4B FA EC ED */ bl setDoStatus__9daAlink_cFUc -lbl_80104568: -/* 80104568 7F E3 FB 78 */ mr r3, r31 -/* 8010456C 4B FF EA ED */ bl checkSwimUpAction__9daAlink_cFv -/* 80104570 2C 03 00 00 */ cmpwi r3, 0 -/* 80104574 41 82 00 0C */ beq lbl_80104580 -/* 80104578 38 60 00 01 */ li r3, 1 -/* 8010457C 48 00 00 E0 */ b lbl_8010465C -lbl_80104580: -/* 80104580 7F E3 FB 78 */ mr r3, r31 -/* 80104584 4B FF E4 45 */ bl checkNextActionSwim__9daAlink_cFv -/* 80104588 2C 03 00 00 */ cmpwi r3, 0 -/* 8010458C 41 82 00 0C */ beq lbl_80104598 -/* 80104590 38 60 00 01 */ li r3, 1 -/* 80104594 48 00 00 C8 */ b lbl_8010465C -lbl_80104598: -/* 80104598 7F E3 FB 78 */ mr r3, r31 -/* 8010459C 4B FB 24 95 */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 801045A0 2C 03 00 00 */ cmpwi r3, 0 -/* 801045A4 41 82 00 18 */ beq lbl_801045BC -/* 801045A8 7F E3 FB 78 */ mr r3, r31 -/* 801045AC 38 80 00 01 */ li r4, 1 -/* 801045B0 4B FF ED 19 */ bl swimOutAfter__9daAlink_cFi -/* 801045B4 38 60 00 01 */ li r3, 1 -/* 801045B8 48 00 00 A4 */ b lbl_8010465C -lbl_801045BC: -/* 801045BC 7F E3 FB 78 */ mr r3, r31 -/* 801045C0 4B FF F9 21 */ bl checkSwimButtonAccept__9daAlink_cFv -/* 801045C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801045C8 41 82 00 1C */ beq lbl_801045E4 -/* 801045CC 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 801045D0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 801045D4 41 82 00 10 */ beq lbl_801045E4 -/* 801045D8 7F E3 FB 78 */ mr r3, r31 -/* 801045DC 48 00 03 7D */ bl procSwimDiveInit__9daAlink_cFv -/* 801045E0 48 00 00 78 */ b lbl_80104658 -lbl_801045E4: -/* 801045E4 C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 801045E8 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 801045EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801045F0 40 81 00 20 */ ble lbl_80104610 -/* 801045F4 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 801045F8 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801045FC 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80104600 C0 03 00 C8 */ lfs f0, 0xc8(r3) -/* 80104604 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80104608 4C 41 13 82 */ cror 2, 1, 2 -/* 8010460C 41 82 00 20 */ beq lbl_8010462C -lbl_80104610: -/* 80104610 7F E3 FB 78 */ mr r3, r31 -/* 80104614 4B FF F8 F5 */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 80104618 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010461C 41 82 00 3C */ beq lbl_80104658 -/* 80104620 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 80104624 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80104628 41 82 00 30 */ beq lbl_80104658 -lbl_8010462C: -/* 8010462C 7F E3 FB 78 */ mr r3, r31 -/* 80104630 4B FF F8 D9 */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 80104634 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80104638 41 82 00 18 */ beq lbl_80104650 -/* 8010463C 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 80104640 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80104644 41 82 00 0C */ beq lbl_80104650 -/* 80104648 38 00 00 1E */ li r0, 0x1e -/* 8010464C B0 1F 30 00 */ sth r0, 0x3000(r31) -lbl_80104650: -/* 80104650 7F E3 FB 78 */ mr r3, r31 -/* 80104654 48 00 00 1D */ bl procSwimMoveInit__9daAlink_cFv -lbl_80104658: -/* 80104658 38 60 00 01 */ li r3, 1 -lbl_8010465C: -/* 8010465C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80104664 7C 08 03 A6 */ mtlr r0 -/* 80104668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010466C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s b/asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s deleted file mode 100644 index 54e46188ab..0000000000 --- a/asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_801032C8: -/* 801032C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801032CC 7C 08 02 A6 */ mflr r0 -/* 801032D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801032D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801032D8 7C 7F 1B 78 */ mr r31, r3 -/* 801032DC 80 03 05 70 */ lwz r0, 0x570(r3) -/* 801032E0 60 00 01 00 */ ori r0, r0, 0x100 -/* 801032E4 90 03 05 70 */ stw r0, 0x570(r3) -/* 801032E8 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 801032EC 60 00 01 00 */ ori r0, r0, 0x100 -/* 801032F0 90 03 05 8C */ stw r0, 0x58c(r3) -/* 801032F4 38 60 00 00 */ li r3, 0 -/* 801032F8 88 1F 2D 73 */ lbz r0, 0x2d73(r31) -/* 801032FC 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 -/* 80103300 98 1F 2D 73 */ stb r0, 0x2d73(r31) -/* 80103304 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80103308 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 8010330C 41 82 00 14 */ beq lbl_80103320 -/* 80103310 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80103314 54 00 02 4E */ rlwinm r0, r0, 0, 9, 7 -/* 80103318 90 1F 05 70 */ stw r0, 0x570(r31) -/* 8010331C 48 00 00 14 */ b lbl_80103330 -lbl_80103320: -/* 80103320 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80103324 D0 1F 2B 98 */ stfs f0, 0x2b98(r31) -/* 80103328 38 00 00 04 */ li r0, 4 -/* 8010332C 98 1F 2F 98 */ stb r0, 0x2f98(r31) -lbl_80103330: -/* 80103330 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80103334 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 80103338 D0 1F 37 50 */ stfs f0, 0x3750(r31) -/* 8010333C C0 03 00 04 */ lfs f0, 4(r3) -/* 80103340 D0 1F 37 54 */ stfs f0, 0x3754(r31) -/* 80103344 C0 03 00 08 */ lfs f0, 8(r3) -/* 80103348 D0 1F 37 58 */ stfs f0, 0x3758(r31) -/* 8010334C 38 00 00 00 */ li r0, 0 -/* 80103350 B0 1F 30 00 */ sth r0, 0x3000(r31) -/* 80103354 7F E3 FB 78 */ mr r3, r31 -/* 80103358 4B FF E9 3D */ bl offOxygenTimer__9daAlink_cFv -/* 8010335C A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 80103360 28 00 02 3F */ cmplwi r0, 0x23f -/* 80103364 41 82 00 10 */ beq lbl_80103374 -/* 80103368 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8010336C 28 00 00 BF */ cmplwi r0, 0xbf -/* 80103370 40 82 00 14 */ bne lbl_80103384 -lbl_80103374: -/* 80103374 7F E3 FB 78 */ mr r3, r31 -/* 80103378 38 80 00 02 */ li r4, 2 -/* 8010337C C0 22 92 C4 */ lfs f1, lit_6109(r2) -/* 80103380 4B FA A3 A5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -lbl_80103384: -/* 80103384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80103388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010338C 7C 08 03 A6 */ mtlr r0 -/* 80103390 38 21 00 10 */ addi r1, r1, 0x10 -/* 80103394 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/camera_draw__FP20camera_process_class.s b/asm/d/d_camera/camera_draw__FP20camera_process_class.s index 24b970b5d4..79517333af 100644 --- a/asm/d/d_camera/camera_draw__FP20camera_process_class.s +++ b/asm/d/d_camera/camera_draw__FP20camera_process_class.s @@ -65,7 +65,7 @@ lbl_80181F70: /* 8018206C 38 7D 01 40 */ addi r3, r29, 0x140 /* 80182070 38 9D 01 70 */ addi r4, r29, 0x170 /* 80182074 48 1C 45 3D */ bl PSMTXInverse -/* 80182078 80 6D 85 C4 */ lwz r3, data_80450B44(r13) +/* 80182078 80 6D 85 C4 */ lwz r3, __OSReport_disable-0x54(r13) /* 8018207C 38 9D 01 40 */ addi r4, r29, 0x140 /* 80182080 38 BD 00 D8 */ addi r5, r29, 0xd8 /* 80182084 38 DD 00 E4 */ addi r6, r29, 0xe4 diff --git a/asm/d/d_demo/create__7dDemo_cFv.s b/asm/d/d_demo/create__7dDemo_cFv.s index 9940aaf965..1c60d7fbbc 100644 --- a/asm/d/d_demo/create__7dDemo_cFv.s +++ b/asm/d/d_demo/create__7dDemo_cFv.s @@ -56,7 +56,7 @@ lbl_80039738: /* 80039740 48 29 55 0D */ bl __nw__FUl /* 80039744 28 03 00 00 */ cmplwi r3, 0 /* 80039748 41 82 00 3C */ beq lbl_80039784 -/* 8003974C 80 ED 85 F4 */ lwz r7, data_80450B74(r13) +/* 8003974C 80 ED 85 F4 */ lwz r7, __OSReport_disable-0x24(r13) /* 80039750 80 CD 88 80 */ lwz r6, m_system__7dDemo_c(r13) /* 80039754 3C 80 80 3A */ lis r4, __vt__Q27JStudio13TCreateObject@ha /* 0x803A7934@ha */ /* 80039758 38 04 79 34 */ addi r0, r4, __vt__Q27JStudio13TCreateObject@l /* 0x803A7934@l */ diff --git a/asm/d/d_stage/dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi.s b/asm/d/d_stage/dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi.s deleted file mode 100644 index 2aeda448a2..0000000000 --- a/asm/d/d_stage/dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80025738: -/* 80025738 7C 63 22 14 */ add r3, r3, r4 -/* 8002573C 88 63 00 2C */ lbz r3, 0x2c(r3) -/* 80025740 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s b/asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s index 277a7f4b2d..6427388262 100644 --- a/asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s +++ b/asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s @@ -91,7 +91,7 @@ lbl_80229DE8: /* 80229E00 90 05 00 04 */ stw r0, 4(r5) /* 80229E04 A0 04 00 08 */ lhz r0, 8(r4) /* 80229E08 B0 05 00 08 */ sth r0, 8(r5) -/* 80229E0C 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 80229E0C 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 80229E10 38 81 08 18 */ addi r4, r1, 0x818 /* 80229E14 A8 A1 08 10 */ lha r5, 0x810(r1) /* 80229E18 88 DE 00 4C */ lbz r6, 0x4c(r30) diff --git a/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s b/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s index 4e0fe1ca67..f4d754abc7 100644 --- a/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s +++ b/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s @@ -18,14 +18,14 @@ lbl_8022CB10: /* 8022CB50 41 82 00 24 */ beq lbl_8022CB74 /* 8022CB54 4B E0 05 19 */ bl dComIfGp_getReverb__Fi /* 8022CB58 7C 67 1B 78 */ mr r7, r3 -/* 8022CB5C 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 8022CB5C 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 8022CB60 7F A4 EB 78 */ mr r4, r29 /* 8022CB64 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CB68 7F E6 FB 78 */ mr r6, r31 /* 8022CB6C 48 09 FE AD */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CB70 48 00 00 5C */ b lbl_8022CBCC lbl_8022CB74: -/* 8022CB74 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 8022CB74 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 8022CB78 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CB7C 38 E0 00 00 */ li r7, 0 /* 8022CB80 48 09 FE 99 */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc @@ -36,14 +36,14 @@ lbl_8022CB88: /* 8022CB90 41 82 00 24 */ beq lbl_8022CBB4 /* 8022CB94 4B E0 04 D9 */ bl dComIfGp_getReverb__Fi /* 8022CB98 7C 67 1B 78 */ mr r7, r3 -/* 8022CB9C 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 8022CB9C 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 8022CBA0 7F A4 EB 78 */ mr r4, r29 /* 8022CBA4 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CBA8 38 C0 00 00 */ li r6, 0 /* 8022CBAC 48 09 FE 6D */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CBB0 48 00 00 1C */ b lbl_8022CBCC lbl_8022CBB4: -/* 8022CBB4 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 8022CBB4 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 8022CBB8 7F A4 EB 78 */ mr r4, r29 /* 8022CBBC 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CBC0 38 C0 00 00 */ li r6, 0 diff --git a/asm/d/msg/d_msg_object/_execute__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/_execute__12dMsgObject_cFv.s index 6cff7a61c8..32e798bd5d 100644 --- a/asm/d/msg/d_msg_object/_execute__12dMsgObject_cFv.s +++ b/asm/d/msg/d_msg_object/_execute__12dMsgObject_cFv.s @@ -241,7 +241,7 @@ lbl_802338FC: /* 80233914 90 05 00 04 */ stw r0, 4(r5) /* 80233918 A0 04 00 08 */ lhz r0, 8(r4) /* 8023391C B0 05 00 08 */ sth r0, 8(r5) -/* 80233920 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 80233920 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 80233924 A8 81 08 12 */ lha r4, 0x812(r1) /* 80233928 48 09 86 39 */ bl setTextCount__12Z2SpeechMgr2Fs /* 8023392C 80 7F 01 18 */ lwz r3, 0x118(r31) diff --git a/asm/m_Do/m_Do_audio/__dt__10Z2AudioMgrFv.s b/asm/m_Do/m_Do_audio/__dt__10Z2AudioMgrFv.s index f9e3613bd4..4695574458 100644 --- a/asm/m_Do/m_Do_audio/__dt__10Z2AudioMgrFv.s +++ b/asm/m_Do/m_Do_audio/__dt__10Z2AudioMgrFv.s @@ -14,12 +14,12 @@ lbl_800073C8: /* 800073F8 41 82 00 24 */ beq lbl_8000741C /* 800073FC 34 1E 13 70 */ addic. r0, r30, 0x1370 /* 80007400 41 82 00 1C */ beq lbl_8000741C -/* 80007404 80 6D 85 C0 */ lwz r3, data_80450B40(r13) +/* 80007404 80 6D 85 C0 */ lwz r3, __OSReport_disable-0x58(r13) /* 80007408 38 1E 13 70 */ addi r0, r30, 0x1370 /* 8000740C 7C 03 00 40 */ cmplw r3, r0 /* 80007410 40 82 00 0C */ bne lbl_8000741C /* 80007414 38 00 00 00 */ li r0, 0 -/* 80007418 90 0D 85 C0 */ stw r0, data_80450B40(r13) +/* 80007418 90 0D 85 C0 */ stw r0, __OSReport_disable-0x58(r13) lbl_8000741C: /* 8000741C 34 1E 0F 2C */ addic. r0, r30, 0xf2c /* 80007420 41 82 00 98 */ beq lbl_800074B8 @@ -39,11 +39,11 @@ lbl_8000741C: /* 80007458 41 82 00 08 */ beq lbl_80007460 /* 8000745C 38 84 FF FC */ addi r4, r4, -4 lbl_80007460: -/* 80007460 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 80007460 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 80007464 7C 00 20 40 */ cmplw r0, r4 /* 80007468 40 82 00 0C */ bne lbl_80007474 /* 8000746C 38 00 00 00 */ li r0, 0 -/* 80007470 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 80007470 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_80007474: /* 80007474 38 80 00 00 */ li r4, 0 /* 80007478 48 29 BB 11 */ bl __dt__15JAISoundStarterFv @@ -59,12 +59,12 @@ lbl_80007488: lbl_80007498: /* 80007498 34 1E 0F 2C */ addic. r0, r30, 0xf2c /* 8000749C 41 82 00 1C */ beq lbl_800074B8 -/* 800074A0 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 800074A0 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 800074A4 38 1E 0F 2C */ addi r0, r30, 0xf2c /* 800074A8 7C 03 00 40 */ cmplw r3, r0 /* 800074AC 40 82 00 0C */ bne lbl_800074B8 /* 800074B0 38 00 00 00 */ li r0, 0 -/* 800074B4 90 0D 85 F0 */ stw r0, data_80450B70(r13) +/* 800074B4 90 0D 85 F0 */ stw r0, __OSReport_disable-0x28(r13) lbl_800074B8: /* 800074B8 38 7E 0D 4C */ addi r3, r30, 0xd4c /* 800074BC 38 80 FF FF */ li r4, -1 @@ -84,11 +84,11 @@ lbl_800074B8: /* 800074F4 41 82 00 08 */ beq lbl_800074FC /* 800074F8 38 63 FF F4 */ addi r3, r3, -12 lbl_800074FC: -/* 800074FC 80 0D 85 CC */ lwz r0, data_80450B4C(r13) +/* 800074FC 80 0D 85 CC */ lwz r0, __OSReport_disable-0x4C(r13) /* 80007500 7C 00 18 40 */ cmplw r0, r3 /* 80007504 40 82 00 0C */ bne lbl_80007510 /* 80007508 38 00 00 00 */ li r0, 0 -/* 8000750C 90 0D 85 CC */ stw r0, data_80450B4C(r13) +/* 8000750C 90 0D 85 CC */ stw r0, __OSReport_disable-0x4C(r13) lbl_80007510: /* 80007510 38 7E 0D 48 */ addi r3, r30, 0xd48 /* 80007514 38 80 00 00 */ li r4, 0 @@ -100,12 +100,12 @@ lbl_80007510: /* 8000752C 90 1E 0D 44 */ stw r0, 0xd44(r30) /* 80007530 34 1E 0D 44 */ addic. r0, r30, 0xd44 /* 80007534 41 82 00 1C */ beq lbl_80007550 -/* 80007538 80 6D 85 D0 */ lwz r3, data_80450B50(r13) +/* 80007538 80 6D 85 D0 */ lwz r3, __OSReport_disable-0x48(r13) /* 8000753C 38 1E 0D 44 */ addi r0, r30, 0xd44 /* 80007540 7C 03 00 40 */ cmplw r3, r0 /* 80007544 40 82 00 0C */ bne lbl_80007550 /* 80007548 38 00 00 00 */ li r0, 0 -/* 8000754C 90 0D 85 D0 */ stw r0, data_80450B50(r13) +/* 8000754C 90 0D 85 D0 */ stw r0, __OSReport_disable-0x48(r13) lbl_80007550: /* 80007550 38 7E 0D 40 */ addi r3, r30, 0xd40 /* 80007554 38 80 00 00 */ li r4, 0 @@ -125,11 +125,11 @@ lbl_8000755C: lbl_80007588: /* 80007588 28 1D 00 00 */ cmplwi r29, 0 /* 8000758C 41 82 00 18 */ beq lbl_800075A4 -/* 80007590 80 0D 85 E4 */ lwz r0, data_80450B64(r13) +/* 80007590 80 0D 85 E4 */ lwz r0, __OSReport_disable-0x34(r13) /* 80007594 7C 00 E8 40 */ cmplw r0, r29 /* 80007598 40 82 00 0C */ bne lbl_800075A4 /* 8000759C 38 00 00 00 */ li r0, 0 -/* 800075A0 90 0D 85 E4 */ stw r0, data_80450B64(r13) +/* 800075A0 90 0D 85 E4 */ stw r0, __OSReport_disable-0x34(r13) lbl_800075A4: /* 800075A4 37 BE 0C 58 */ addic. r29, r30, 0xc58 /* 800075A8 41 82 00 48 */ beq lbl_800075F0 @@ -146,11 +146,11 @@ lbl_800075C8: /* 800075D0 48 29 A1 A5 */ bl __dt__14JAISeqDataUserFv /* 800075D4 28 1D 00 00 */ cmplwi r29, 0 /* 800075D8 41 82 00 18 */ beq lbl_800075F0 -/* 800075DC 80 0D 85 E8 */ lwz r0, data_80450B68(r13) +/* 800075DC 80 0D 85 E8 */ lwz r0, __OSReport_disable-0x30(r13) /* 800075E0 7C 00 E8 40 */ cmplw r0, r29 /* 800075E4 40 82 00 0C */ bne lbl_800075F0 /* 800075E8 38 00 00 00 */ li r0, 0 -/* 800075EC 90 0D 85 E8 */ stw r0, data_80450B68(r13) +/* 800075EC 90 0D 85 E8 */ stw r0, __OSReport_disable-0x30(r13) lbl_800075F0: /* 800075F0 37 BE 05 34 */ addic. r29, r30, 0x534 /* 800075F4 41 82 00 50 */ beq lbl_80007644 @@ -168,20 +168,20 @@ lbl_800075F0: /* 80007624 48 29 A1 51 */ bl __dt__14JAISeqDataUserFv /* 80007628 28 1D 00 00 */ cmplwi r29, 0 /* 8000762C 41 82 00 18 */ beq lbl_80007644 -/* 80007630 80 0D 85 EC */ lwz r0, data_80450B6C(r13) +/* 80007630 80 0D 85 EC */ lwz r0, __OSReport_disable-0x2C(r13) /* 80007634 7C 00 E8 40 */ cmplw r0, r29 /* 80007638 40 82 00 0C */ bne lbl_80007644 /* 8000763C 38 00 00 00 */ li r0, 0 -/* 80007640 90 0D 85 EC */ stw r0, data_80450B6C(r13) +/* 80007640 90 0D 85 EC */ stw r0, __OSReport_disable-0x2C(r13) lbl_80007644: /* 80007644 34 1E 05 30 */ addic. r0, r30, 0x530 /* 80007648 41 82 00 1C */ beq lbl_80007664 -/* 8000764C 80 6D 85 E0 */ lwz r3, data_80450B60(r13) +/* 8000764C 80 6D 85 E0 */ lwz r3, __OSReport_disable-0x38(r13) /* 80007650 38 1E 05 30 */ addi r0, r30, 0x530 /* 80007654 7C 03 00 40 */ cmplw r3, r0 /* 80007658 40 82 00 0C */ bne lbl_80007664 /* 8000765C 38 00 00 00 */ li r0, 0 -/* 80007660 90 0D 85 E0 */ stw r0, data_80450B60(r13) +/* 80007660 90 0D 85 E0 */ stw r0, __OSReport_disable-0x38(r13) lbl_80007664: /* 80007664 34 1E 05 2C */ addic. r0, r30, 0x52c /* 80007668 41 82 00 44 */ beq lbl_800076AC @@ -194,11 +194,11 @@ lbl_80007664: /* 80007684 41 82 00 08 */ beq lbl_8000768C /* 80007688 38 63 FF FC */ addi r3, r3, -4 lbl_8000768C: -/* 8000768C 80 0D 85 F4 */ lwz r0, data_80450B74(r13) +/* 8000768C 80 0D 85 F4 */ lwz r0, __OSReport_disable-0x24(r13) /* 80007690 7C 00 18 40 */ cmplw r0, r3 /* 80007694 40 82 00 0C */ bne lbl_800076A0 /* 80007698 38 00 00 00 */ li r0, 0 -/* 8000769C 90 0D 85 F4 */ stw r0, data_80450B74(r13) +/* 8000769C 90 0D 85 F4 */ stw r0, __OSReport_disable-0x24(r13) lbl_800076A0: /* 800076A0 38 7E 05 2C */ addi r3, r30, 0x52c /* 800076A4 38 80 00 00 */ li r4, 0 @@ -217,34 +217,34 @@ lbl_800076AC: lbl_800076D4: /* 800076D4 34 1E 04 F4 */ addic. r0, r30, 0x4f4 /* 800076D8 41 82 00 1C */ beq lbl_800076F4 -/* 800076DC 80 6D 85 C8 */ lwz r3, data_80450B48(r13) +/* 800076DC 80 6D 85 C8 */ lwz r3, __OSReport_disable-0x50(r13) /* 800076E0 38 1E 04 F4 */ addi r0, r30, 0x4f4 /* 800076E4 7C 03 00 40 */ cmplw r3, r0 /* 800076E8 40 82 00 0C */ bne lbl_800076F4 /* 800076EC 38 00 00 00 */ li r0, 0 -/* 800076F0 90 0D 85 C8 */ stw r0, data_80450B48(r13) +/* 800076F0 90 0D 85 C8 */ stw r0, __OSReport_disable-0x50(r13) lbl_800076F4: /* 800076F4 34 1E 04 C4 */ addic. r0, r30, 0x4c4 /* 800076F8 41 82 00 24 */ beq lbl_8000771C /* 800076FC 34 1E 04 C4 */ addic. r0, r30, 0x4c4 /* 80007700 41 82 00 1C */ beq lbl_8000771C -/* 80007704 80 6D 85 FC */ lwz r3, data_80450B7C(r13) +/* 80007704 80 6D 85 FC */ lwz r3, __OSReport_disable-0x1C(r13) /* 80007708 38 1E 04 C4 */ addi r0, r30, 0x4c4 /* 8000770C 7C 03 00 40 */ cmplw r3, r0 /* 80007710 40 82 00 0C */ bne lbl_8000771C /* 80007714 38 00 00 00 */ li r0, 0 -/* 80007718 90 0D 85 FC */ stw r0, data_80450B7C(r13) +/* 80007718 90 0D 85 FC */ stw r0, __OSReport_disable-0x1C(r13) lbl_8000771C: /* 8000771C 34 1E 04 A4 */ addic. r0, r30, 0x4a4 /* 80007720 41 82 00 24 */ beq lbl_80007744 /* 80007724 34 1E 04 A4 */ addic. r0, r30, 0x4a4 /* 80007728 41 82 00 1C */ beq lbl_80007744 -/* 8000772C 80 6D 86 00 */ lwz r3, data_80450B80(r13) +/* 8000772C 80 6D 86 00 */ lwz r3, __OSReport_disable-0x18(r13) /* 80007730 38 1E 04 A4 */ addi r0, r30, 0x4a4 /* 80007734 7C 03 00 40 */ cmplw r3, r0 /* 80007738 40 82 00 0C */ bne lbl_80007744 /* 8000773C 38 00 00 00 */ li r0, 0 -/* 80007740 90 0D 86 00 */ stw r0, data_80450B80(r13) +/* 80007740 90 0D 86 00 */ stw r0, __OSReport_disable-0x18(r13) lbl_80007744: /* 80007744 34 1E 03 D0 */ addic. r0, r30, 0x3d0 /* 80007748 41 82 00 58 */ beq lbl_800077A0 @@ -267,12 +267,12 @@ lbl_80007770: lbl_80007780: /* 80007780 34 1E 03 D0 */ addic. r0, r30, 0x3d0 /* 80007784 41 82 00 1C */ beq lbl_800077A0 -/* 80007788 80 6D 86 04 */ lwz r3, data_80450B84(r13) +/* 80007788 80 6D 86 04 */ lwz r3, __OSReport_disable-0x14(r13) /* 8000778C 38 1E 03 D0 */ addi r0, r30, 0x3d0 /* 80007790 7C 03 00 40 */ cmplw r3, r0 /* 80007794 40 82 00 0C */ bne lbl_800077A0 /* 80007798 38 00 00 00 */ li r0, 0 -/* 8000779C 90 0D 86 04 */ stw r0, data_80450B84(r13) +/* 8000779C 90 0D 86 04 */ stw r0, __OSReport_disable-0x14(r13) lbl_800077A0: /* 800077A0 28 1E 00 00 */ cmplwi r30, 0 /* 800077A4 41 82 00 68 */ beq lbl_8000780C @@ -296,11 +296,11 @@ lbl_800077A0: /* 800077EC 48 35 A4 FD */ bl __destroy_arr /* 800077F0 28 1E 00 00 */ cmplwi r30, 0 /* 800077F4 41 82 00 18 */ beq lbl_8000780C -/* 800077F8 80 0D 86 08 */ lwz r0, data_80450B88(r13) +/* 800077F8 80 0D 86 08 */ lwz r0, __OSReport_disable-0x10(r13) /* 800077FC 7C 00 F0 40 */ cmplw r0, r30 /* 80007800 40 82 00 0C */ bne lbl_8000780C /* 80007804 38 00 00 00 */ li r0, 0 -/* 80007808 90 0D 86 08 */ stw r0, data_80450B88(r13) +/* 80007808 90 0D 86 08 */ stw r0, __OSReport_disable-0x10(r13) lbl_8000780C: /* 8000780C 7F E0 07 35 */ extsh. r0, r31 /* 80007810 40 81 00 0C */ ble lbl_8000781C diff --git a/asm/msg/scrn/d_msg_scrn_explain/open_request_proc__17dMsgScrnExplain_cFv.s b/asm/msg/scrn/d_msg_scrn_explain/open_request_proc__17dMsgScrnExplain_cFv.s index 7125825c5d..1c68b6b269 100644 --- a/asm/msg/scrn/d_msg_scrn_explain/open_request_proc__17dMsgScrnExplain_cFv.s +++ b/asm/msg/scrn/d_msg_scrn_explain/open_request_proc__17dMsgScrnExplain_cFv.s @@ -57,7 +57,7 @@ lbl_8023DB9C: /* 8023DBAC 88 1F 00 67 */ lbz r0, 0x67(r31) /* 8023DBB0 28 00 00 00 */ cmplwi r0, 0 /* 8023DBB4 41 82 00 10 */ beq lbl_8023DBC4 -/* 8023DBB8 80 6D 85 F0 */ lwz r3, data_80450B70(r13) +/* 8023DBB8 80 6D 85 F0 */ lwz r3, __OSReport_disable-0x28(r13) /* 8023DBBC 38 80 00 00 */ li r4, 0 /* 8023DBC0 48 08 E3 A1 */ bl setTextCount__12Z2SpeechMgr2Fs lbl_8023DBC4: diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 9034496b2c..22b0aa6bd5 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -595,6 +595,7 @@ public: f32 getRate() const { return mRate; } f32 getFrame() const { return mFrame; } s16 getEnd() const { return mEnd; } + s16 getStart() const { return mStart; } u8 getAttribute() const { return mAttribute; } u8 getState() const { return mState; } void setAttribute(u8 attr) { mAttribute = attr; } diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index 45bf084cd4..627445f912 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -4,8 +4,8 @@ #include "JSystem/JAudio2/JAIAudience.h" #include "JSystem/JAudio2/JAISeqDataMgr.h" #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" -#include "dolphin/types.h" struct JASNonCopyable { /* 0x0 */ int field_0x0; @@ -48,7 +48,9 @@ public: /* 0x68 */ int mMaxActiveSe; }; // Size: 0x6C -class JAISeMgr : public JAISeqDataUser, public JAISoundActivity { +class JAISeMgr : public JAISeqDataUser, + public JAISoundActivity, + public JASGlobalInstance { public: /* 802A0074 */ JAISeMgr(bool); /* 802A0268 */ void setCategoryArrangement(JAISeCategoryArrangement const&); diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h index 413fbf9634..9550331211 100644 --- a/include/JSystem/JAudio2/JAISeqMgr.h +++ b/include/JSystem/JAudio2/JAISeqMgr.h @@ -4,12 +4,12 @@ #include "JSystem/JAudio2/JAIAudience.h" #include "JSystem/JAudio2/JAISeqDataMgr.h" #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" -#include "dolphin/types.h" struct JAISeq; -class JAISeqMgr : public JAISeqDataUser { +class JAISeqMgr : public JAISeqDataUser, public JASGlobalInstance { public: /* 802A1914 */ JAISeqMgr(bool); /* 802A1A08 */ void freeDeadSeq_(); diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index e586164f0d..b45793de42 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -29,18 +29,7 @@ public: } mId; }; -struct JASTrack { - /* 80291444 */ void setChannelMgrCount(u32); - /* 802919F4 */ void assignExtBuffer(u32, JASSoundParams*); - /* 80291C30 */ void openChild(u32); - /* 80292918 */ void writePort(u32, u16); - /* 8029297C */ void readPort(u32); - - inline int getChannelMgrCount() { return channelMgrCount; } - - /* 0x0 */ u8 field_0x0[0x1d0]; - /* 0x1d0 */ int channelMgrCount; -}; +class JASTrack; struct JAISoundStatus_ { /* 802A2220 */ s32 lockWhenPrepared(); diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles.h index d79baaa2dc..4800a94ee9 100644 --- a/include/JSystem/JAudio2/JAISoundHandles.h +++ b/include/JSystem/JAudio2/JAISoundHandles.h @@ -32,7 +32,7 @@ public: class JAISoundHandles { public: JAISoundHandles(JAISoundHandle* pHandle, int param_1) { - *mSoundHandle = pHandle; + mSoundHandle = pHandle; numHandles_ = param_1; }; @@ -40,7 +40,7 @@ public: JAISoundHandle* getFreeHandle(); private: - JAISoundHandle** mSoundHandle; + JAISoundHandle* mSoundHandle; int numHandles_; }; diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/include/JSystem/JAudio2/JAISoundStarter.h index d891a8b416..180efd2307 100644 --- a/include/JSystem/JAudio2/JAISoundStarter.h +++ b/include/JSystem/JAudio2/JAISoundStarter.h @@ -1,10 +1,10 @@ #ifndef JAISOUNDSTARTER_H #define JAISOUNDSTARTER_H -#include "dolphin/types.h" #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" -struct JAISoundStarter { +struct JAISoundStarter : public JASGlobalInstance { /* 802A2F6C */ JAISoundStarter(bool); /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h index b775ccc3ed..8e458dc762 100644 --- a/include/JSystem/JAudio2/JAIStreamMgr.h +++ b/include/JSystem/JAudio2/JAIStreamMgr.h @@ -2,8 +2,8 @@ #define JAISTREAMMGR_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" -#include "dolphin/types.h" class JAIStreamMgr; @@ -15,7 +15,7 @@ struct JAIStream { /* 802A388C */ void JAIStreamMgr_calc_(); }; -class JAIStreamMgr { +class JAIStreamMgr : public JASGlobalInstance { public: /* 802A3B68 */ JAIStreamMgr(bool); /* 802A3C3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); diff --git a/include/JSystem/JAudio2/JASAudioThread.h b/include/JSystem/JAudio2/JASAudioThread.h index e8da1c883b..95a9a9fd02 100644 --- a/include/JSystem/JAudio2/JASAudioThread.h +++ b/include/JSystem/JAudio2/JASAudioThread.h @@ -1,9 +1,9 @@ #ifndef JASAUDIOTHREAD_H #define JASAUDIOTHREAD_H -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" -struct JASAudioThread { +struct JASAudioThread : public JASGlobalInstance { /* 8029CCDC */ JASAudioThread(int, int, u32); /* 8029CD4C */ void create(s32); /* 8029CDC0 */ void stop(); diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 9af40931c4..fc4e7e9516 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -3,21 +3,21 @@ #include "dolphin/types.h" -template +template class JASGlobalInstance { public: - inline T* getInstance() { return sInstance; } + JASGlobalInstance(T* inst) { + sInstance = inst; + } - inline JASGlobalInstance(bool param) { - if (param) { - ASSERT(sInstance == 0); - //if (this!=NULL) { - sInstance = (T*)this; - //We need a better way to compute the location of sInstance - //sInstance = (T*)((char*)this-(char*)&(((T*)NULL)->JASGlobalInstance)); - //} + ~JASGlobalInstance() { + if (this == sInstance) { + sInstance = NULL; } } + + static T* getInstance() { return sInstance; } + static T* sInstance; }; diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index fa9422ac6f..4166ea1502 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -1,8 +1,8 @@ #ifndef JASTRACK_H #define JASTRACK_H +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JAudio2/JASSoundParams.h" -#include "dolphin/types.h" struct JASDsp { struct TChannel { @@ -106,6 +106,15 @@ struct JASTrack { static u8 const sPitchEnvOsc[24]; static u8 sDefaultBankTable[1036]; static u8 sTrackList[16]; + + int getChannelMgrCount() { return channelMgrCount; } + + /* 0x000 */ u8 field_0x0[0x1d0]; + /* 0x1D0 */ int channelMgrCount; +}; + +struct JASDefaultBankTable : public JASGlobalInstance { + /* 802934B4 */ ~JASDefaultBankTable(); }; #endif /* JASTRACK_H */ diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/include/JSystem/JAudio2/JAUSoundTable.h index 6e83496c2e..c30baaa900 100644 --- a/include/JSystem/JAudio2/JAUSoundTable.h +++ b/include/JSystem/JAudio2/JAUSoundTable.h @@ -1,6 +1,17 @@ #ifndef JAUSOUNDTABLE_H #define JAUSOUNDTABLE_H -#include "dolphin/types.h" +#include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" + +struct JAUSoundTable : public JASGlobalInstance { + /* 802A7114 */ void init(void const*); + /* 802A7160 */ void getTypeID(JAISoundID) const; + /* 802A728C */ void getData(JAISoundID) const; +}; + +struct JAUSoundNameTable : public JASGlobalInstance { + /* 802A73D4 */ void init(void const*); +}; #endif /* JAUSOUNDTABLE_H */ diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 3e277a79d9..cf04ec17d6 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -54,16 +54,21 @@ inline T cLib_checkBit(T& value, u8 bit) { template inline T cLib_minMaxLimit(T val, T min, T max) { T ret; + T var_r30; + if (val < min) { ret = min; } else { if (val > max) { - val = max; + var_r30 = max; + } else { + var_r30 = val; } - ret = val; + + ret = var_r30; } - return ret; + return (T)ret; } template diff --git a/include/Z2AudioLib/Z2Audience.h b/include/Z2AudioLib/Z2Audience.h index a3af8c114d..6e8890f8c3 100644 --- a/include/Z2AudioLib/Z2Audience.h +++ b/include/Z2AudioLib/Z2Audience.h @@ -2,9 +2,9 @@ #define Z2AUDIENCE_H #include "JSystem/JAudio2/JAIAudience.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JGeometry.h" #include "dolphin/mtx/mtxvec.h" -#include "dolphin/types.h" struct Z2Audible; @@ -40,6 +40,8 @@ struct Z2SpotMic { /* 802BCFE4 */ void calcMicPriority(f32); /* 802BD03C */ void calcMicVolume(f32, int, f32); + void setPosPtr(Vec* i_posPtr) { mPosPtr = i_posPtr; } + /* 0x00 */ f32 field_0x0; /* 0x04 */ f32 field_0x4; /* 0x08 */ f32 field_0x8; @@ -101,7 +103,7 @@ struct Z2AudibleChannel { /* 802BBE74 */ Z2AudibleChannel(); }; -struct Z2Audience : public JAIAudience { +struct Z2Audience : public JAIAudience, public JASGlobalInstance { /* 802BD130 */ Z2Audience(); /* 802BD2DC */ void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int, bool); /* 802BD704 */ void calcOffMicSound(f32); @@ -126,6 +128,8 @@ struct Z2Audience : public JAIAudience { /* 802BD5B8 */ virtual u32 calcPriority(JAIAudible*); /* 802BD71C */ virtual void mixChannelOut(JASSoundParams const&, JAIAudible*, int); + Z2SpotMic* getLinkMic() { return mLinkMic; } + /* 0x004 */ f32 field_0x4; /* 0x008 */ u8 field_0x8; /* 0x00C */ Z2Audience3DSetting mSetting; @@ -137,4 +141,8 @@ struct Z2Audience : public JAIAudience { /* 0x1DC */ bool mUsingOffMicVol; }; // Size: 0x1E0 +inline Z2Audience* Z2GetAudience() { + return JASGlobalInstance::getInstance(); +} + #endif /* Z2AUDIENCE_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 39bde53427..5d4e90279d 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -3,7 +3,6 @@ #include "SSystem/SComponent/c_xyz.h" #include "Z2AudioLib/Z2SoundObject.h" -#include "dolphin/types.h" class Z2Creature { public: @@ -27,8 +26,9 @@ public: virtual void startCreatureExtraSoundLevel(JAISoundID, u32, s8); virtual void startCollisionSE(u32, u32); -private: - /* 0x04 */ int field_0x04; + Vec* getCurrentPos() const { return mpPos; } + + /* 0x04 */ Vec* mpPos; /* 0x08 */ Z2SoundObjAnime mSoundObjAnime; /* 0x50 */ Z2SoundObjSimple mSoundObjSimple1; /* 0x70 */ Z2SoundObjSimple mSoundObjSimple2; @@ -37,12 +37,12 @@ private: struct Z2LinkSoundStarter : public Z2SoundStarter { Z2LinkSoundStarter(); - virtual ~Z2LinkSoundStarter(); + inline virtual ~Z2LinkSoundStarter(); virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, f32, f32, f32, f32, f32, u32); }; -class Z2CreatureLink : public Z2Creature { +class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter { public: Z2CreatureLink(); ~Z2CreatureLink(); @@ -72,14 +72,13 @@ public: int startHitItemSE(u32, u32, Z2SoundObjBase*, float); void setResumeAttack(bool); - void setInWater(bool status) { - mFlags = (u8)((mFlags & ~0x40) | ((status << 6) & 0x40)); // what is going on here - } + void setInWater(bool status) { mInWater = status; } + bool isInWater() { return mInWater; } static Z2CreatureLink* mLinkPtr; private: - /* 0x90 */ Z2LinkSoundStarter mLinkSoundStarter; + /* 0x90 Z2LinkSoundStarter */ /* 0x94 */ Z2SoundObjSimple mKantera; /* 0xB4 */ cXyz field_0xb4; /* 0xC0 */ u8 mLinkState; @@ -93,8 +92,22 @@ private: /* 0xC8 */ u8 mMoveSpeed; /* 0xC9 */ u8 mMovingTime; /* 0xCA */ s8 mSinkDepth; - /* 0xCB */ u8 mFlags; - /* 0xCC */ u8 mFlags2; + /* 0xCB */ bool mWolfEyeOpen : 1; + /* 0xCB */ bool mInWater : 1; + /* 0xCB */ bool mResumeAttack : 1; + /* 0xCB */ bool mFlag3 : 1; + /* 0xCB */ bool mFlag4 : 1; + /* 0xCB */ bool mFlag5 : 1; + /* 0xCB */ bool mRiding : 1; + /* 0xCB */ bool mMagnetized : 1; + /* 0xCC */ bool mFlag8 : 1; + /* 0xCC */ bool mUsingIronBall : 1; + /* 0xCC */ bool mFlag10 : 1; + /* 0xCC */ bool mFlag11 : 1; + /* 0xCC */ bool mFlag12 : 1; + /* 0xCC */ bool mFlag13 : 1; + /* 0xCC */ bool mFlag14 : 1; + /* 0xCC */ bool mFlag15 : 1; }; // Size: 0xD0 inline Z2CreatureLink* Z2GetLink() { @@ -105,7 +118,7 @@ class Z2CreatureRide; struct Z2RideSoundStarter : public Z2SoundStarter { /* 802C5234 */ Z2RideSoundStarter(Z2CreatureRide*); - /* 802C5078 */ virtual ~Z2RideSoundStarter(); + /* 802C5078 */ inline virtual ~Z2RideSoundStarter(); /* 802C5284 */ virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, f32, f32, f32, f32, f32, u32); @@ -113,7 +126,7 @@ struct Z2RideSoundStarter : public Z2SoundStarter { /* 0x4 */ Z2CreatureRide* mRide; }; -class Z2CreatureRide : public Z2Creature { +class Z2CreatureRide : public Z2Creature, public Z2RideSoundStarter { public: Z2CreatureRide(); ~Z2CreatureRide(); @@ -123,7 +136,7 @@ public: virtual void deleteObject(); private: - /* 0x90 */ Z2RideSoundStarter mSoundStarter; + /* 0x90 */ // Z2RideSoundStarter mSoundStarter; /* 0x98 */ bool mLinkRiding; }; // Size: 0x9C diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h index f2862b8c69..8f8aede46b 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr.h +++ b/include/Z2AudioLib/Z2EnvSeMgr.h @@ -1,10 +1,10 @@ #ifndef Z2ENVSEMGR_H #define Z2ENVSEMGR_H +#include "JSystem/JAudio2/JASGadget.h" #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr.h" #include "dolphin/mtx/mtxvec.h" -#include "dolphin/types.h" struct Z2EnvSeBase { /* 802C589C */ Z2EnvSeBase(Vec*); @@ -43,7 +43,7 @@ struct Z2EnvSeDir : public Z2EnvSeBase { /* 0x10 */ Vec mPanDir; }; // Size: 0x1C -struct Z2EnvSeMgr { +struct Z2EnvSeMgr : public JASGlobalInstance { /* 802C611C */ Z2EnvSeMgr(); /* 802C6540 */ ~Z2EnvSeMgr(); /* 802C66B0 */ void framework(); diff --git a/include/Z2AudioLib/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr.h index 7a25054dce..9655f64517 100644 --- a/include/Z2AudioLib/Z2FxLineMgr.h +++ b/include/Z2AudioLib/Z2FxLineMgr.h @@ -3,13 +3,13 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" struct Z2FxLineEditNode {}; struct Z2FxLineConfig {}; -struct Z2FxLineMgr { +struct Z2FxLineMgr : public JASGlobalInstance { /* 802BA7DC */ Z2FxLineMgr(); /* 802BA7FC */ void initDataArc(JKRArchive*, JKRHeap*); /* 802BAC28 */ void setLineID(s8, bool, bool); @@ -26,4 +26,8 @@ struct Z2FxLineMgr { /* 0x18 */ Z2FxLineEditNode* mHIOEdit; }; // Size: 0x1C +inline Z2FxLineMgr* Z2GetFxLineMgr() { + return JASGlobalInstance::getInstance(); +} + #endif /* Z2FXLINEMGR_H */ diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index 4f09b34d1e..4cb65bf48a 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -2,9 +2,9 @@ #define Z2SCENEMGR_H #include "JSystem/JAudio2/JAISound.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" -class Z2SceneMgr { +class Z2SceneMgr : public JASGlobalInstance { public: Z2SceneMgr(); void setInDarkness(bool); @@ -55,4 +55,8 @@ private: /* 0x1E */ bool inDarkness; }; // Size = 0x20 +inline Z2SceneMgr* Z2GetSceneMgr() { + return JASGlobalInstance::getInstance(); +} + #endif /* Z2SCENEMGR_H */ diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h index 82508e1f97..d3a63a3562 100644 --- a/include/Z2AudioLib/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr.h @@ -2,8 +2,8 @@ #define Z2SEMGR_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" #include "dolphin/mtx/vec.h" -#include "dolphin/types.h" struct Z2MultiSeMgr { Z2MultiSeMgr(); @@ -30,7 +30,7 @@ struct Z2MultiSeObj : Z2MultiSeMgr { /* 0x20 */ u8 field_0x20; }; // Size = 0x24 -class Z2SeMgr { +class Z2SeMgr : public JASGlobalInstance { public: /* 802AB64C */ Z2SeMgr(); /* 802AB750 */ void initSe(); @@ -78,6 +78,10 @@ private: /* 0x3CC */ u8 mCrowdSize; }; // Size = 0x3D0 +inline Z2SeMgr* Z2GetSeMgr() { + return JASGlobalInstance::getInstance(); +} + // JAISoundID's for sound effects enum Z2SoundID { Z2SE_SY_DUMMY = 0x0, diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index 3dedde1115..767ea82bd6 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -2,7 +2,7 @@ #define Z2SEQMGR_H #include "JSystem/JAudio2/JAISound.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" // move TTransition / Z2SoundFader ? struct TTransition { @@ -21,7 +21,7 @@ struct Z2SoundFader { /* 0x4 */ JAISoundParamsTransition::TTransition mTransition; }; // Size = 0x10 -class Z2SeqMgr { +class Z2SeqMgr : public JASGlobalInstance { public: Z2SeqMgr(); @@ -77,6 +77,8 @@ public: /* 802B9AD0 */ void setTwilightGateVol(f32); /* 802B9AFC */ void setWindStoneVol(f32, u32); + void onEnemyDamage() { setBattleSeqState(2); } + void i_setTwilightGateVol(f32 vol) { mTwilightGateVol = vol; } void i_setWindStoneVol(f32 vol, u32 count) { mWindStone.move(vol, count); } @@ -122,6 +124,10 @@ private: /* 0xD0 */ u8 mFlags; }; // Size = 0xD4 +inline Z2SeqMgr* Z2GetSeqMgr() { + return JASGlobalInstance::getInstance(); +} + enum Z2BgmID { Z2BGM_FIELD_LINK_DAY = 0x1000000, Z2BGM_FIELD_LINK_NIGHT = 0x1000001, diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h index e474a32727..70226e48d3 100644 --- a/include/Z2AudioLib/Z2SoundInfo.h +++ b/include/Z2AudioLib/Z2SoundInfo.h @@ -1,19 +1,18 @@ #ifndef Z2SOUNDINFO_H #define Z2SOUNDINFO_H -#include "dolphin/types.h" +#include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASGadget.h" -struct JAISeq {}; +struct JAISeq; -struct JAISound {}; +struct JAISound; -struct JAIStream {}; +struct JAIStream; -struct JAISe {}; +struct JAISe; -struct JAISoundID {}; - -struct JAISoundInfo { +struct JAISoundInfo : public JASGlobalInstance { virtual void getSoundType(JAISoundID) const = 0; virtual void getCategory(JAISoundID) const = 0; virtual void getPriority(JAISoundID) const = 0; @@ -23,7 +22,7 @@ struct JAISoundInfo { virtual ~JAISoundInfo(); }; -struct JAUSoundInfo { +struct JAUSoundInfo : public JASGlobalInstance { virtual void getAudibleSw(JAISoundID) const = 0; virtual void getBgmSeqResourceID(JAISoundID) const = 0; }; @@ -33,7 +32,7 @@ struct JAIStreamDataMgr { virtual ~JAIStreamDataMgr(); }; -struct Z2SoundInfo /* : public JAISoundInfo, public JAUSoundInfo, public JAIStreamDataMgr */ { +struct Z2SoundInfo /* : public JAISoundInfo, public JAUSoundInfo, public JAIStreamDataMgr */ : public JASGlobalInstance { /* 802BB00C */ void getBgmSeqResourceID(JAISoundID) const; /* 802BB158 */ void getAudibleSwFull(JAISoundID); /* 802BB448 */ void getAudibleSw(JAISoundID) const; diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index 8070294ba8..1aadd884f0 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -5,9 +5,9 @@ #include "JSystem/JAudio2/JAISeqMgr.h" #include "JSystem/JAudio2/JAISound.h" #include "JSystem/JAudio2/JAIStreamMgr.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" -class Z2SoundMgr { +class Z2SoundMgr : public JASGlobalInstance { public: /* 802A9E80 */ Z2SoundMgr(); /* 802AA1B0 */ void calc(); @@ -39,10 +39,8 @@ private: STATIC_ASSERT(sizeof(Z2SoundMgr) == 0x810); -extern Z2SoundMgr* data_80450B60; - inline Z2SoundMgr* Z2GetSoundMgr() { - return data_80450B60; + return JASGlobalInstance::getInstance(); } #endif /* Z2SOUNDMGR_H */ diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index 38bf2e9198..8dcf45feee 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -1,11 +1,11 @@ #ifndef Z2SOUNDOBJMGR_H #define Z2SOUNDOBJMGR_H +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" #include "Z2AudioLib/Z2Creature.h" -#include "dolphin/types.h" -class Z2SoundObjMgr : protected JSUList { +class Z2SoundObjMgr : protected JSUList, public JASGlobalInstance { public: Z2SoundObjMgr(); void setForceBattleArea(bool, u16, u16, u16); @@ -36,4 +36,8 @@ private: /* 0x1C */ bool mForceBattle; }; // Size = 0x20 +inline Z2SoundObjMgr* Z2GetSoundObjMgr() { + return JASGlobalInstance::getInstance(); +} + #endif /* Z2SOUNDOBJMGR_H */ diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index f5be57d208..c6bc6a1d90 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -17,6 +17,7 @@ public: void startCollisionSE(u32, u32, Z2SoundObjBase*); bool isAlive() const { return mIsInitialized; } + void setSoundStarter(Z2SoundStarter* i_soundStarter) { mSoundStarter = i_soundStarter; } virtual void framework(u32, s8); virtual void dispose(); diff --git a/include/Z2AudioLib/Z2SoundStarter.h b/include/Z2AudioLib/Z2SoundStarter.h index 0849a4e38e..c40c5d9525 100644 --- a/include/Z2AudioLib/Z2SoundStarter.h +++ b/include/Z2AudioLib/Z2SoundStarter.h @@ -3,9 +3,9 @@ #include "JSystem/JAudio2/JAISound.h" #include "JSystem/JAudio2/JAISoundStarter.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" -struct Z2SoundStarter : public JAISoundStarter { +struct Z2SoundStarter : public JAISoundStarter, public JASGlobalInstance { Z2SoundStarter(bool); void setPortData(JAISoundHandle*, u32, u16, s8); void getPortData(JAISoundHandle*, u32, s8); diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h index 47aeef90a6..89480ee049 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2.h @@ -2,10 +2,10 @@ #define Z2SPEECHMGR2_H #include "JSystem/JAudio2/JAISoundHandles.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JMath/random.h" #include "Z2AudioLib/Z2SoundStarter.h" #include "dolphin/mtx/vec.h" -#include "dolphin/types.h" struct Z2SpeechStarter : public Z2SoundStarter { /* 802CCFB8 */ Z2SpeechStarter(); @@ -16,7 +16,7 @@ struct Z2SpeechStarter : public Z2SoundStarter { f32, u32); }; -struct Z2SpeechMgr2 { +struct Z2SpeechMgr2 : public JASGlobalInstance { /* 802CBC60 */ Z2SpeechMgr2(); /* 802CBD88 */ void setString(u16 const*, s16, u8, u16); /* 802CBF60 */ void setTextCount(s16); diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index dc3996336d..d23b25485b 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -2,9 +2,9 @@ #define Z2STATUSMGR_H #include "dolphin/mtx/vec.h" -#include "dolphin/types.h" +#include "JSystem/JAudio2/JASGadget.h" -struct Z2StatusMgr { +struct Z2StatusMgr : public JASGlobalInstance { Z2StatusMgr(); void heartGaugeOn(); void processHeartGaugeSound(); @@ -34,11 +34,15 @@ struct Z2StatusMgr { /* 0x0C */ bool mIsMenuIn; /* 0x10 */ u32 mCameraMapInfo; /* 0x14 */ u32 field_0x14; - /* 0x18 */ float mUnderwaterDepth; - /* 0x1C */ float mCameraInWaterDepthRatio; + /* 0x18 */ f32 mUnderwaterDepth; + /* 0x1C */ f32 mCameraInWaterDepthRatio; /* 0x20 */ Vec mPolygonPosition; /* 0x2C */ u8 mDemoStatus; /* 0x2D */ u8 mHeartGaugeOn; }; // Size = 0x30 +inline Z2StatusMgr* Z2GetStatusMgr() { + return JASGlobalInstance::getInstance(); +} + #endif /* Z2STATUSMGR_H */ diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h index 224aa60485..8696774a5b 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr.h +++ b/include/Z2AudioLib/Z2WolfHowlMgr.h @@ -1,9 +1,9 @@ #ifndef Z2WOLFHOWLMGR_H #define Z2WOLFHOWLMGR_H -#include "dolphin/types.h" -#include "Z2AudioLib/Z2SoundObject.h" #include "JSystem/JAudio2/JASGadget.h" +#include "Z2AudioLib/Z2SoundObject.h" +#include "dolphin/types.h" /* * Z2WolfHowlData @@ -37,7 +37,6 @@ public: void startGuideMelody(bool); void skipCorrectDemo(); - private: /* 0x00 */ JAISoundHandle field_0x00; /* 0x04 */ JAISoundHandle field_0x04; diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 35fcbd999b..1ca2dabef2 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1742,7 +1742,7 @@ public: /* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int); /* 800D7478 */ void setDamagePointNormal(int); /* 800D74A4 */ void setLandDamagePoint(int); - /* 800D74F4 */ void getDamageVec(dCcD_GObjInf*); + /* 800D74F4 */ Vec* getDamageVec(dCcD_GObjInf*); /* 800D76C4 */ void setDashDamage(); /* 800D7768 */ static bool checkIcePolygonDamage(cBgS_PolyInfo*); /* 800D77C8 */ BOOL checkMagicArmorNoDamage(); @@ -3292,6 +3292,10 @@ public: return getDirectionFromAngle(field_0x2fe2 - current.angle.y); } + bool checkAnmEnd(daPy_frameCtrl_c* i_frameCtrl) { + return i_frameCtrl->checkAnmEnd(); + } + static int getBallModelIdx() { return 0x25; } static int getBallBtkIdx() { return 0x49; } static int getBallBrkIdx() { return 0x41; } @@ -3620,7 +3624,7 @@ private: /* 0x03006 */ s16 field_0x3006; /* 0x03008 */ s16 field_0x3008; /* 0x0300A */ s16 field_0x300a; - /* 0x0300C */ s16 mCommonCounter; // might need more accurate name + /* 0x0300C */ s16 field_0x300c; // might need more accurate name /* 0x0300E */ s16 field_0x300e; /* 0x03010 */ s16 field_0x3010; /* 0x03012 */ s16 field_0x3012; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index cd63c014d0..34e238107a 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -195,9 +195,7 @@ public: /* 0x0590 */ u32 mEndResetFlg2; /* 0x0594 */ f32 field_0x594; /* 0x0598 */ f32 field_0x598; - /* 0x059C */ s16 mBodyAngleX; - /* 0x059E */ s16 mBodyAngleY; - /* 0x05A0 */ u8 field_0x5a0[0x4]; + /* 0x059C */ csXyz mBodyAngle; /* 0x05A4 */ cXyz mHeadTopPos; /* 0x05B0 */ cXyz mItemPos; /* 0x05BC */ cXyz mSwordTopPos; @@ -238,6 +236,7 @@ public: enum daPy_FLG1 { FLG1_UNK_40000000 = 0x40000000, + FLG1_UNK_20000000 = 0x20000000, FLG1_UNK_10000000 = 0x10000000, FLG1_UNK_4000000 = 0x4000000, FLG1_IS_WOLF = 0x2000000, @@ -711,8 +710,8 @@ public: } } - s16 getBodyAngleX() const { return mBodyAngleX; } - s16 getBodyAngleY() const { return mBodyAngleY; } + s16 getBodyAngleX() const { return mBodyAngle.x; } + s16 getBodyAngleY() const { return mBodyAngle.y; } // some functions use these function as an inline // is there a better way to handle this? diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 62838f3e70..56093e0d47 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -62,7 +62,7 @@ struct stage_stag_info_class { /* 0x24 */ f32 field_0x24; /* 0x28 */ u8 mMsgGroup; /* 0x2A */ u16 mStageTitleNo; - /* 0x2C */ u8 mParticleNo; + /* 0x2C */ u8 mParticleNo[16]; }; struct stage_scls_info_class { diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 09b5e43511..075bc5f2b3 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -96,6 +96,12 @@ void OSVReport(char* format, va_list list); void OSVAttention(char* fmt, va_list args); void OSReportInit(void); +extern u8 __OSReport_disable; +extern u8 __OSReport_Error_disable; +extern u8 __OSReport_Warning_disable; +extern u8 __OSReport_System_disable; +extern u8 __OSReport_enable; + void OSReportInit__Fv(void); // needed for inline asm u8* OSGetStackPointer(void); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 920ec6292a..c974e91a99 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -19,6 +19,7 @@ void fopKyM_Delete(void* param_1); static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyM_CreateFunc); +int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); inline void* fopKyM_GetAppend(void* param_0) { return fpcM_GetAppend(param_0); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 898f834489..b5d1196a03 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -1,10 +1,13 @@ #ifndef M_DO_M_DO_AUDIO_H #define M_DO_M_DO_AUDIO_H -#include "dolphin/types.h" #include "JSystem/JAudio2/JASGadget.h" +#include "JSystem/JAudio2/JASTrack.h" +#include "JSystem/JAudio2/JAUSoundTable.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "Z2AudioLib/Z2EnvSeMgr.h" +#include "Z2AudioLib/Z2SoundInfo.h" +#include "Z2AudioLib/Z2WolfHowlMgr.h" class mDoAud_zelAudio_c { public: @@ -80,8 +83,8 @@ inline void mDoAud_setInDarkness(bool state) { } inline void mDoAud_seStart(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) { - Z2AudioMgr::getInterface()->mSeMgr.seStart(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, - -1.0f, 0); + Z2AudioMgr::getInterface()->mSeMgr.seStart(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, + -1.0f, -1.0f, 0); } inline void i_mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) { diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index 3f287397fd..83cd8645a0 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -66,10 +66,4 @@ struct mDoMain { static s8 developmentMode; }; -extern bool __OSReport_disable; -extern bool __OSReport_Error_disable; -extern bool __OSReport_Warning_disable; -extern bool __OSReport_System_disable; -extern bool __OSReport_enable; - #endif /* M_DO_M_DO_MAIN_H */ diff --git a/libs/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/JAudio2/JAISeMgr.cpp index 41f11d15e4..a091b191aa 100644 --- a/libs/JSystem/JAudio2/JAISeMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeMgr.cpp @@ -99,8 +99,8 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__5JAISe[22]; extern "C" extern void* __vt__14JAISeqDataUser[5 + 1 /* padding */]; extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B6C[4]; extern "C" extern u8 data_80451310[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/JAudio2/JAISeqMgr.cpp index 36251cbcc3..c7cc74bebc 100644 --- a/libs/JSystem/JAudio2/JAISeqMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeqMgr.cpp @@ -83,8 +83,8 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__6JAISeq[12 + 1 /* padding */]; extern "C" extern void* __vt__14JAISeqDataUser[5 + 1 /* padding */]; extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B68[4]; extern "C" extern u8 data_80451320[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp index 9f9e3162d1..30fe31e204 100644 --- a/libs/JSystem/JAudio2/JAISound.cpp +++ b/libs/JSystem/JAudio2/JAISound.cpp @@ -4,9 +4,10 @@ // #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JASReport.h" +#include "JSystem/JAudio2/JASTrack.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "JSystem/JAudio2/JASReport.h" // // Forward References: @@ -80,7 +81,7 @@ void JAISound::attachHandle(JAISoundHandle* handle) { /* 802A2220-802A2244 29CB60 0024+00 0/0 2/2 0/0 .text lockWhenPrepared__15JAISoundStatus_Fv */ s32 JAISoundStatus_::lockWhenPrepared() { - if (state.unk == 0) { + if (state.unk == 0) { state.unk = 1; return 1; } @@ -194,7 +195,7 @@ asm void JAISound::start_JAISound_(JAISoundID param_0, JGeometry::TVec3 con /* 802A244C-802A2474 29CD8C 0028+00 0/0 2/2 0/0 .text acceptsNewAudible__8JAISoundCFv */ bool JAISound::acceptsNewAudible() const { bool accepts = false; - if (audible_ == NULL && status_.state.flags.flag2==0) { + if (audible_ == NULL && status_.state.flags.flag2 == 0) { accepts = true; } return accepts; @@ -219,10 +220,10 @@ SECTION_SDATA2 static f64 lit_766 = 4503599627370496.0 /* cast u32 to float */; #ifdef NONMATCHING void JAISound::stop(u32 fadeCount) { ASSERT(status_.isAlive()); - if (fadeCount==0) { + if (fadeCount == 0) { stop(); return; - }else{ + } else { fader.fadeOut(fadeCount); removeLifeTime_(); status_.field_0x1.flags.flag2 = 0; @@ -265,7 +266,7 @@ bool JAISound::asStream() { /* 802A25F0-802A266C 29CF30 007C+00 0/0 3/3 0/0 .text die_JAISound___8JAISoundFv */ #ifdef NONMATCHING void JAISound::die_JAISound_() { - if (audible_!=NULL){ + if (audible_ != NULL) { audience_->deleteAudible(audible_); audible_ = NULL; audience_ = NULL; @@ -288,8 +289,9 @@ asm void JAISound::die_JAISound_() { /* 802A266C-802A26B8 29CFAC 004C+00 0/0 3/3 0/0 .text increasePrepareCount_JAISound___8JAISoundFv */ void JAISound::increasePrepareCount_JAISound_() { - if((++prepareCount&0xFF) == 0) { - JASReport("It cost %d steps to prepare Sound(ID:%08x, Address%08x).\n",prepareCount,(u32)soundID,this); + if ((++prepareCount & 0xFF) == 0) { + JASReport("It cost %d steps to prepare Sound(ID:%08x, Address%08x).\n", prepareCount, + (u32)soundID, this); } } @@ -305,39 +307,39 @@ SECTION_SDATA2 static f32 lit_887[1 + 1 /* padding */] = { #ifdef NONMATCHING bool JAISound::calc_JAISound_() { status_.state.flags.flag2 = 1; - if(isStopping()&&JAISound_tryDie_()) { + if (isStopping() && JAISound_tryDie_()) { return false; } ASSERT(status_.isAlive()); bool isPlaying = status_.isPlaying(); - if(isPlaying) { + if (isPlaying) { mCount++; } bool isPaused = status_.isPaused(); - if(isPaused==false) { + if (isPaused == false) { fader.calc(); } - bool playing = isPlaying&&isPaused == false; + bool playing = isPlaying && isPaused == false; if (playing) { params.mMove.calc(); - if (audible_!=NULL) { + if (audible_ != NULL) { audible_->calc(); } - if(status_.field_0x1.flags.flag2!=0) { - if(lifeTime==0) { + if (status_.field_0x1.flags.flag2 != 0) { + if (lifeTime == 0) { stop_JAISound_(); - }else{ + } else { lifeTime--; } } } - if(audience_!=NULL&&audible_!=NULL) { + if (audience_ != NULL && audible_ != NULL) { u32 priority = audience_->calcPriority(audible_); mPriority = priority; - if (priority==0xFFFFFFFF&&status_.field_0x1.flags.flag1==0) { + if (priority == 0xFFFFFFFF && status_.field_0x1.flags.flag1 == 0) { stop_JAISound_(); } - }else{ + } else { mPriority = 0; } @@ -360,16 +362,16 @@ void JAISound::initTrack_JAISound_(JASTrack* track) { ASSERT(audience_); ASSERT(audible_); int numChannels = 0; - for (int i = 0; igetMaxChannels(); i++) { + for (int i = 0; i < audience_->getMaxChannels(); i++) { JASSoundParams* currentParams = audible_->getOuterParams(i); - if (currentParams!=NULL) { + if (currentParams != NULL) { soundParams[numChannels] = currentParams; numChannels++; - } + } } ASSERT(numChannels >= 1) track->setChannelMgrCount(numChannels); - for (size_t i = 0; igetChannelMgrCount(); i++) { - track->assignExtBuffer(i,soundParams[i]); + for (size_t i = 0; i < track->getChannelMgrCount(); i++) { + track->assignExtBuffer(i, soundParams[i]); } } diff --git a/libs/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/JAudio2/JAISoundInfo.cpp index ce12f5c6c6..88f29b5f6e 100644 --- a/libs/JSystem/JAudio2/JAISoundInfo.cpp +++ b/libs/JSystem/JAudio2/JAISoundInfo.cpp @@ -19,7 +19,7 @@ extern "C" void __dt__12JAISoundInfoFv(); // extern "C" void __dl__FPv(); -extern "C" extern u8 data_80450B5C[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp index bb2409f8f5..21466c6c6b 100644 --- a/libs/JSystem/JAudio2/JAISoundStarter.cpp +++ b/libs/JSystem/JAudio2/JAISoundStarter.cpp @@ -20,7 +20,7 @@ extern "C" void func_802A2FEC(); // extern "C" void __dl__FPv(); -extern "C" extern u8 data_80450B78[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/JAudio2/JAIStreamMgr.cpp index ad7e95cb90..2d55eb5ab2 100644 --- a/libs/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/libs/JSystem/JAudio2/JAIStreamMgr.cpp @@ -67,8 +67,8 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__9JAIStream[12]; extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B64[4]; extern "C" extern u8 data_80451328[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp index b253f6c3f2..fb081b4627 100644 --- a/libs/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/JAudio2/JASAudioReseter.cpp @@ -101,7 +101,7 @@ s32 JASAudioReseter::calc() { } } if(field_0xc!=false) { - data_80450B8C->stop();//JASGlobalInstance::sInstance->stop(); + JASGlobalInstance::getInstance()->stop();//JASGlobalInstance::sInstance->stop(); } mIsDone = 1; return -1; diff --git a/libs/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/JAudio2/JASAudioThread.cpp index 415d62b23d..b67d7c792e 100644 --- a/libs/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/JAudio2/JASAudioThread.cpp @@ -109,11 +109,11 @@ extern "C" void DSPCheckMailFromDSP(); extern "C" void DSPReadMailFromDSP(); extern "C" void __register_global_object(); extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 data_80450B8C[4]; extern "C" extern u8 JASDram[4]; extern "C" extern u8 struct_80451260[8]; extern "C" u8 sSystemHeap__7JKRHeap[4]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index bab33a8ea3..977e09bf6c 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -71,10 +71,6 @@ struct JASDriver { /* 8029E274 */ void registerSubFrameCallback(s32 (*)(void*), void*); }; -struct JASDefaultBankTable { - /* 802934B4 */ ~JASDefaultBankTable(); -}; - template struct JASBankTable {}; /* JASBankTable<256> */ @@ -221,8 +217,8 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; extern "C" extern u8 struct_80451230[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp b/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp index 256bab1489..2ed1b07fe3 100644 --- a/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp +++ b/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp @@ -104,6 +104,7 @@ extern "C" void __dl__FPv(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern u8 data_80450B6C[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/JAudio2/JAUInitializer.cpp index 1b9dc4bca1..6c30b0cc1d 100644 --- a/libs/JSystem/JAudio2/JAUInitializer.cpp +++ b/libs/JSystem/JAudio2/JAUInitializer.cpp @@ -157,6 +157,7 @@ extern "C" extern u8 data_80451320[8]; extern "C" extern u8 data_80451328[8]; extern "C" u8 sManager__15JKRThreadSwitch[4]; extern "C" u8 sAramObject__7JKRAram[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index 35b3359a0d..d794f1cc67 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -297,6 +297,7 @@ extern "C" extern u8 data_80450B58[4]; extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; extern "C" extern u8 JASDram[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index e4bc9afa10..24a0b1a7b2 100644 --- a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -101,6 +101,7 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); extern "C" extern u8 data_80450B50[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/JSystem/JAudio2/JAUSoundTable.cpp b/libs/JSystem/JAudio2/JAUSoundTable.cpp index aeb4e45cbf..3d6f7e9b47 100644 --- a/libs/JSystem/JAudio2/JAUSoundTable.cpp +++ b/libs/JSystem/JAudio2/JAUSoundTable.cpp @@ -7,22 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JAISoundID {}; - -struct JAUSoundTable { - /* 802A7114 */ void init(void const*); - /* 802A7160 */ void getTypeID(JAISoundID) const; - /* 802A728C */ void getData(JAISoundID) const; -}; - -struct JAUSoundNameTable { - /* 802A73D4 */ void init(void const*); -}; - // // Forward References: // diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index a38aeb5753..dc1b05f580 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -164,9 +164,9 @@ extern "C" f32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; extern "C" f32 DISTANCE_FX_PARAM__7Z2Param; extern "C" f32 SONIC_SPEED__7Z2Param; extern "C" extern u32 __float_epsilon; -extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B4C[4]; extern "C" f32 MIN_DISTANCE_VOLUME__7Z2Param; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp index 6e60099099..a5fd0be8de 100644 --- a/libs/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/libs/Z2AudioLib/Z2AudioArcLoader.cpp @@ -87,6 +87,7 @@ extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */]; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index b548e64be1..b44f2475d7 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -238,6 +238,7 @@ extern "C" extern u8 data_80450B84[4]; extern "C" extern u8 data_80450B88[4]; extern "C" extern u8 struct_80451358[8]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 4858393973..1906931b07 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -150,16 +150,15 @@ extern "C" void _restgpr_29(); extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B3C[4]; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B60[4]; extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B88[4]; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; extern "C" f32 cEqualCSlope__6Z2Calc; extern "C" f32 cEqualPSlope__6Z2Calc; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index c74427a3e6..e07de21371 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -58,8 +58,8 @@ extern "C" extern void* __vt__10JSUIosBase[3]; extern "C" extern void* __vt__20JSURandomInputStream[9]; extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; -extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B80[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 08c33a6589..4c4e9add05 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -5,25 +5,13 @@ #include "Z2AudioLib/Z2LinkMgr.h" #include "Z2AudioLib/Z2Creature.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Types: // -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct Z2SoundObjMgr { - /* 802BFFEC */ void setGhostEnemyState(u8); -}; - struct Z2SoundObjCoach { /* 802C54B8 */ Z2SoundObjCoach(); /* 802C54FC */ void init(Vec*, u8); @@ -32,31 +20,6 @@ struct Z2SoundObjCoach { /* 802C57C0 */ void startSound(JAISoundID, u32, s8); }; -struct Z2SeqMgr { - /* 802B4844 */ void setBattleSeqState(u8); - /* 802B4AFC */ void setBattleLastHit(u8); -}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2FxLineMgr { - /* 802BAE1C */ void setFxForceOff(bool); -}; - -struct Z2Calc { - struct CurveSign {}; - - /* 802A968C */ void linearTransform(f32, f32, f32, f32, f32, bool); - /* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign); -}; - -struct Z2Audience { - /* 802BD90C */ void setTargetVolume(f32, int); -}; - // // Forward References: // @@ -166,59 +129,57 @@ extern "C" void _restgpr_29(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; // // Declarations: // /* 802C321C-802C3220 2BDB5C 0004+00 0/0 1/1 0/0 .text setLinkGroupInfo__14Z2CreatureLinkFUc */ -void Z2CreatureLink::setLinkGroupInfo(u8 param_0) { - /* empty function */ -} +void Z2CreatureLink::setLinkGroupInfo(u8) {} /* 802C3220-802C3228 -00001 0008+00 0/0 0/0 0/0 .text setLinkHp__14Z2CreatureLinkFll */ -void Z2CreatureLink::setLinkHp(s32 hp, s32 param_1) { +void Z2CreatureLink::setLinkHp(s32 hp, s32) { mLinkHp = hp; } /* 802C3228-802C328C 2BDB68 0064+00 0/0 1/1 0/0 .text setLinkSwordType__14Z2CreatureLinkFll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setLinkSwordType(s32 param_0, s32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setLinkSwordType__14Z2CreatureLinkFll.s" +void Z2CreatureLink::setLinkSwordType(s32 i_swordType, s32 param_1) { + mLinkSwordType = i_swordType; + mFlag3 = param_1 == 1; + + if (mLinkSwordType != 0) { + if (mLinkShieldType != 0 && !mFlag4) { + mFlag5 = true; + return; + } + } + + mFlag5 = false; } -#pragma pop /* 802C328C-802C32F0 2BDBCC 0064+00 0/0 1/1 0/0 .text setLinkShieldType__14Z2CreatureLinkFll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setLinkShieldType(s32 param_0, s32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setLinkShieldType__14Z2CreatureLinkFll.s" +void Z2CreatureLink::setLinkShieldType(s32 i_shieldType, s32 param_1) { + mLinkShieldType = i_shieldType; + mFlag4 = param_1 == 1; + + if (mLinkSwordType != 0) { + if (mLinkShieldType != 0 && !mFlag4) { + mFlag5 = true; + return; + } + } + + mFlag5 = false; } -#pragma pop /* 802C32F0-802C333C 2BDC30 004C+00 0/0 1/1 0/0 .text setLinkBootsType__14Z2CreatureLinkFl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setLinkBootsType(s32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setLinkBootsType__14Z2CreatureLinkFl.s" +void Z2CreatureLink::setLinkBootsType(s32 i_bootsType) { + mLinkBootsType = i_bootsType; + + if (Z2GetSceneMgr()->isSceneExist()) { + startLinkSound(Z2SE_AL_CHANGE_BOOTS, 0, -1); + } } -#pragma pop /* ############################################################################################## */ /* 803CB8F0-803CB910 028A10 0020+00 1/1 0/0 1/1 .data __vt__15Z2SoundObjCoach */ @@ -293,21 +254,37 @@ SECTION_DATA extern void* __vt__14Z2CreatureLink[18] = { Z2CreatureLink* Z2CreatureLink::mLinkPtr; /* 802C333C-802C3464 2BDC7C 0128+00 0/0 1/1 0/0 .text __ct__14Z2CreatureLinkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureLink::Z2CreatureLink() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureLinkFv.s" +Z2CreatureLink::Z2CreatureLink() { + mLinkState = 0; + mLinkPtr = this; + + field_0xc1 = 0xFF; + mWolfEyeOpen = false; + mInWater = false; + mMarkState = 0; + mResumeAttack = false; + + setSoundStarter(this); + mKantera.setSoundStarter(this); + + mLinkHp = 0; + mLinkBootsType = 0; + mKanteraState = 0; + mLinkSwordType = 0; + mLinkShieldType = 0; + mFlag3 = false; + mFlag4 = false; + mFlag5 = false; + mRiding = false; + mMagnetized = false; + mUsingIronBall = false; } -#pragma pop /* 802C3464-802C3500 2BDDA4 009C+00 1/0 0/0 0/0 .text __dt__18Z2LinkSoundStarterFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void __dt__18Z2LinkSoundStarterFv() { - // asm Z2LinkSoundStarter::~Z2LinkSoundStarter() { +inline asm Z2LinkSoundStarter::~Z2LinkSoundStarter() { nofralloc #include "asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2LinkSoundStarterFv.s" } @@ -324,36 +301,40 @@ asm Z2CreatureLink::~Z2CreatureLink() { #pragma pop /* 802C35F8-802C3638 2BDF38 0040+00 1/0 0/0 0/0 .text deleteObject__14Z2CreatureLinkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void deleteObject__14Z2CreatureLinkFv() { - // asm void Z2CreatureLink::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureLinkFv.s" +void Z2CreatureLink::deleteObject() { + if (mKantera.isAlive()) { + deleteKantera(); + } + + Z2Creature::deleteObject(); } -#pragma pop /* 802C3638-802C3710 2BDF78 00D8+00 0/0 1/1 0/0 .text init__14Z2CreatureLinkFP3VecP3VecP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::init(Vec* param_0, Vec* param_1, Vec* param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/init__14Z2CreatureLinkFP3VecP3VecP3Vec.s" +void Z2CreatureLink::init(Vec* param_0, Vec* param_1, Vec* param_2) { + Z2Creature::init(param_0, param_1, param_2, 6, 1, 2); + Z2GetAudience()->getLinkMic()->setPosPtr(getCurrentPos()); + + field_0xc1 = 0xFF; + mWolfEyeOpen = false; + mInWater = false; + mMarkState = 0; + mResumeAttack = false; + mKanteraState = 0; + mRiding = false; + mMagnetized = false; + mUsingIronBall = false; + field_0xb4 = *param_0; + mMoveSpeed = 0; + mMovingTime = 0; + mSinkDepth = -1; } -#pragma pop /* 802C3710-802C374C 2BE050 003C+00 0/0 1/1 0/0 .text initKantera__14Z2CreatureLinkFP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::initKantera(Vec* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/initKantera__14Z2CreatureLinkFP3Vec.s" +void Z2CreatureLink::initKantera(Vec* i_pos) { + mKanteraState = 0; + mKantera.init(i_pos, 2); } -#pragma pop /* 802C374C-802C3778 2BE08C 002C+00 1/1 1/1 0/0 .text deleteKantera__14Z2CreatureLinkFv */ @@ -363,8 +344,8 @@ void Z2CreatureLink::deleteKantera() { } /* 802C3778-802C3780 -00001 0008+00 0/0 0/0 0/0 .text setKanteraState__14Z2CreatureLinkFUc */ -void Z2CreatureLink::setKanteraState(u8 state) { - mKanteraState = state; +void Z2CreatureLink::setKanteraState(u8 i_state) { + mKanteraState = i_state; } /* ############################################################################################## */ @@ -402,45 +383,71 @@ asm void Z2CreatureLink::framework(u32 param_0, s8 param_1) { } #pragma pop +/* void Z2CreatureLink::framework(u32 param_0, s8 param_1) { + Z2Creature::framework(param_0, param_1); + + if (mKantera.isAlive()) { + mKantera.framework(param_0, param_1); + } + + if (field_0xc1 != -1) { + field_0xc1++; + } + + if (mMagnetized) { + Z2GetSeMgr()->seStartLevel(Z2SE_WOLF_SENSE_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + if (isInWater() && Z2GetStatusMgr()->getCameraInWaterDepthRatio() > 0.0f) { + if (startLinkSoundLevel() && ) { + + } + } +} */ + /* 802C3A64-802C3A6C -00001 0008+00 0/0 0/0 0/0 .text setSinkDepth__14Z2CreatureLinkFSc */ -void Z2CreatureLink::setSinkDepth(s8 sinkDepth) { - mSinkDepth = sinkDepth; +void Z2CreatureLink::setSinkDepth(s8 i_sinkDepth) { + mSinkDepth = i_sinkDepth; } -/* ############################################################################################## */ -/* 80455CC0-80455CC4 0042C0 0004+00 1/1 0/0 0/0 .sdata2 @3743 */ -SECTION_SDATA2 static f32 lit_3743 = 7.0f / 20.0f; - /* 802C3A6C-802C3AEC 2BE3AC 0080+00 0/0 4/4 0/0 .text setRiding__14Z2CreatureLinkFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setRiding(bool param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setRiding__14Z2CreatureLinkFb.s" +void Z2CreatureLink::setRiding(bool i_isRiding) { + if (mRiding != i_isRiding) { + if (i_isRiding) { + Z2GetAudience()->setTargetVolume(0.35f, 0); + } else { + Z2GetAudience()->setTargetVolume(FLOAT_LABEL(lit_3723), 0); + } + + mRiding = i_isRiding; + } } -#pragma pop /* 802C3AEC-802C3AFC 2BE42C 0010+00 0/0 5/5 0/0 .text setMagnetized__14Z2CreatureLinkFb */ -#ifdef NONMATCHING -void Z2CreatureLink::setMagnetized(bool param_0) { - mFlags = param_0 & 1; +void Z2CreatureLink::setMagnetized(bool i_isMagnetized) { + mMagnetized = i_isMagnetized; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setMagnetized(bool param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setMagnetized__14Z2CreatureLinkFb.s" -} -#pragma pop -#endif /* 802C3AFC-802C3BD4 2BE43C 00D8+00 0/0 2/2 0/0 .text setWolfEyeOpen__14Z2CreatureLinkFb */ +// matches with literals +#ifdef NONMATCHING +void Z2CreatureLink::setWolfEyeOpen(bool i_wolfEyeOpen) { + mWolfEyeOpen = i_wolfEyeOpen; + + if (mWolfEyeOpen) { + Z2GetSeMgr()->seStart(Z2SE_WOLF_SENSE_OPEN_START, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetFxLineMgr()->setFxForceOff(true); + Z2GetSoundObjMgr()->setGhostEnemyState(32); + } else { + Z2GetSeMgr()->seStart(Z2SE_WOLF_SENSE_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetFxLineMgr()->setFxForceOff(false); + Z2GetSoundObjMgr()->setGhostEnemyState(16); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -449,6 +456,7 @@ asm void Z2CreatureLink::setWolfEyeOpen(bool param_0) { #include "asm/Z2AudioLib/Z2LinkMgr/setWolfEyeOpen__14Z2CreatureLinkFb.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80455CC4-80455CC8 0042C4 0004+00 1/1 0/0 0/0 .sdata2 @3834 */ @@ -556,24 +564,39 @@ asm void Z2CreatureLink::startLinkVoiceLevel(JAISoundID param_0, s8 param_1) { /* 802C46F0-802C4784 2BF030 0094+00 0/0 2/2 0/0 .text * startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::startLinkSwordSound(JAISoundID param_0, u32 param_1, s8 param_2) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc.s" +void Z2CreatureLink::startLinkSwordSound(JAISoundID i_soundID, u32 id, s8 ch) { + u32 soundID = i_soundID; + + switch (soundID) { + case Z2SE_SWORD_POWER_COME: + startCreatureExtraSoundLevel(soundID, id, ch); + break; + case Z2SE_WOLF_POWER_COME: + startCreatureExtraSoundLevel(soundID, id, ch); + break; + default: + startCreatureExtraSound(soundID, id, ch); + break; + } } -#pragma pop /* 802C4784-802C4814 2BF0C4 0090+00 1/0 0/0 0/0 .text startCollisionSE__14Z2CreatureLinkFUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::startCollisionSE(u32 param_0, u32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/startCollisionSE__14Z2CreatureLinkFUlUl.s" +void Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) { + switch (mapinfo) { + case 0x28: + case 0x29: + case 0x2A: + Z2GetSeqMgr()->onEnemyDamage(); + break; + case 0x20: + if (hitID == Z2SE_HIT_SWORD_STAB) { + Z2GetSeqMgr()->setBattleLastHit(0x14); + } + break; + } + + mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL); } -#pragma pop /* ############################################################################################## */ /* 80455D18-80455D1C 004318 0004+00 1/1 0/0 0/0 .sdata2 @4178 */ @@ -585,7 +608,7 @@ SECTION_SDATA2 static f32 lit_4178 = 100.0f; #pragma optimization_level 0 #pragma optimizewithasm off asm int Z2CreatureLink::startHitItemSE(u32 param_0, u32 param_1, Z2SoundObjBase* param_2, - f32 param_3) { + f32 speed) { nofralloc #include "asm/Z2AudioLib/Z2LinkMgr/startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef.s" } @@ -593,14 +616,9 @@ asm int Z2CreatureLink::startHitItemSE(u32 param_0, u32 param_1, Z2SoundObjBase* /* 802C48D8-802C48E8 2BF218 0010+00 0/0 1/1 0/0 .text setResumeAttack__14Z2CreatureLinkFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setResumeAttack(bool param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setResumeAttack__14Z2CreatureLinkFb.s" +void Z2CreatureLink::setResumeAttack(bool i_resumeAttack) { + mResumeAttack = i_resumeAttack; } -#pragma pop /* 802C48E8-802C4928 2BF228 0040+00 1/1 0/0 0/0 .text __ct__18Z2LinkSoundStarterFv */ Z2LinkSoundStarter::Z2LinkSoundStarter() : Z2SoundStarter(false) {} @@ -624,21 +642,17 @@ asm void Z2LinkSoundStarter::startSound(JAISoundID param_0, JAISoundHandle* para #pragma pop /* 802C4FFC-802C5078 2BF93C 007C+00 0/0 0/0 3/3 .text __ct__14Z2CreatureRideFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2CreatureRide::Z2CreatureRide() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/__ct__14Z2CreatureRideFv.s" +Z2CreatureRide::Z2CreatureRide() : Z2RideSoundStarter(this) { + mLinkRiding = false; + + setSoundStarter(this); } -#pragma pop /* 802C5078-802C5114 2BF9B8 009C+00 1/0 0/0 0/0 .text __dt__18Z2RideSoundStarterFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void __dt__18Z2RideSoundStarterFv() { - // asm Z2RideSoundStarter::~Z2RideSoundStarter() { +inline asm Z2RideSoundStarter::~Z2RideSoundStarter() { nofralloc #include "asm/Z2AudioLib/Z2LinkMgr/__dt__18Z2RideSoundStarterFv.s" } @@ -655,15 +669,9 @@ asm Z2CreatureRide::~Z2CreatureRide() { #pragma pop /* 802C51EC-802C520C 2BFB2C 0020+00 1/0 0/0 0/0 .text deleteObject__14Z2CreatureRideFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void deleteObject__14Z2CreatureRideFv() { - // asm void Z2CreatureRide::deleteObject() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/deleteObject__14Z2CreatureRideFv.s" +void Z2CreatureRide::deleteObject() { + Z2Creature::deleteObject(); } -#pragma pop /* 802C520C-802C522C 2BFB4C 0020+00 0/0 0/0 3/3 .text init__14Z2CreatureRideFP3VecP3VecUcUc */ void Z2CreatureRide::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3) { @@ -772,23 +780,3 @@ asm void Z2SoundObjCoach::startSound(JAISoundID param_0, u32 param_1, s8 param_2 #include "asm/Z2AudioLib/Z2LinkMgr/startSound__15Z2SoundObjCoachF10JAISoundIDUlSc.s" } #pragma pop - -/* 802C588C-802C5894 2C01CC 0008+00 1/0 0/0 0/0 .text @144@__dt__14Z2CreatureLinkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_802C588C() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/func_802C588C.s" -} -#pragma pop - -/* 802C5894-802C589C 2C01D4 0008+00 1/0 0/0 0/0 .text @144@__dt__14Z2CreatureRideFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_802C5894() { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/func_802C5894.s" -} -#pragma pop diff --git a/libs/Z2AudioLib/Z2Param.cpp b/libs/Z2AudioLib/Z2Param.cpp index 6f62db087a..686c10517e 100644 --- a/libs/Z2AudioLib/Z2Param.cpp +++ b/libs/Z2AudioLib/Z2Param.cpp @@ -1,187 +1,130 @@ -// -// Generated By: dol2asm -// Translation Unit: Z2Param -// +/** + * Z2Param.cpp + * Z2AudioLib constants + */ #include "Z2AudioLib/Z2Param.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" f32 DISTANCE_MAX__7Z2Param; -extern "C" f32 MAX_VOLUME_DISTANCE__7Z2Param; -extern "C" f32 DOLBY_CENTER_VALUE__7Z2Param; -extern "C" f32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; -extern "C" f32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; -extern "C" f32 DISTANCE_FX_PARAM__7Z2Param; -extern "C" f32 SONIC_SPEED__7Z2Param; -extern "C" f32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" f32 VOL_BGM_TALKING__7Z2Param; -extern "C" f32 VOL_SE_SYSTEM_TALKING__7Z2Param; -extern "C" f32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; -extern "C" f32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; -extern "C" f32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; -extern "C" f32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; -extern "C" f32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; -extern "C" f32 VOL_SE_OBJECT_TALKING__7Z2Param; -extern "C" f32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; -extern "C" f32 VOL_BGM_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_SYSTEM_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_OBJECT_PAUSING__7Z2Param; -extern "C" f32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 struct_80450864[4]; -extern "C" extern u8 struct_80450868[4]; -extern "C" extern u32 data_8045086C; -extern "C" f32 MIN_DISTANCE_VOLUME__7Z2Param; -extern "C" f32 ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param; -extern "C" extern u8 struct_80451340[8]; -extern "C" extern u8 data_80451348[8]; - -// -// External References: -// - -// -// Declarations: -// /* ############################################################################################## */ /* 804507D8-804507DC 000258 0004+00 0/0 4/4 0/0 .sdata DISTANCE_MAX__7Z2Param */ -SECTION_SDATA f32 Z2Param::DISTANCE_MAX = 2000.0f; +f32 Z2Param::DISTANCE_MAX = 2000.0f; /* 804507DC-804507E0 00025C 0004+00 0/0 3/3 0/0 .sdata MAX_VOLUME_DISTANCE__7Z2Param */ -SECTION_SDATA f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f; +f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f; /* 804507E0-804507E4 000260 0004+00 0/0 1/1 0/0 .sdata DOLBY_CENTER_VALUE__7Z2Param */ -SECTION_SDATA f32 Z2Param::DOLBY_CENTER_VALUE = 3.0f / 10.0f; +f32 Z2Param::DOLBY_CENTER_VALUE = 0.3f; /* 804507E4-804507E8 000264 0004+00 0/0 3/3 0/0 .sdata DOLBY_FLONT_DISTANCE_MAX__7Z2Param */ -SECTION_SDATA f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f; +f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f; /* 804507E8-804507EC 000268 0004+00 0/0 3/3 0/0 .sdata DOLBY_BEHIND_DISTANCE_MAX__7Z2Param */ -SECTION_SDATA f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f; +f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f; /* 804507EC-804507F0 00026C 0004+00 0/0 1/1 0/0 .sdata DISTANCE_FX_PARAM__7Z2Param */ -SECTION_SDATA f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f; +f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f; /* 804507F0-804507F4 000270 0004+00 0/0 1/1 0/0 .sdata SONIC_SPEED__7Z2Param */ -SECTION_SDATA f32 Z2Param::SONIC_SPEED = 360.0f; +f32 Z2Param::SONIC_SPEED = 360.0f; /* 804507F4-804507F8 000274 0004+00 0/0 3/3 0/0 .sdata VOL_BGM_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_BGM_DEFAULT = 1.0f; +f32 Z2Param::VOL_BGM_DEFAULT = 1.0f; /* 804507F8-804507FC 000278 0004+00 0/0 2/2 0/0 .sdata VOL_SE_SYSTEM_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f; /* 804507FC-80450800 00027C 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_VOICE_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f; +f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f; /* 80450800-80450804 000280 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_MOTION_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f; /* 80450804-80450808 000284 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f; /* 80450808-8045080C 000288 0004+00 0/0 3/3 0/0 .sdata VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f; /* 8045080C-80450810 00028C 0004+00 0/0 3/3 0/0 .sdata VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f; /* 80450810-80450814 000290 0004+00 0/0 3/3 0/0 .sdata VOL_SE_OBJECT_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f; /* 80450814-80450818 000294 0004+00 0/0 3/3 0/0 .sdata VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f; /* 80450818-8045081C 000298 0004+00 0/0 1/1 0/0 .sdata VOL_BGM_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_BGM_TALKING = 0.5f; +f32 Z2Param::VOL_BGM_TALKING = 0.5f; /* 8045081C-80450820 00029C 0004+00 0/0 1/1 0/0 .sdata VOL_SE_SYSTEM_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f; +f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f; /* 80450820-80450824 0002A0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_VOICE_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f; /* 80450824-80450828 0002A4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f; /* 80450828-8045082C 0002A8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f; /* 8045082C-80450830 0002AC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_VOICE_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f; /* 80450830-80450834 0002B0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_MOVE_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f; /* 80450834-80450838 0002B4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_OBJECT_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f; +f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f; /* 80450838-8045083C 0002B8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_ATMOSPHERE_TALKING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f; +f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f; /* 8045083C-80450840 0002BC 0004+00 0/0 1/1 0/0 .sdata VOL_BGM_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_BGM_PAUSING = 3.0f / 10.0f; +f32 Z2Param::VOL_BGM_PAUSING = 0.3f; /* 80450840-80450844 0002C0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_SYSTEM_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f; +f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f; /* 80450844-80450848 0002C4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_VOICE_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f; /* 80450848-8045084C 0002C8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f; /* 8045084C-80450850 0002CC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f; /* 80450850-80450854 0002D0 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_VOICE_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f; /* 80450854-80450858 0002D4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_CHAR_MOVE_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f; /* 80450858-8045085C 0002D8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_OBJECT_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f; /* 8045085C-80450860 0002DC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_ATMOSPHERE_PAUSING__7Z2Param */ -SECTION_SDATA f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f; +f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f; /* 80450860-80450864 -00001 0004+00 0/0 15/15 0/0 .sdata None */ -SECTION_SDATA extern u8 struct_80450860[4]; -SECTION_SDATA u8 struct_80450860[4] = { +extern u8 struct_80450860[4]; +u8 struct_80450860[4] = { /* 80450860 0001+00 data_80450860 None */ 0x21, /* 80450861 0001+00 data_80450861 None */ @@ -193,8 +136,8 @@ SECTION_SDATA u8 struct_80450860[4] = { }; /* 80450864-80450868 -00001 0004+00 0/0 2/2 0/0 .sdata None */ -SECTION_SDATA extern u8 struct_80450864[4]; -SECTION_SDATA u8 struct_80450864[4] = { +extern u8 struct_80450864[4]; +u8 struct_80450864[4] = { /* 80450864 0001+00 data_80450864 None */ 0x14, /* 80450865 0001+00 data_80450865 None */ @@ -206,8 +149,8 @@ SECTION_SDATA u8 struct_80450864[4] = { }; /* 80450868-8045086C -00001 0004+00 0/0 5/5 0/0 .sdata None */ -SECTION_SDATA extern u8 struct_80450868[4]; -SECTION_SDATA u8 struct_80450868[4] = { +extern u8 struct_80450868[4]; +u8 struct_80450868[4] = { /* 80450868 0001+00 data_80450868 None */ 0x01, /* 80450869 0001+00 data_80450869 None */ @@ -219,7 +162,7 @@ SECTION_SDATA u8 struct_80450868[4] = { }; /* 8045086C-80450870 0002EC 0004+00 0/0 3/3 0/0 .sdata None */ -SECTION_SDATA extern u32 data_8045086C = 0x01000000; +extern u32 data_8045086C = 0x01000000; /* 80451338-8045133C 000838 0004+00 0/0 1/1 0/0 .sbss MIN_DISTANCE_VOLUME__7Z2Param */ f32 Z2Param::MIN_DISTANCE_VOLUME; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 4f0a62b583..a533c5630f 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -163,10 +163,9 @@ extern "C" extern u8 data_80450B48[4]; extern "C" extern u8 data_80450B58[4]; extern "C" extern Z2SoundMgr* data_80450B60; extern "C" extern u8 data_80450B7C[4]; -extern "C" extern Z2SceneMgr* data_80450B80; -extern "C" extern u8 data_80450B84[4]; extern "C" extern Z2SeMgr* data_80450B88; extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index 4606d2030e..c354869ac1 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -185,18 +185,15 @@ extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B84[4]; -extern "C" extern Z2SeMgr* data_80450B88; // JASGlobalInstance::sInstance extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: // /* 802AB64C-802AB710 2A5F8C 00C4+00 0/0 1/1 0/0 .text __ct__7Z2SeMgrFv */ -// almost matches, JASGlobalInstance stuff needs to be setup properly -#ifdef NONMATCHING -Z2SeMgr::Z2SeMgr() : field_0x60(&mSoundHandle[0], 0x18) { - // data_80450B88 = this; +Z2SeMgr::Z2SeMgr() : JASGlobalInstance(this), field_0x60(mSoundHandle, 0x18) { field_0x3c0 = 0; field_0x3c1 = 0; field_0x3c2 = 0; @@ -209,19 +206,9 @@ Z2SeMgr::Z2SeMgr() : field_0x60(&mSoundHandle[0], 0x18) { field_0x3cb = 0; mCrowdSize = 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SeMgr::Z2SeMgr() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/__ct__7Z2SeMgrFv.s" -} -#pragma pop -#endif Z2MultiSeObj::Z2MultiSeObj() { - field_0x1c = 0xffffffff; + field_0x1c = 0xFFFFFFFF; field_0x20 = 0; } diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 34e68cc372..9ef713e831 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -161,9 +161,9 @@ extern "C" extern u8 data_80450B60[4]; extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; extern "C" f32 ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index c475fabdc5..240224107f 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -66,6 +66,7 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" extern u8 data_80450B5C[4]; extern "C" extern u8 data_80451348[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index 9436c7d4af..b8bfce56b0 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -70,9 +70,8 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; extern "C" extern u8 data_80450B58[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 938b9ab6d2..99ea835ac9 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -116,6 +116,7 @@ extern "C" extern u8 data_80450B84[4]; extern "C" extern u8 data_80450B88[4]; extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; extern "C" extern u8 struct_80451340[8]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 17d781338e..32c9fd8f1e 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -53,10 +53,10 @@ extern "C" void _savegpr_27(); extern "C" void _restgpr_23(); extern "C" void _restgpr_27(); extern "C" void strcmp(); -extern "C" extern Z2SoundObjMgr* data_80450B48; extern "C" extern u8 data_80450B80[4]; extern "C" extern Z2SeqMgr* data_80450B84; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: @@ -318,7 +318,7 @@ asm void Z2SoundObjMgr::searchEnemy() { void Z2SoundObjMgr::setGhostEnemyState(u8 p1) { if (p1 == 0x20) { if (field_0x1a >= field_0x16) { - data_80450B84->setBattleGhostMute(true); + JASGlobalInstance::getInstance()->setBattleGhostMute(true); } } else { if (field_0x1a == false) { diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 41a56257d9..d876f9f290 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -105,6 +105,7 @@ extern "C" extern Z2SoundInfo* data_80450B4C; extern "C" extern u8 data_80450B60[4]; extern "C" extern Z2SoundStarter* data_80450B74; extern "C" extern u8 data_80450B88[4]; +extern "C" extern u8 __OSReport_disable; // // Declarations: @@ -176,7 +177,7 @@ Z2SoundObjBase::Z2SoundObjBase() { //! structure layout order, indicating original code didn't use initializer list. mSoundPos = NULL; mIsInitialized = false; - mSoundStarter = data_80450B74; // sInstance + mSoundStarter = JASGlobalInstance::getInstance(); // sInstance field_0x1c = 0; field_0x1e = 0; } diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 884a3cbff1..4c8ca19d06 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -51,10 +51,10 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index edb7f74f1e..8a7e73528b 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -142,12 +142,11 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B84[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index 749a0f0eeb..d5e468f256 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -4,57 +4,8 @@ // #include "Z2AudioLib/Z2StatusMgr.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct Z2SeqMgr { - /* 802AF49C */ void subBgmStart(u32); - /* 802AF884 */ void subBgmStop(); - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFE18 */ void bgmStreamPlay(); - /* 802AFEDC */ void bgmStreamStop(u32); - /* 802B2CA4 */ void talkInBgm(); - /* 802B2D64 */ void talkOutBgm(); - /* 802B2DAC */ void menuInBgm(); - /* 802B2DF4 */ void menuOutBgm(); - /* 802B4164 */ void setBattleBgmOff(bool); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AD9F4 */ void seMoveVolumeAll(f32, u32); - /* 802ADB50 */ void talkInSe(); - /* 802ADC54 */ void talkOutSe(); - /* 802ADD58 */ void menuInSe(); -}; - -struct Z2SceneMgr { - /* 802BA294 */ void sceneBgmStart(); -}; - -struct Z2FxLineMgr { - /* 802BAE48 */ void setUnderWaterFx(bool); -}; - -struct Z2CreatureLink { - static u8 mLinkPtr[4 + 4 /* padding */]; -}; - -struct Z2Calc { - struct CurveSign {}; - - /* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign); -}; - -struct JAISoundParamsMove { - /* 802A2DB4 */ void moveVolume(f32, u32); -}; // // Forward References: @@ -102,18 +53,15 @@ extern "C" void sceneBgmStart__10Z2SceneMgrFv(); extern "C" void setUnderWaterFx__11Z2FxLineMgrFb(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" void strncmp(); -extern "C" void strcmp(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B60[4]; -extern "C" extern Z2StatusMgr* data_80450B7C; extern "C" extern u8 data_80450B80[4]; extern "C" extern Z2SeqMgr* data_80450B84; extern "C" extern Z2SeMgr* data_80450B88; extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; +extern "C" extern u8 __OSReport_disable; // // Declarations: @@ -132,38 +80,28 @@ SECTION_SDATA2 static u8 lit_3396[4] = { }; /* 802B5F1C-802B5F70 2B085C 0054+00 0/0 1/1 0/0 .text __ct__11Z2StatusMgrFv */ -// needs other functions decompiled first -#ifdef NONMATCHING -Z2StatusMgr::Z2StatusMgr() { - data_80450B7C = this; +Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(this) { mHour = 0; mMinute = 0; mWeekday = 0; field_0x03 = 0; mTime = 3072; - mEventBit = (void*)0; + mEventBit = NULL; mIsMenuIn = false; mCameraMapInfo = 0; - float polygon_pos_init = lit_3395; - mPolygonPosition.x = polygon_pos_init; - mPolygonPosition.y = polygon_pos_init; - mPolygonPosition.z = polygon_pos_init; - float depth_init = 0.0f; - mUnderwaterDepth = depth_init; - mCameraInWaterDepthRatio = depth_init; + + f32 temp_f0 = lit_3395; + mPolygonPosition.x = temp_f0; + mPolygonPosition.y = temp_f0; + mPolygonPosition.z = temp_f0; + + f32 temp_f0_2 = FLOAT_LABEL(lit_3396); + mUnderwaterDepth = temp_f0_2; + mCameraInWaterDepthRatio = temp_f0_2; + mDemoStatus = 0; mHeartGaugeOn = 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2StatusMgr::Z2StatusMgr() { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/__ct__11Z2StatusMgrFv.s" -} -#pragma pop -#endif /* 802B5F70-802B5F7C 2B08B0 000C+00 0/0 1/1 0/0 .text heartGaugeOn__11Z2StatusMgrFv */ void Z2StatusMgr::heartGaugeOn() { @@ -190,37 +128,37 @@ asm void Z2StatusMgr::processHeartGaugeSound() { /* 802B60CC-802B6104 2B0A0C 0038+00 0/0 1/1 0/0 .text talkIn__11Z2StatusMgrFv */ void Z2StatusMgr::talkIn() { if (!isMovieDemo()) { - data_80450B84->talkInBgm(); - data_80450B88->talkInSe(); + Z2GetSeqMgr()->talkInBgm(); + Z2GetSeMgr()->talkInSe(); } } /* 802B6104-802B613C 2B0A44 0038+00 0/0 1/1 0/0 .text talkOut__11Z2StatusMgrFv */ void Z2StatusMgr::talkOut() { if (!isMovieDemo()) { - data_80450B84->talkOutBgm(); - data_80450B88->talkOutSe(); + Z2GetSeqMgr()->talkOutBgm(); + Z2GetSeMgr()->talkOutSe(); } } /* 802B613C-802B617C 2B0A7C 0040+00 0/0 1/1 0/0 .text menuIn__11Z2StatusMgrFv */ void Z2StatusMgr::menuIn() { - data_80450B84->menuInBgm(); - data_80450B88->menuInSe(); + Z2GetSeqMgr()->menuInBgm(); + Z2GetSeMgr()->menuInSe(); mIsMenuIn = true; } /* 802B617C-802B61BC 2B0ABC 0040+00 0/0 3/3 0/0 .text menuOut__11Z2StatusMgrFv */ void Z2StatusMgr::menuOut() { - data_80450B84->menuOutBgm(); - data_80450B88->talkOutSe(); + Z2GetSeqMgr()->menuOutBgm(); + Z2GetSeMgr()->talkOutSe(); mIsMenuIn = false; } /* 802B61BC-802B61E8 2B0AFC 002C+00 2/2 1/1 0/0 .text isMovieDemo__11Z2StatusMgrFv */ -bool Z2StatusMgr::isMovieDemo(void) { +bool Z2StatusMgr::isMovieDemo() { return mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9; } @@ -396,35 +334,33 @@ asm void Z2StatusMgr::setDemoName(char* param_0) { /* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */ void Z2StatusMgr::processTime() { - u16 temp = mHour * 256; - mTime = temp + mMinute; + u16 processed_hour = mHour * 256; + mTime = processed_hour + mMinute; } /* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text checkDayTime__11Z2StatusMgrFv */ bool Z2StatusMgr::checkDayTime() { if (mHour >= 6 && mHour < 19) { return true; - } else { - return false; } + + return false; } /* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text setEventBit__11Z2StatusMgrFPv */ -void Z2StatusMgr::setEventBit(void* pBit) { - mEventBit = pBit; +void Z2StatusMgr::setEventBit(void* i_eventBit) { + mEventBit = i_eventBit; } /* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */ -void Z2StatusMgr::setCameraPolygonPos(Vec* pPolygonPos) { - if (pPolygonPos == 0) { - return; - } else { - mPolygonPosition = *pPolygonPos; +void Z2StatusMgr::setCameraPolygonPos(Vec* i_polygonPos) { + if (i_polygonPos != NULL) { + mPolygonPosition = *i_polygonPos; } } /* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */ -void Z2StatusMgr::setCameraGroupInfo(u8 param_0) {} +void Z2StatusMgr::setCameraGroupInfo(u8) {} /* ############################################################################################## */ /* 80455A30-80455A34 004030 0004+00 1/1 0/0 0/0 .sdata2 @3798 */ diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index dcb579b215..72d6461223 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -4,8 +4,9 @@ // #include "Z2AudioLib/Z2WolfHowlMgr.h" +#include "Z2AudioLib/Z2Creature.h" +#include "dolphin/os/OS.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Types: @@ -20,10 +21,6 @@ struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; -struct Z2CreatureLink { - static u8 mLinkPtr[4 + 4 /* padding */]; -}; - struct Z2Calc { struct CurveSign {}; @@ -70,11 +67,8 @@ extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u32 __float_nan; -extern "C" extern Z2WolfHowlMgr* data_80450B38; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B84[4]; extern "C" extern u8 data_80450B88[4]; @@ -194,9 +188,9 @@ SECTION_SDATA2 static u8 lit_3485[4] = { SECTION_SDATA2 static f32 lit_3486 = 1.0f; /* 802CAAC0-802CAB8C 2C5400 00CC+00 0/0 1/1 0/0 .text __ct__13Z2WolfHowlMgrFv */ +// matches with literals #ifdef NONMATCHING -Z2WolfHowlMgr* JASGlobalInstance::sInstance = reinterpret_cast(data_80450B38); -Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) { +Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(this) { mpCurSong = NULL; mNowInputValue = 0.0f; field_0x18 = 1.0f; @@ -211,13 +205,16 @@ Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) { field_0xba = 0; field_0xbb = 0; field_0xbc = 0; - for (u8 i = 0; i<20; i++) { + + for (u8 i = 0; i < 20; i++) { field_0x92[i] = 0; } - for (u8 i = 0; i<10; i++) { + + for (u8 i = 0; i < 10; i++) { field_0x38[i] = 0.0f; field_0x60[i] = 0.0f; } + field_0x34 = 0.0f; field_0x30 = 0.0f; mpSongList = (Z2WolfHowlData**)&sGuideData; @@ -234,6 +231,7 @@ asm Z2WolfHowlMgr::Z2WolfHowlMgr() { #endif /* 802CAB8C-802CABEC 2C54CC 0060+00 1/1 0/0 0/0 .text resetState__13Z2WolfHowlMgrFv */ +// matches with literals #ifdef NONMATCHING void Z2WolfHowlMgr::resetState() { field_0x18 = 1.0f; @@ -242,10 +240,12 @@ void Z2WolfHowlMgr::resetState() { mTimer = NULL; mReleaseTimer = 0; field_0xba = 0; - for (u8 i = 0; i<10; i++) { + + for (u8 i = 0; i < 10; i++) { field_0x38[i] = 0.0f; field_0x60[i] = 0.0f; } + field_0x34 = 0.0f; field_0x30 = 0.0f; } @@ -495,8 +495,7 @@ asm void Z2WolfHowlMgr::skipCorrectDemo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_Z2WolfHowlMgr_cpp() { - nofralloc +asm void __sinit_Z2WolfHowlMgr_cpp(){nofralloc #include "asm/Z2AudioLib/Z2WolfHowlMgr/__sinit_Z2WolfHowlMgr_cpp.s" } #pragma pop diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 30ec56c003..f0f9f14f34 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -3069,7 +3069,6 @@ extern "C" u8 BaseZ__4cXyz[12]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; -extern "C" extern u8 data_80450B38[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; @@ -12428,7 +12427,7 @@ void daAlink_c::playerInit() { mSheathModel = mpSwASheathModel; field_0x814.Init(120, 0xFF, this); - field_0x306c = shape_angle.y + mBodyAngleY; + field_0x306c = shape_angle.y + mBodyAngle.y; for (u16 i = 0; i < 3; i++) { mAtCps[i].Set(*(dCcD_SrcCps*)l_atCpsSrc); @@ -13798,7 +13797,7 @@ void daAlink_c::setCollision() { if (checkIronBallWaitAnime() || field_0x351c.absXZ() > lit_8782) { field_0x306c = field_0x351c.atan2sX_Z(); } else { - field_0x306c = shape_angle.y + mBodyAngleY; + field_0x306c = shape_angle.y + mBodyAngle.y; } g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[0]); @@ -13859,7 +13858,7 @@ asm void daAlink_c::setCollision() { #ifdef NONMATCHING f32 daAlink_c::getBaseAnimeFrame() const { if (mProcID == PROC_SUMOU_ACTION && mSpeedModifier > 0.0f) { - return mCommonCounter; + return field_0x300c; } return mUnderFrameCtrl[0].getFrame(); @@ -16290,8 +16289,8 @@ void daAlink_c::setBodyAngleXReadyAnime(int param_0) { angle_x >>= 1; // divide by 2 adds extra addze? } - cLib_addCalcAngleS(&mBodyAngleX, angle_x, 4, 0x0C00, 0x0180); - field_0x310a = mBodyAngleX; + cLib_addCalcAngleS(&mBodyAngle.x, angle_x, 4, 0x0C00, 0x0180); + field_0x310a = mBodyAngle.x; } /* 800BB324-800BB408 0B5C64 00E4+00 2/2 0/0 0/0 .text setMagicArmorBrk__9daAlink_cFi */ @@ -17825,7 +17824,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { initForceRideHorse(); } - if (mCommonCounter != 0) { + if (field_0x300c != 0) { changeWarpMaterial(1); } } else if (mProcID == PROC_GRAB_STAND) { @@ -17973,8 +17972,8 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (i_checkWolf()) { shape_angle.z = 0; - mBodyAngleX = 0; - mBodyAngleY = 0; + mBodyAngle.x = 0; + mBodyAngle.y = 0; } else if (!i_checkReinRide() && !checkBoardRide()) { shape_angle.x = 0; shape_angle.z = 0; @@ -17994,7 +17993,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (field_0x3190 != 0) { field_0x3190 = 0; - mBodyAngleY = 0; + mBodyAngle.y = 0; } mFishingArm1Angle = csXyz::Zero; @@ -18315,7 +18314,7 @@ int daAlink_c::procGoronMoveInit() { current.angle.y = shape_angle.y + -0x4000; field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; setSingleAnimeBase(ANM_ATN_RIGHT); - mCommonCounter = 1; + field_0x300c = 1; field_0x300e = 0; return 1; } diff --git a/src/d/a/d_a_alink_boom.inc b/src/d/a/d_a_alink_boom.inc index 0dd166573c..d93b25eb7d 100644 --- a/src/d/a/d_a_alink_boom.inc +++ b/src/d/a/d_a_alink_boom.inc @@ -196,8 +196,8 @@ void daAlink_c::throwBoomerang() { BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG; if (boomerang_item) { item->setThrow(); - item->current.angle.y = shape_angle.y + mBodyAngleY; - item->current.angle.x = -mBodyAngleX; + item->current.angle.y = shape_angle.y + mBodyAngle.y; + item->current.angle.x = -mBodyAngle.x; if (mTargetedActor != NULL) { item->setAimActor(mTargetedActor); diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc index f4c9cff3ad..bc0d22c6f7 100644 --- a/src/d/a/d_a_alink_bottle.inc +++ b/src/d/a/d_a_alink_bottle.inc @@ -116,7 +116,7 @@ int daAlink_c::procBottleDrinkInit(u16 param_0) { u32 id = fopAcM_GetID(this); dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; return 1; } @@ -172,7 +172,7 @@ int daAlink_c::procBottleOpenInit(u16 param_0) { u32 id = fopAcM_GetID(this); dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); - mCommonCounter = 0; + field_0x300c = 0; field_0x27c8.initialize(); diff --git a/src/d/a/d_a_alink_bow.inc b/src/d/a/d_a_alink_bow.inc index 911d90ac52..aa5c3b0b36 100644 --- a/src/d/a/d_a_alink_bow.inc +++ b/src/d/a/d_a_alink_bow.inc @@ -80,14 +80,14 @@ cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { var_28 = shape_angle.y; } - var_28 += mBodyAngleY; + var_28 += mBodyAngle.y; mDoMtx_stack_c::transS(field_0x3834); concatMagneBootMtx(); - mDoMtx_stack_c::ZXYrotM(mBodyAngleX, var_28, 0); + mDoMtx_stack_c::ZXYrotM(mBodyAngle.x, var_28, 0); mDoMtx_stack_c::multVec(&localPos, &field_0x37e0); - *param_0 = mBodyAngleX; + *param_0 = mBodyAngle.x; *param_1 = var_28; return &field_0x37e0; } @@ -347,7 +347,7 @@ int daAlink_c::procBowMoveInit() { } setBlendAtnMoveAnime(daAlinkHIO_bow_c0::m.mStartInterpolation); - mCommonCounter = 0; + field_0x300c = 0; setBowOrSlingStatus(); return 1; } @@ -356,11 +356,11 @@ int daAlink_c::procBowMoveInit() { int daAlink_c::procBowMove() { cancelBowMove(); - if (mFastShotTime == 0 && mCommonCounter != 0 && checkBowWaitAnime() && !itemButton()) { + if (mFastShotTime == 0 && field_0x300c != 0 && checkBowWaitAnime() && !itemButton()) { resetUpperAnime(UPPER_2, lit_6041); } - mCommonCounter = 1; + field_0x300c = 1; i_onEndResetFlg0(ERFLG0_UNK_8000000); if (!checkNextAction(0)) { diff --git a/src/d/a/d_a_alink_copyrod.inc b/src/d/a/d_a_alink_copyrod.inc index 1a847756e3..e5e7eb918c 100644 --- a/src/d/a/d_a_alink_copyrod.inc +++ b/src/d/a/d_a_alink_copyrod.inc @@ -377,7 +377,7 @@ int daAlink_c::procCopyRodSwingInit() { mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = 1; + field_0x300c = 1; field_0x300e = 0; voiceStart(Z2SE_AL_V_ATTACK_S); @@ -390,7 +390,7 @@ int daAlink_c::procCopyRodSwingInit() { /* 800E21FC-800E2308 0DCB3C 010C+00 1/0 0/0 0/0 .text procCopyRodSwing__9daAlink_cFv */ int daAlink_c::procCopyRodSwing() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - mCommonCounter = 0; + field_0x300c = 0; if (frameCtrl->checkAnmEnd()) { setCopyRodControllAnime(); diff --git a/src/d/a/d_a_alink_cut.inc b/src/d/a/d_a_alink_cut.inc index 207b1e46f1..ef7c39fdff 100644 --- a/src/d/a/d_a_alink_cut.inc +++ b/src/d/a/d_a_alink_cut.inc @@ -455,10 +455,10 @@ void daAlink_c::setSwordVoiceSe(u32 i_seID) { /* 800D22BC-800D2304 0CCBFC 0048+00 3/3 0/0 0/0 .text setSwordChargeVoiceSe__9daAlink_cFv */ void daAlink_c::setSwordChargeVoiceSe() { - if (mCommonCounter != 0) { - mCommonCounter--; + if (field_0x300c != 0) { + field_0x300c--; - if (mCommonCounter == 0) { + if (field_0x300c == 0) { setSwordVoiceSe(Z2SE_AL_V_TAME); } } @@ -776,9 +776,9 @@ int daAlink_c::procCutNormalInit(int i_type) { current.angle.y = shape_angle.y; if (!i_checkAttentionLock() && checkInputOnR()) { - mCommonCounter = field_0x2fe2; + field_0x300c = field_0x2fe2; } else { - mCommonCounter = shape_angle.y; + field_0x300c = shape_angle.y; } if (mComboCutCount != 1) { @@ -854,13 +854,13 @@ int daAlink_c::procCutNormal() { } if (setShapeAngleToAtnActor(field_0x3010)) { - mCommonCounter = shape_angle.y; + field_0x300c = shape_angle.y; if (cLib_distanceAngleS(getShapeAngleYAtnActor(), shape_angle.y) < 0x800) { field_0x3010 = 1; } } else { - cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, 2, 0x2000, 0x800); + cLib_addCalcAngleS(&shape_angle.y, field_0x300c, 2, 0x2000, 0x800); } current.angle.y = shape_angle.y; @@ -903,7 +903,7 @@ int daAlink_c::procCutFinishInit(int i_type) { commonProcInit(PROC_CUT_FINISH); setCutType(cutParams->m_cutType); field_0x3198 = cutParams->field_0x4; - mCommonCounter = cutParams->field_0xa; + field_0x300c = cutParams->field_0xa; field_0x300e = cutParams->field_0xb; BOOL var_r30 = FALSE; @@ -1187,13 +1187,13 @@ int daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM i_anmID) { if (i_anmID == ANM_SHIELD_ATTACK_RECOIL) { setSingleAnimeParam(i_anmID, &daAlinkHIO_guard_c0::m.mRecoilAnm); - mCommonCounter = 1; + field_0x300c = 1; field_0x3478 = daAlinkHIO_guard_c0::m.mRecoilAnm.mCheckFrame; field_0x2f98 = 2; setUpperGuardAnime(lit_6041); } else { setSingleAnimeParam(i_anmID, &daAlinkHIO_cut_c0::m.mRecoilAnm); - mCommonCounter = 0; + field_0x300c = 0; field_0x3478 = daAlinkHIO_cut_c0::m.mRecoilAnm.mCheckFrame; field_0x2f98 = 4; } @@ -1225,12 +1225,12 @@ int daAlink_c::procCutReverse() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_cut_c0::m.mRecoilDeceleration); - if (mCommonCounter == 0) { + if (field_0x300c == 0) { checkCutTurnCharge(); i_onEndResetFlg0(ERFLG0_UNK_8000000); } - if (mCommonCounter != 0) { + if (field_0x300c != 0) { setUpperGuardAnime(lit_6041); } @@ -1549,7 +1549,7 @@ int daAlink_c::procCutTurnChargeInit() { setSingleAnimeParam(ANM_CUT_TURN_CHARGE_START, &daAlinkHIO_cutTurn_c0::m.mChargeAnm); mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = daAlinkHIO_cut_c0::m.mNormalSwingDuration; + field_0x300c = daAlinkHIO_cut_c0::m.mNormalSwingDuration; return 1; } @@ -1563,7 +1563,7 @@ int daAlink_c::procCutTurnCharge() { field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; if (!swordButton() && mDemo.getDemoMode() != 0x5B) { - if (mCommonCounter != 0) { + if (field_0x300c != 0) { checkCutAction(); } else { cancelCutCharge(); @@ -1607,7 +1607,7 @@ int daAlink_c::procCutTurnMoveInit(int param_0) { field_0x3008 = 1; } - mCommonCounter = param_0; + field_0x300c = param_0; i_onNoResetFlg1(FLG1_UNK_10000000); dComIfGp_setPlayerStatus0(0, 0x40000000); return 1; @@ -1641,8 +1641,8 @@ int daAlink_c::procCutDown() { if (mLinkAcch.ChkGroundHit() && speed.y <= FLOAT_LABEL(lit_6108)) { procCutDownLandInit((fopEn_enemy_c*)field_0x280c.getActor()); - } else if (mUnderFrameCtrl[0].checkAnmEnd() && mCommonCounter == 0) { - mCommonCounter = 1; + } else if (mUnderFrameCtrl[0].checkAnmEnd() && field_0x300c == 0) { + field_0x300c = 1; setSingleAnimeParam(ANM_CUT_FINISHING_BLOW_FALL, &daAlinkHIO_cutDown_c0::m.mFallAnm); } @@ -1756,7 +1756,7 @@ int daAlink_c::procCutLargeJumpChargeInit() { setSingleAnimeParam(ANM_CUT_JUMP_LARGE_CHARGE, &daAlinkHIO_cutLargeJump_c0::m.mChargeAnm); mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = daAlinkHIO_cut_c0::m.mNormalSwingDuration; + field_0x300c = daAlinkHIO_cut_c0::m.mNormalSwingDuration; return 1; } @@ -1798,7 +1798,7 @@ int daAlink_c::procCutLargeJumpInit() { field_0x3588 = l_halfAtnWaitBaseAnime; mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = 0; + field_0x300c = 0; setSwordAtParam(dCcG_At_Spl_UNK_0, 1, 1, 2, daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); @@ -1823,11 +1823,11 @@ int daAlink_c::procCutLargeJump() { field_0x3198 = getCutTurnDirection(); } - if (mCommonCounter == 0) { + if (field_0x300c == 0) { if (frameCtrl->checkAnmEnd()) { field_0x2f99 = 12; setSingleAnimeParam(ANM_CUT_JUMP_LARGE, &daAlinkHIO_cutLargeJump_c0::m.mCutAnm); - mCommonCounter = 1; + field_0x300c = 1; setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_2); } else { if (frameCtrl->getFrame() >= lit_7307) { @@ -1889,7 +1889,7 @@ int daAlink_c::procCutLargeJumpLandInit(int param_0) { setCutType(CUT_TYPE_LARGE_JUMP); field_0x3478 = daAlinkHIO_cutLargeJump_c0::m.mLandAttackRadius; field_0x347c = lit_6896; - mCommonCounter = 0; + field_0x300c = 0; field_0x3198 = param_0; f32 tmp_0 = FLOAT_LABEL(lit_6108); @@ -1925,9 +1925,9 @@ int daAlink_c::procCutLargeJumpLand() { i_onResetFlg0(RFLG0_UNK_2); if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mLandAttackInitFrame) { - if (mCommonCounter == 0) { + if (field_0x300c == 0) { resetAtCollision(0); - mCommonCounter = 1; + field_0x300c = 1; setCutType(CUT_TYPE_LARGE_JUMP_FINISH); initCutTurnAt(field_0x347c, 4); } @@ -1950,7 +1950,7 @@ int daAlink_c::procSwordUnequipSpInit() { mNormalSpeed = FLOAT_LABEL(lit_6108); field_0x3588 = l_halfAtnWaitBaseAnime; field_0x3198 = 0; - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = (0x1E - mDemo.getDemoMode()) != 0; field_0x3010 = 0; @@ -1973,7 +1973,7 @@ int daAlink_c::procSwordUnequipSp() { i_onEndResetFlg0(ERFLG0_UNK_8000000); - if (mCommonCounter != 0) { + if (field_0x300c != 0) { i_onEndResetFlg1(ERFLG1_GANON_FINISH); } @@ -2020,7 +2020,7 @@ int daAlink_c::procSwordUnequipSp() { } else { if (frameCtrl->getFrame() >= lit_7710) { field_0x2f93 = 0xFE; - mCommonCounter = 1; + field_0x300c = 1; i_onEndResetFlg1(ERFLG1_GANON_FINISH); } diff --git a/src/d/a/d_a_alink_damage.inc b/src/d/a/d_a_alink_damage.inc index bcc8870b33..d621033fe6 100644 --- a/src/d/a/d_a_alink_damage.inc +++ b/src/d/a/d_a_alink_damage.inc @@ -217,7 +217,7 @@ void daAlink_c::setLandDamagePoint(int i_dmgAmount) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getDamageVec(dCcD_GObjInf* param_0) { +asm Vec* daAlink_c::getDamageVec(dCcD_GObjInf* param_0) { nofralloc #include "asm/d/a/d_a_alink/getDamageVec__9daAlink_cFP12dCcD_GObjInf.s" } @@ -548,7 +548,7 @@ asm int daAlink_c::procDkCaught() { void daAlink_c::setScreamWaitAnime() { setSingleAnimeBase(ANM_WAIT_F); voiceStart(Z2SE_AL_V_TERRORED); - mCommonCounter = 1; + field_0x300c = 1; f32 tmp_0 = FLOAT_LABEL(lit_6108); dComIfGp_getVibration().StartQuake(5, 1, cXyz(tmp_0, lit_6040, tmp_0)); @@ -562,7 +562,7 @@ int daAlink_c::procScreamWaitInit() { setScreamWaitAnime(); } else { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); - mCommonCounter = 0; + field_0x300c = 0; } current.angle.y = shape_angle.y; @@ -576,7 +576,7 @@ int daAlink_c::procScreamWait() { if (!i_checkEndResetFlg1(ERFLG1_UNK_1)) { checkNextAction(0); - } else if (mCommonCounter == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + } else if (field_0x300c == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { setScreamWaitAnime(); } @@ -682,7 +682,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() { u32 id = fopAcM_GetID(this); dCam_getBody()->StartEventCamera(9, id, "Type", 1, &field_0x3194, 0); - mCommonCounter = 0x2D; + field_0x300c = 0x2D; return 1; } diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index b5750737e6..18c62666bb 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -1162,7 +1162,7 @@ int daAlink_c::procMasterSwordStickInit() { voiceStart(Z2SE_AL_V_MSTR_SW_STICK); mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = 0; + field_0x300c = 0; return 1; } @@ -1172,10 +1172,10 @@ int daAlink_c::procMasterSwordStickInit() { int daAlink_c::procMasterSwordStick() { daPy_frameCtrl_c* fCtrl = &mUnderFrameCtrl[0]; - if (mCommonCounter != 0) { + if (field_0x300c != 0) { dComIfGp_evmng_cutEnd(field_0x3184); } else if (fCtrl->checkAnmEnd()) { - mCommonCounter = 1; + field_0x300c = 1; setSingleAnimeBaseMorf(ANM_DEMO_MASTER_SWORD_WAIT, lit_6041); dComIfGp_evmng_cutEnd(field_0x3184); } else if (fCtrl->getFrame() >= lit_14621) { @@ -1240,7 +1240,7 @@ int daAlink_c::procDungeonWarpReadyInit() { mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; field_0x32cc = id; - mCommonCounter = 0; + field_0x300c = 0; keepItemData(); return 1; @@ -1262,7 +1262,7 @@ asm int daAlink_c::procDungeonWarpReady() { #ifdef NONMATCHING bool daAlink_c::procDungeonWarpInit() { if (!commonProcInitNotSameProc(DUNEGON_WARP_START) { - mCommonCounter = 0; + field_0x300c = 0; field_0x3012 = 0; setSpecialGravity(0.0f, mMaxFallSpeed, 0); field_0x300e = 0; @@ -1286,22 +1286,22 @@ asm int daAlink_c::procDungeonWarpInit() { // matches with literals #ifdef NONMATCHING int daAlink_c::procDungeonWarp() { - mCommonCounter += 0x200; + field_0x300c += 0x200; - if (mCommonCounter > 0x4000) { - mCommonCounter = 0x4000; + if (field_0x300c > 0x4000) { + field_0x300c = 0x4000; } else { current.pos.y += 1.0f; } - f32 sin = cM_ssin(mCommonCounter); + f32 sin = cM_ssin(field_0x300c); shape_angle.y += (s16)(14336.0f * sin); field_0x300e = 8.0f * sin + 24.0f * (1.0f - mScale.x); if (field_0x3012 != 0) { return 1; } else { - if (mCommonCounter == 0x4000) { + if (field_0x300c == 0x4000) { if (field_0x3010 == 0) { dComIfGp_particle_set(0xA61, ¤t.pos, &mTevStr, NULL, NULL); field_0x3010 = 1; @@ -1326,7 +1326,7 @@ int daAlink_c::procDungeonWarp() { } current.pos.y += 5.0f; field_0x2b98 = (1.0f - mScale.y) * 100.0f; - } else if (mCommonCounter >= 0x2000) { + } else if (field_0x300c >= 0x2000) { cLib_chaseF(&mScale.x, 0.8f, 0.01f); } diff --git a/src/d/a/d_a_alink_ironball.inc b/src/d/a/d_a_alink_ironball.inc index 70f65d64ed..82084f0560 100644 --- a/src/d/a/d_a_alink_ironball.inc +++ b/src/d/a/d_a_alink_ironball.inc @@ -132,8 +132,8 @@ asm void daAlink_c::setIronBallChainPos() { /* 80113CA0-80113D58 10E5E0 00B8+00 1/1 0/0 0/0 .text checkIronBallReturnChange__9daAlink_cFv */ BOOL daAlink_c::checkIronBallReturnChange() { if (mProcID != PROC_IRON_BALL_THROW || - (!(mBodyAngleX > 0x400) && mIronBallBgChkPos.y < (current.pos.y - lit_8472)) || - (mBodyAngleX > 0x400 && mItemMode == 0x64) || + (!(mBodyAngle.x > 0x400) && mIronBallBgChkPos.y < (current.pos.y - lit_8472)) || + (mBodyAngle.x > 0x400 && mItemMode == 0x64) || (field_0xFB8.ChkAtHit() && field_0xFB8.GetAtHitGObj() != NULL && static_cast(field_0xFB8.GetAtHitGObj())->ChkTgIronBallRebound())) { setIronBallReturn(0); @@ -354,7 +354,7 @@ int daAlink_c::procIronBallThrowInit() { field_0x3588 = l_ironBallBaseAnime; mNormalSpeed = FLOAT_LABEL(lit_6108); current.angle.y = shape_angle.y; - mCommonCounter = 0; + field_0x300c = 0; field_0x3018 = 3; field_0x3024 = 0; field_0x3026 = 0; @@ -380,13 +380,13 @@ int daAlink_c::procIronBallReturnInit() { commonProcInit(PROC_IRON_BALL_RETURN); if (field_0x3018 == 8) { - mCommonCounter = 1; + field_0x300c = 1; setSingleAnimeParam(ANM_IRONBALL_CATCH, &daAlinkHIO_ironBall_c0::m.mCatchAnm); field_0x2f99 = 12; } else { setSingleAnimeBaseSpeed(ANM_IRONBALL_PULL, daAlinkHIO_ironBall_c0::m.mPullAnmSpeed, daAlinkHIO_ironBall_c0::m.mPullInterpolation); field_0x2f99 = 12; - mCommonCounter = 0; + field_0x300c = 0; } field_0x3588 = l_ironBallBaseAnime; @@ -403,8 +403,8 @@ int daAlink_c::procIronBallReturn() { field_0x2f99 = 4; - if (field_0x3018 == 8 && mCommonCounter == 0) { - mCommonCounter = 1; + if (field_0x3018 == 8 && field_0x300c == 0) { + field_0x300c = 1; setSingleAnimeParam(ANM_IRONBALL_CATCH, &daAlinkHIO_ironBall_c0::m.mCatchAnm); field_0x2f99 = 12; seStartOnlyReverb(Z2SE_AL_IB_CATCH); diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index 256d9cbc16..36bfbc8cb4 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -30,7 +30,8 @@ int daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { */ int daAlink_c::procPreActionUnequip() { if (checkNoUpperAnime()) { - if (field_0x300e != 0 && (field_0x27f4 == NULL || field_0x27f4 != field_0x280c.getActor())) { + if (field_0x300e != 0 && (field_0x27f4 == NULL || field_0x27f4 != field_0x280c.getActor())) + { checkWaitAction(); } else if (field_0x3198 == PROC_PUSH_PULL_WAIT) { procCoPushPullWaitInit(1); @@ -91,7 +92,8 @@ int daAlink_c::procServiceWaitInit() { int daAlink_c::procServiceWait() { J3DFrameCtrl* ctrl = &mUnderFrameCtrl[0]; if ((!checkNextAction(0) && !checkFrontWallTypeAction()) && - (checkEventRun() || checkGuardActionChange() || shape_angle.y != field_0x2fe6)) { + (checkEventRun() || checkGuardActionChange() || shape_angle.y != field_0x2fe6)) + { ctrl->setRate(FLOAT_LABEL(lit_6108)); procWaitInit(); } else { @@ -119,7 +121,8 @@ int daAlink_c::procTiredWaitInit() { if (no_upper_anm && ((tired_anm && mNowAnmPackUnder[0].getRatio() < lit_16641) || - checkUnderMove1BckNoArc(ANM_STEP_TURN) || checkUnderMove1BckNoArc(ANM_SMALL_GUARD))) { + checkUnderMove1BckNoArc(ANM_STEP_TURN) || checkUnderMove1BckNoArc(ANM_SMALL_GUARD))) + { f32 var_f31; if (tired_anm) { var_f31 = mUnderFrameCtrl[0].getFrame(); @@ -163,7 +166,8 @@ int daAlink_c::procWaitInit() { } if (!checkEventRun() && mProcID == PROC_SERVICE_WAIT && !mUnderFrameCtrl[0].checkAnmEnd() && - checkNoUpperAnime()) { + checkNoUpperAnime()) + { return 0; } @@ -186,7 +190,8 @@ int daAlink_c::procWaitInit() { initServiceWaitTime(); if (i_checkEndResetFlg0(ERFLG0_UNK_8000000) && - (checkUnderMove0BckNoArc(ANM_WAIT) || checkUnderMove0BckNoArc(ANM_WAIT_TIRED))) { + (checkUnderMove0BckNoArc(ANM_WAIT) || checkUnderMove0BckNoArc(ANM_WAIT_TIRED))) + { setSingleAnimeBase(ANM_WAIT_B_TO_A); } @@ -215,35 +220,25 @@ int daAlink_c::procMoveInit() { } /* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text procMove__9daAlink_cFv */ -// reg swap -#ifdef NONMATCHING int daAlink_c::procMove() { setFootEffectProcType(3); if (!checkNextAction(0) && !checkFrontWallTypeAction()) { if (mDemo.getDemoMode() == 2 && - mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) { + mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) + { mNormalSpeed = field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate; } - setBlendMoveAnime(-1.0f); + setBlendMoveAnime(lit_6041); if (field_0x3174 != 8) { field_0x30a0 = cLib_minMaxLimit((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, daAlinkHIO_basic_c0::m.mNeckMaxDown); } } + return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procMove() { - nofralloc -#include "asm/d/a/d_a_alink/procMove__9daAlink_cFv.s" -} -#pragma pop -#endif /* 800C3810-800C3868 0BE150 0058+00 1/1 0/0 0/0 .text procAtnMoveInit__9daAlink_cFv */ int daAlink_c::procAtnMoveInit() { @@ -414,7 +409,8 @@ int daAlink_c::procMoveTurn() { /* 800C3DA0-800C3F60 0BE6E0 01C0+00 2/2 0/0 0/0 .text procSideStepInit__9daAlink_cFi */ int daAlink_c::procSideStepInit(int jump_type) { if (jump_type == 1 && !checkHeavyStateOn(1, 1) && - (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) { + (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) + { return procBackJumpInit(0); } @@ -449,7 +445,7 @@ int daAlink_c::procSideStepInit(int jump_type) { } voiceStart(Z2SE_AL_V_JUMP_S); - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; return 1; } @@ -468,13 +464,13 @@ int daAlink_c::procSideStep() { } if (doTrigger() && field_0x300a != 0) { - mCommonCounter = 1; + field_0x300c = 1; } if (checkUpperItemActionFly()) { return 1; } else if (mLinkAcch.ChkGroundHit() && field_0x300e != 0) { - if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + if (field_0x300c != 0 && checkSideRollAction(field_0x2f98)) { return 1; } else { return procSideStepLandInit(); @@ -482,7 +478,8 @@ int daAlink_c::procSideStep() { } else if (checkNoUpperAnime() && checkForceSwordSwing()) { setCutDash(1, 0); } else if (mDemo.getDemoMode() != 16 && - current.pos.y < mLastJumpPos.y - daAlinkHIO_sideStep_c0::m.mFallHeight) { + current.pos.y < mLastJumpPos.y - daAlinkHIO_sideStep_c0::m.mFallHeight) + { return procFallInit(2, daAlinkHIO_sideStep_c0::m.mFallInterpolation); } @@ -531,7 +528,7 @@ int daAlink_c::procSideStepLandInit() { setFootEffectProcType(2); i_onResetFlg1(0x30); mNormalSpeed = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; + field_0x300c = 0; current.angle.y = shape_angle.y; setStepLandVibration(); return 1; @@ -547,7 +544,7 @@ int daAlink_c::procSideStepLand() { } if (doTrigger() && field_0x300a != 0) { - mCommonCounter = 1; + field_0x300c = 1; } if (ctrl->checkAnmEnd()) { @@ -557,7 +554,7 @@ int daAlink_c::procSideStepLand() { checkNextAction(0); } } else if (ctrl->getFrame() > field_0x3478) { - if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + if (field_0x300c != 0 && checkSideRollAction(field_0x2f98)) { return 1; } checkNextAction(1); @@ -602,7 +599,7 @@ int daAlink_c::procSlideInit(s16 param_0) { field_0x594 = daAlinkHIO_slide_c0::m.mMaxSpeed; field_0x33cc = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; + field_0x300c = 0; field_0x3010 = 0; return 1; } @@ -703,7 +700,7 @@ int daAlink_c::procFrontRollInit() { } current.angle.y = shape_angle.y; voiceStart(Z2SE_AL_V_BACKTEN); - mCommonCounter = 0; + field_0x300c = 0; setFootEffectProcType(0); if (check) { i_onNoResetFlg0(2); @@ -783,7 +780,8 @@ int daAlink_c::procFrontRollCrash() { } } else if ((mLinkAcch.ChkGroundHit() || i_checkEndResetFlg2(ERFLG2_UNK_100) || i_checkMagneBootsOn()) && - i_checkModeFlg(2)) { + i_checkModeFlg(2)) + { mNormalSpeed = FLOAT_LABEL(lit_6108); setWaterInAnmRate(frameCtrl, daAlinkHIO_frontRoll_c0::m.mCrashAnm.mSpeed); frameCtrl->offEndFlg(); @@ -884,7 +882,7 @@ int daAlink_c::procSideRollInit(int param_0) { if (guard_anime) { i_onNoResetFlg0(FLG0_UNK_2); } - mCommonCounter = 0; + field_0x300c = 0; return 1; } @@ -983,7 +981,8 @@ int daAlink_c::procBackJump() { if (mLinkAcch.ChkGroundHit() && mUnderFrameCtrl[0].checkAnmEnd()) { procBackJumpLandInit(field_0x3198); } else if (mDemo.getDemoMode() != 0x10 && - current.pos.y < mLastJumpPos.y - daAlinkHIO_backJump_c0::m.mFallHeight) { + current.pos.y < mLastJumpPos.y - daAlinkHIO_backJump_c0::m.mFallHeight) + { procFallInit(2, daAlinkHIO_backJump_c0::m.mFallInterpolation); } @@ -1101,7 +1100,7 @@ int daAlink_c::procDiveJumpInit() { mNormalSpeed = daAlinkHIO_autoJump_c0::m.mDiveSpeedH; mGravity = daAlinkHIO_autoJump_c0::m.mDiveGravity; - mCommonCounter = 0; + field_0x300c = 0; current.angle.y = shape_angle.y; field_0x33b0 = 92.0f; @@ -1117,10 +1116,10 @@ int daAlink_c::procDiveJump() { return procFrontRollInit(); } - if (mCommonCounter == 0) { + if (field_0x300c == 0) { if (frameCtrl->checkAnmEnd()) { setSingleAnimeParam(ANM_DIVE, &daAlinkHIO_autoJump_c0::m.mDiveConnectAnm); - mCommonCounter = 1; + field_0x300c = 1; field_0x2f99 = 2; } } else { @@ -1154,7 +1153,7 @@ int daAlink_c::procRollJumpInit() { voiceStart(Z2SE_AL_V_GORONJUMP); seStartOnlyReverb(Z2SE_AL_GORON_JUMP_START); - mCommonCounter = 1; + field_0x300c = 1; return 1; } @@ -1172,11 +1171,11 @@ int daAlink_c::procRollJump() { shape_angle.x += daAlinkHIO_autoJump_c0::m.mSpinJumpRotateSpeed; if (shape_angle.x * old_angle <= 0) { - if (mCommonCounter != 0) { + if (field_0x300c != 0) { seStartOnlyReverb(Z2SE_AL_GORON_JUMP_ROLLING); - mCommonCounter = 0; + field_0x300c = 0; } else { - mCommonCounter = 1; + field_0x300c = 1; } } @@ -1227,7 +1226,8 @@ int daAlink_c::procFall() { if ((field_0x32cc != 0 || ((checkInputOnR() && getDirectionFromShapeAngle() == 0) || doTrigger())) && - checkFrontWallTypeAction()) { + checkFrontWallTypeAction()) + { return 1; } } @@ -1238,10 +1238,10 @@ int daAlink_c::procFall() { setFallVoice(); f32 tmp_f1 = (mFallHeight - current.pos.y) * lit_8782; - if (mCommonCounter == 0 && tmp_f1 > daAlinkHIO_damFall_c0::m.mFallAnmTransitionHeight) { + if (field_0x300c == 0 && tmp_f1 > daAlinkHIO_damFall_c0::m.mFallAnmTransitionHeight) { setSingleAnimeBaseSpeed(ANM_DMG_FALL, FLOAT_LABEL(lit_6108), daAlinkHIO_damFall_c0::m.mFallAnmMorf); - mCommonCounter = 1; + field_0x300c = 1; } if (current.angle.y == shape_angle.y && checkCutJumpInFly()) { @@ -1293,7 +1293,8 @@ int daAlink_c::procLand() { if (checkBootsOrArmorHeavy()) { var_r4 = 3; } else if (i_checkNoResetFlg0(FLG0_UNDERWATER) || - field_0x3478 < daAlinkHIO_damFall_c0::m.mMinRollHeight) { + field_0x3478 < daAlinkHIO_damFall_c0::m.mMinRollHeight) + { var_r4 = 1; } else { var_r4 = 2; @@ -1333,7 +1334,7 @@ int daAlink_c::procStepMoveInit() { field_0x3478 = lit_5943 * mNormalSpeed; mNormalSpeed = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; + field_0x300c = 0; field_0x3588 = l_waitBaseAnime; return 1; @@ -1344,7 +1345,7 @@ int daAlink_c::procStepMoveInit() { int daAlink_c::procStepMove() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (mCommonCounter == 0) { + if (field_0x300c == 0) { field_0x2f99 = 4; if (frameCtrl->checkAnmEnd()) { @@ -1365,7 +1366,7 @@ int daAlink_c::procStepMove() { current.pos.set(field_0x34ec.x + cM_ssin(shape_angle.y) * 2.0f, field_0x34ec.y, field_0x34ec.z + cM_scos(shape_angle.y) * 2.0f); field_0x2f99 = 80; - mCommonCounter = 1; + field_0x300c = 1; } return 1; @@ -1406,7 +1407,8 @@ int daAlink_c::procCrouch() { } if (mDemo.getDemoMode() != 0x29 && - (mSinkShapeOffset <= -80.0f || (i_checkAttentionLock() && checkGuardAccept()))) { + (mSinkShapeOffset <= -80.0f || (i_checkAttentionLock() && checkGuardAccept()))) + { checkNextActionFromCrouch(0); } @@ -1467,13 +1469,14 @@ int daAlink_c::procCoMetamorphoseInit() { mFallVoiceInit = 0; if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || - (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) { + (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) + { field_0x300a = 1; speed.y = 0.0f; mNormalSpeed = 0.0f; if (i_checkWolf()) { - mCommonCounter = shape_angle.x; + field_0x300c = shape_angle.x; } } else { deleteEquipItem(FALSE, TRUE); @@ -1489,11 +1492,11 @@ int daAlink_c::procCoMetamorphoseInit() { field_0x3588 = l_wolfBaseAnime; field_0x347c = 0.5f; field_0x3480 = daAlinkHIO_basic_c0::m.mWolfLinkTransformSpeed; - mCommonCounter = shape_angle.x; + field_0x300c = shape_angle.x; daMidna_c* midna = getMidnaActor(); - if (i_checkMidnaRide() && daMidna_c::checkMidnaRealBody() && - midna->checkDemoTypeNone()) { + if (i_checkMidnaRide() && daMidna_c::checkMidnaRealBody() && midna->checkDemoTypeNone()) + { midna->changeOriginalDemo(); midna->changeDemoMode(15); } @@ -1529,24 +1532,25 @@ int daAlink_c::procCoMetamorphoseInit() { sp8.y = sp14.y; if (commonLineCheck(&sp14, &sp8) && dBgS_CheckBWallPoly(mLinkLinChk) && - dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { + dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) + { var_r28 = true; break; } } if (var_r28) { - mCommonCounter = field_0x2ff0; + field_0x300c = field_0x2ff0; } else { pos -= current.pos; - mCommonCounter = pos.atan2sY_XZ(); + field_0x300c = pos.atan2sY_XZ(); - if (abs(mCommonCounter) > cM_deg2s(70.0f)) { - mCommonCounter = field_0x2ff0; + if (abs(field_0x300c) > cM_deg2s(70.0f)) { + field_0x300c = field_0x2ff0; } } } else { - mCommonCounter = 0; + field_0x300c = 0; } } speed.y = 0.0f; @@ -1629,11 +1633,12 @@ int daAlink_c::procCoMetamorphoseOnlyInit() { deleteEquipItem(0, 1); if ((i_checkWolf() && mDemo.getDemoMode() == 0x46) || - (!i_checkWolf() && mDemo.getDemoMode() == 0x47)) { - mCommonCounter = 1; + (!i_checkWolf() && mDemo.getDemoMode() == 0x47)) + { + field_0x300c = 1; field_0x300e = 1; } else { - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; } @@ -1647,9 +1652,9 @@ int daAlink_c::procCoMetamorphoseOnlyInit() { /* 800C83A0-800C8460 0C2CE0 00C0+00 1/0 0/0 0/0 .text procCoMetamorphoseOnly__9daAlink_cFv */ int daAlink_c::procCoMetamorphoseOnly() { - if (mCommonCounter == 0) { + if (field_0x300c == 0) { mClothesChangeWaitTimer = 4; - mCommonCounter = 1; + field_0x300c = 1; } else if (mClothesChangeWaitTimer == 0) { if (field_0x300e == 0) { field_0x300e = 1; @@ -1804,7 +1809,8 @@ int daAlink_c::execute() { if (checkMagneBootsOn()) { if (checkNoResetFlg0(FLG0_UNK_2000) && dComIfG_Bgsp().ChkPolySafe(mMagneLineChk) && - dComIfG_Bgsp().ChkMoveBG(mMagneLineChk)) { + dComIfG_Bgsp().ChkMoveBG(mMagneLineChk)) + { s16 shape_angle_y = shape_angle.y; s16 angle_y = current.angle.y; f32 pos_y = current.pos.y; @@ -1828,7 +1834,8 @@ int daAlink_c::execute() { } else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) && mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && - dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) { + dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) + { bool uvar23; if (mProcID == PROC_SPINNER_READY) { uvar23 = true; @@ -2006,7 +2013,8 @@ int daAlink_c::execute() { } if (field_0x2fd3 != 0 && mProcID != PROC_BOTTLE_DRINK && mProcID != PROC_CANOE_BOTTLE_DRINK && - mProcID != PROC_HORSE_BOTTLE_DRINK) { + mProcID != PROC_HORSE_BOTTLE_DRINK) + { field_0x2fd3--; } @@ -2035,7 +2043,8 @@ int daAlink_c::execute() { (checkStageName("R_SP109") && (!strcmp(event_name, "MapToolCamera1") || !strcmp(event_name, "MapToolCamera2") || !strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "fire_insect"))) || - (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23"))) { + (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23"))) + { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime + 1; } } @@ -2045,12 +2054,14 @@ int daAlink_c::execute() { mProcID == PROC_WOLF_DIG_THROUGH || checkNoResetFlg0(FLG0_UNK_4000) || dComIfGp_checkPlayerStatus1(0, 0x1000000) || (checkEventRun() && partner != NULL && (partner->mAttentionInfo.mFlags & 0x400000)) || - !strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName)) { + !strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName)) + { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; } else if (mTargetedActor != NULL || dComIfGp_checkPlayerStatus0(0, 0x2000)) { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime - 1; } else if (!dComIfGp_getEvent().isOrderOK() && mProcID != PROC_GET_ITEM && - mWolfEyeUp <= daAlinkHIO_wolf_c0::m.mSensesLingerTime) { + mWolfEyeUp <= daAlinkHIO_wolf_c0::m.mSensesLingerTime) + { offWolfEyeUp(); } else { mWolfEyeUp = 1; @@ -2069,7 +2080,8 @@ int daAlink_c::execute() { if (item_actor != NULL && (!fopAcM_checkCarryNow(item_actor) || (checkNoResetFlg0(FLG0_UNDERWATER) && (checkGrabRooster() || fopAcM_GetName(item_actor) == PROC_E_NEST || - checkGrabCarryActor())))) { + checkGrabCarryActor())))) + { freeGrabItem(); } @@ -2094,7 +2106,8 @@ int daAlink_c::execute() { if (!checkSpecialDemoMode() && mClothesChangeWaitTimer == 0) { if (!checkDemoAction() && !checkDeadAction(0) && !checkNoResetFlg0(FLG0_UNK_100000) && - !checkAutoJumpAction()) { + !checkAutoJumpAction()) + { checkSwimAction(0); } @@ -2131,7 +2144,8 @@ int daAlink_c::execute() { } if (mEquipItem == KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && - (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { + (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) + { if (checkReinRide()) { setUpperAnimeBase(0x264); } else { @@ -2179,7 +2193,8 @@ int daAlink_c::execute() { autoGroundHit(); if (checkNoResetFlg0(FLG0_UNDERWATER) || - (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_UNK_100))) { + (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_UNK_100))) + { f32 var_f31; if (mProcID == PROC_HOOKSHOT_FLY) { var_f31 = current.pos.y - (field_0x598 * 0.5f); @@ -2190,7 +2205,8 @@ int daAlink_c::execute() { } if (!checkNoResetFlg0(FLG0_UNK_80) || - mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight) { + mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight) + { swimOutAfter(0); } } @@ -2213,7 +2229,8 @@ int daAlink_c::execute() { } else if (mProcID == PROC_HOOKSHOT_FLY || mProcID == PROC_MAGNE_BOOTS_FLY || (checkModeFlg(MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING) && mProcID != PROC_HORSE_GETOFF && mProcID != PROC_WOLF_CHAIN_READY && - !checkBoardRide())) { + !checkBoardRide())) + { current.pos = pos; } else if (checkModeFlg(MODE_UNK_4000)) { if (mProcID == PROC_DOOR_OPEN || mProcID == PROC_HANG_LEVER_DOWN) { @@ -2234,7 +2251,8 @@ int daAlink_c::execute() { if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO && mProcID != PROC_GANON_FINISH && mProcID != PROC_DUNGEON_WARP && - (field_0x2f8c == 1 || field_0x2f8c == 3)) { + (field_0x2f8c == 1 || field_0x2f8c == 3)) + { setStepsOffset(); } else { field_0x2b9c = 0.0f; @@ -2257,7 +2275,8 @@ int daAlink_c::execute() { } if (checkNoResetFlg0(FLG0_UNK_80) && !checkNoResetFlg0(FLG0_UNDERWATER) && - mWaterY >= mLinkAcch.GetGroundH()) { + mWaterY >= mLinkAcch.GetGroundH()) + { mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr); } else if (checkEndResetFlg0(ERFLG0_UNK_200000)) { mPolySound = 11; @@ -2336,8 +2355,9 @@ int daAlink_c::execute() { } } - if (checkModeFlg(MODE_VINE_CLIMB) && mCommonCounter != 0 && - dComIfG_Bgsp().ChkPolySafe(mPolyInfo1)) { + if (checkModeFlg(MODE_VINE_CLIMB) && field_0x300c != 0 && + dComIfG_Bgsp().ChkPolySafe(mPolyInfo1)) + { mZ2Link.framework(dKy_pol_sound_get(&mPolyInfo1), mVoiceReverbIntensity); } else { mZ2Link.framework(mPolySound, mVoiceReverbIntensity); @@ -2357,12 +2377,12 @@ int daAlink_c::execute() { if (checkUpperGuardAnime()) { setBodyAngleXReadyAnime(0); } else if (!checkUpperReadyThrowAnime()) { - cLib_addCalcAngleS(&mBodyAngleX, 0, 4, 0x0C00, 0x0180); + cLib_addCalcAngleS(&mBodyAngle.x, 0, 4, 0x0C00, 0x0180); } } if (!checkModeFlg(MODE_UNK_40000000)) { - cLib_addCalcAngleS(&mBodyAngleY, 0, 4, 0x0C00, 0x0180); + cLib_addCalcAngleS(&mBodyAngle.y, 0, 4, 0x0C00, 0x0180); } } } @@ -2384,7 +2404,7 @@ int daAlink_c::execute() { footBgCheck(); handBgCheck(); - field_0x30c8 = mBodyAngleY >> 1; + field_0x30c8 = mBodyAngle.y >> 1; modelCalc(mpLinkModel); if (field_0x2fcb != 0) { @@ -2401,7 +2421,8 @@ int daAlink_c::execute() { stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 && - !dComIfGs_isItemFirstBit(HYLIA_SHIELD)) { + !dComIfGs_isItemFirstBit(HYLIA_SHIELD)) + { fopAcM_onSwitch(this, 0x6F); } seStartOnlyReverb(Z2SE_AL_WOOD_SHIELD_BURN); @@ -2420,7 +2441,8 @@ int daAlink_c::execute() { if (mClothesChangeWaitTimer == 0) { if ((pmidna->checkMidnaTired() || pmidna->checkForceTiredColor()) && - !pmidna->checkForceNormalColor()) { + !pmidna->checkForceNormalColor()) + { field_0x79c->getModelData()->entryTevRegAnimator(field_0x7ac); mpWlMidnaHatModel->getModelData()->entryTevRegAnimator(field_0x7b0); field_0x7a4->getModelData()->entryTevRegAnimator(field_0x7b4); @@ -2495,7 +2517,8 @@ int daAlink_c::execute() { if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) && (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) && - getMoveBGActorName(mLinkAcch.m_wtr, 1) == PROC_Obj_Onsen) { + getMoveBGActorName(mLinkAcch.m_wtr, 1) == PROC_Obj_Onsen) + { if (mHotspringRecoverTimer != 0) { mHotspringRecoverTimer--; } else { @@ -2507,7 +2530,8 @@ int daAlink_c::execute() { } if ((checkAttentionLock() || !checkUpperReadyThrowAnime()) && - mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT) { + mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT) + { mFastShotTime = 0; } @@ -2527,7 +2551,8 @@ int daAlink_c::execute() { mEvtInfo.onCondition(0x5D); } else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE || ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) && - !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) { + !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) + { mEvtInfo.onCondition(1); if (checkReinRide() || checkCanoeRide()) { mEvtInfo.onCondition(8); @@ -2570,7 +2595,8 @@ int daAlink_c::execute() { for (int i = 0; i < 2; i++) { u8 tmp = (i + 1) & 1; if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) && - dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE) { + dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE) + { field_0x2fae |= (1 << tmp); } } @@ -2629,8 +2655,9 @@ int daAlink_c::execute() { } else if (dComIfGp_getDoStatus() == 0x91) { if (checkWolf() || (field_0x27f4 != NULL && - (field_0x27f4->speedF > 0.1f || (checkGoatCatchActor(field_0x27f4) && - fopAcM_GetName(field_0x27f4) != PROC_COW)))) { + (field_0x27f4->speedF > 0.1f || + (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW)))) + { setDoStatusEmphasys(0x15); } else { setDoStatus(0); @@ -2642,11 +2669,13 @@ int daAlink_c::execute() { setDoStatus(0); } } else if (dComIfGp_getDoStatus() == 0x19 && dComIfGp_getHorseActor() != NULL && - dComIfGp_getHorseActor()->getZeldaActor() != NULL) { + dComIfGp_getHorseActor()->getZeldaActor() != NULL) + { setDoStatus(0x19); } else if (dComIfGp_getDoStatus() == 5 && field_0x27f4 != NULL && (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone || - fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) { + fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) + { setDoStatusEmphasys(0x3B); } else if (dComIfGp_getDoStatus() == 0x14) { if (checkEndResetFlg1(ERFLG1_UNK_4000000)) { @@ -2683,7 +2712,8 @@ int daAlink_c::execute() { } if (checkEndResetFlg2(ERFLG2_UNK_20) && dComIfGp_checkPlayerStatus0(0, 0x200000) && - (field_0x310e != field_0x310a || field_0x3110 != field_0x310c)) { + (field_0x310e != field_0x310a || field_0x3110 != field_0x310c)) + { mDoAud_seStartLevel(Z2SE_AL_HAWK_EYE_PAN, NULL, 0, 0); } @@ -2769,7 +2799,8 @@ bool daAlink_c::checkShieldDraw() { bool daAlink_c::checkItemDraw() { if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) { if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() || - field_0x2e44.checkPassNum(15)) { + field_0x2e44.checkPassNum(15)) + { return true; } } @@ -2856,7 +2887,8 @@ void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) { if (&field_0x32a0[0] == i_color) { if (i_checkNoResetFlg2(FLG2_UNK_80000) || checkZoraWearAbility() || - checkMagicArmorWearAbility()) { + checkMagicArmorWearAbility()) + { var_r31 = (J3DGXColorS10*)¬Color0; i_color = (J3DGXColorS10*)¬Color0; } else { @@ -3087,7 +3119,8 @@ asm void daAlink_c::setSubjectMode() { */ BOOL daAlink_c::subjectCancelTrigger() { if (i_checkWolf() || checkNotBattleStage() || !i_checkSwordGet() || - (i_checkModeFlg(0x40000) && !i_checkEquipHeavyBoots())) { + (i_checkModeFlg(0x40000) && !i_checkEquipHeavyBoots())) + { return itemTriggerCheck(BTN_B); } @@ -3163,7 +3196,7 @@ int daAlink_c::procCoSwimSubjectivityInit() { } dComIfGp_setPlayerStatus0(0, 0x100000); - mCommonCounter = 0; + field_0x300c = 0; return 1; } @@ -3195,7 +3228,7 @@ int daAlink_c::procCoPeepSubjectivityInit() { speed.y = FLOAT_LABEL(lit_6108); dComIfGp_setPlayerStatus0(0, 0x2000); field_0x3478 = lit_6183; - mCommonCounter = shape_angle.y; + field_0x300c = shape_angle.y; return 1; } @@ -3516,7 +3549,7 @@ BOOL daAlink_c::checkHorseStart() { /* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv */ BOOL daAlink_c::checkCutTurnCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter == 0; + return mProcID == PROC_CUT_TURN_MOVE && field_0x300c == 0; } /* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ @@ -3538,7 +3571,7 @@ fopAc_ac_c* daAlink_c::getSpinnerActor() { /* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */ s16 daAlink_c::getSumouCounter() const { - return mCommonCounter; + return field_0x300c; } /* 800D027C-800D0284 0CABBC 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daAlink_cCFv @@ -3700,7 +3733,7 @@ BOOL daAlink_c::checkHawkWait() const { /* 800D051C-800D0544 0CAE5C 0028+00 1/0 0/0 0/0 .text checkGoatThrow__9daAlink_cCFv */ BOOL daAlink_c::checkGoatThrow() const { - return mProcID == PROC_GOAT_CATCH && mCommonCounter != 0; + return mProcID == PROC_GOAT_CATCH && field_0x300c != 0; } /* 800D0544-800D0570 0CAE84 002C+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daAlink_cCFv @@ -3775,7 +3808,7 @@ BOOL daAlink_c::checkCutCharge() const { /* 800D0688-800D06B0 0CAFC8 0028+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daAlink_cCFv */ BOOL daAlink_c::checkCutLargeJumpCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter != 0; + return mProcID == PROC_CUT_TURN_MOVE && field_0x300c != 0; } /* 800D06B0-800D06D8 0CAFF0 0028+00 1/0 0/0 0/0 .text checkComboCutTurn__9daAlink_cCFv */ @@ -3823,7 +3856,7 @@ BOOL daAlink_c::checkCutJumpCancelTurn() const { /* 800D07D4-800D07FC 0CB114 0028+00 1/0 0/0 0/0 .text * checkSingleBoarBattleSecondBowReady__9daAlink_cCFv */ BOOL daAlink_c::checkSingleBoarBattleSecondBowReady() const { - return mProcID == PROC_HORSE_BOW_SUBJECT && mCommonCounter != 0; + return mProcID == PROC_HORSE_BOW_SUBJECT && field_0x300c != 0; } /* 800D07FC-800D0818 0CB13C 001C+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daAlink_cFv */ @@ -3933,7 +3966,7 @@ void daAlink_c::setSumouGraspCancelCount(int param_0) { if (mProcID != PROC_SUMOU_MOVE) { return; } - mCommonCounter = param_0; + field_0x300c = param_0; } /* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv @@ -3960,7 +3993,7 @@ BOOL daAlink_c::checkCutJumpMode() const { /* 800D09DC-800D09E4 0CB31C 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daAlink_cCFv */ s16 daAlink_c::getGiantPuzzleAimAngle() const { - return mCommonCounter; + return field_0x300c; } /* 800D09E4-800D09EC 0CB324 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daAlink_cCFv */ diff --git a/src/d/a/d_a_alink_spinner.inc b/src/d/a/d_a_alink_spinner.inc index 016fd8e163..5a82a47f91 100644 --- a/src/d/a/d_a_alink_spinner.inc +++ b/src/d/a/d_a_alink_spinner.inc @@ -148,7 +148,7 @@ int daAlink_c::procSpinnerReadyInit() { field_0x3588 = l_waitBaseAnime; field_0x33b0 = field_0x3588.y; field_0x34d4 = l_waitBaseAnime; - mCommonCounter = 8; + field_0x300c = 8; return 1; } @@ -164,11 +164,11 @@ int daAlink_c::procSpinnerReady() { current.pos.x = spinner->current.pos.x; current.pos.z = spinner->current.pos.z; - mCommonCounter--; + field_0x300c--; field_0x2f99 = 15; - if ((mCommonCounter < 0 && current.pos.y <= spinner->getModelMtx()[1][3]) || - mCommonCounter < -30) { + if ((field_0x300c < 0 && current.pos.y <= spinner->getModelMtx()[1][3]) || + field_0x300c < -30) { current.pos.y = spinner->getModelMtx()[1][3]; procSpinnerWaitInit(); } @@ -197,7 +197,7 @@ int daAlink_c::procSpinnerWaitInit() { speed.y = 0.0f; setSpecialGravity(0.0f, mMaxFallSpeed, 0); mNormalSpeed = 0.0f; - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = shape_angle.y; field_0x3010 = 0; @@ -237,9 +237,9 @@ int daAlink_c::procSpinnerWait() { } int itemSetBtn = checkItemSetButton(SPINNER); - if (mCommonCounter == 0) { + if (field_0x300c == 0) { if (!itemButton()) { - mCommonCounter = 1; + field_0x300c = 1; mNormalSpeed = getSpinnerRideSpeedF(); spinner->setMove(mNormalSpeed, getSpinnerRideMoveTime()); } else if (checkInputOnR()) { diff --git a/src/d/a/d_a_alink_sumou.inc b/src/d/a/d_a_alink_sumou.inc index aa9da1facc..d9712988e0 100644 --- a/src/d/a/d_a_alink_sumou.inc +++ b/src/d/a/d_a_alink_sumou.inc @@ -46,7 +46,7 @@ int daAlink_c::procSumouReadyInit() { field_0x34d4 = field_0x3588; field_0x2f99 = 4; mSpecialMode = 1; - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; deleteEquipItem(0, 1); @@ -208,7 +208,7 @@ int daAlink_c::procSumouShikoInit() { field_0x3588 = l_waitBaseAnime; field_0x34d4 = field_0x3588; field_0x2f99 = 12; - mCommonCounter = 0; + field_0x300c = 0; mSpecialMode = 0; setFootEffectProcType(5); diff --git a/src/d/a/d_a_alink_swim.inc b/src/d/a/d_a_alink_swim.inc index 81a3f68252..f6b6f15256 100644 --- a/src/d/a/d_a_alink_swim.inc +++ b/src/d/a/d_a_alink_swim.inc @@ -1,3 +1,5 @@ +#include "f_op/f_op_kankyo_mng.h" + /* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv */ BOOL daAlink_c::checkZoraWearMaskDraw() { @@ -57,7 +59,9 @@ f32 daAlink_c::getSwimMaxFallSpeed() const { void daAlink_c::checkOxygenTimer() { BOOL hide_timer; - if (!i_checkNoResetFlg0(FLG0_UNK_100) || (i_checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y)) { + if (!i_checkNoResetFlg0(FLG0_UNK_100) || + (i_checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y)) + { hide_timer = false; } else { hide_timer = true; @@ -99,7 +103,8 @@ void daAlink_c::offOxygenTimer() { /* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */ BOOL daAlink_c::checkPossibleWaterInMode() const { - return i_checkModeFlg(MODE_VINE_CLIMB) || i_dComIfGp_checkPlayerStatus1(0, 0x2000000) || mProcID == PROC_HOOKSHOT_FLY; + return i_checkModeFlg(MODE_VINE_CLIMB) || i_dComIfGp_checkPlayerStatus1(0, 0x2000000) || + mProcID == PROC_HOOKSHOT_FLY; } /* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text @@ -117,6 +122,83 @@ void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) { } /* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text swimBgCheck__9daAlink_cFf */ +#ifdef NONMATCHING +void daAlink_c::swimBgCheck(f32 param_0) { + i_offNoResetFlg1(FLG1_UNK_20000000); + + if (!getZoraSwim() && mProcID != PROC_METAMORPHOSE) { + return; + } + + cXyz start_pos(current.pos); + cXyz end_pos; + + s16 uvar1; + if (getZoraSwim()) { + uvar1 = field_0x3080; + } else { + uvar1 = field_0x300c; + start_pos.y += daAlinkHIO_wlWallHang_c0::m.field_0x78; + } + + end_pos.set(start_pos.x + (param_0 * cM_scos(uvar1)) * cM_ssin(shape_angle.y), + start_pos.y - param_0 * cM_ssin(uvar1), + start_pos.z + (param_0 * cM_scos(uvar1)) * cM_scos(shape_angle.y)); + + if (!commonLineCheck(&start_pos, &end_pos)) { + return; + } + + cM3dGPla tri; + dComIfG_Bgsp().GetTriPla(mLinkLinChk, &tri); + + if (cBgW_CheckBWall(tri.mNormal.y) && + (mProcID != PROC_METAMORPHOSE || dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7)) + { + cXyz tmp2 = end_pos - mLinkLinChk.i_GetCross(); + f32 absxz = tmp2.absXZ(); + + s16 svar8 = tmp2.atan2sX_Z(); + s16 svar9 = cM_atan2s(-tri.mNormal.x, -tri.mNormal.z); + f32 cos = cM_scos(svar8 - svar9); + + f32 fvar14 = -absxz * cos * tri.mNormal.x; + f32 fvar15 = -absxz * cos * tri.mNormal.z; + + if (mProcID == PROC_METAMORPHOSE || + (getZoraSwim() && cLib_distanceAngleS(cM_atan2s(tri.mNormal.y, tri.mNormal.absXZ()), + field_0x3080) < 0x1000)) + { + i_onNoResetFlg1(FLG1_UNK_20000000); + } + + start_pos.x -= fvar14; + start_pos.z -= fvar15; + end_pos.x -= fvar14; + end_pos.z -= fvar15; + + if (commonLineCheck(&start_pos, &end_pos)) { + dComIfG_Bgsp().GetTriPla(mLinkLinChk, &tri); + + if (cBgW_CheckBWall(tri.mNormal.y)) { + tmp2 = end_pos - mLinkLinChk.i_GetCross(); + f32 absxz2 = tmp2.absXZ(); + + s16 svar8_2 = tmp2.atan2sX_Z(); + s16 svar9_2 = cM_atan2s(-tri.mNormal.x, -tri.mNormal.z); + f32 cos_2 = cM_scos(svar8_2 - svar9_2); + + fvar14 += -absxz2 * cos_2 * tri.mNormal.x; + fvar15 += -absxz2 * cos_2 * tri.mNormal.z; + } + } + + current.pos.x -= fvar14; + current.pos.z -= fvar15; + field_0x3092 = cM_atan2s(-fvar14, -fvar15); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -125,6 +207,7 @@ asm void daAlink_c::swimBgCheck(f32 param_0) { #include "asm/d/a/d_a_alink/swimBgCheck__9daAlink_cFf.s" } #pragma pop +#endif /* 801023E4-801029C8 0FCD24 05E4+00 3/3 0/0 0/0 .text setSpeedAndAngleSwim__9daAlink_cFv */ @@ -152,7 +235,9 @@ int daAlink_c::checkNextActionSwim() { return 1; } - if (mAttList != NULL && mAttList->mType == 7 && i_checkNoResetFlg0(FLG0_UNK_100) && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + if (mAttList != NULL && mAttList->mType == 7 && i_checkNoResetFlg0(FLG0_UNK_100) && + fopAcM_GetName(field_0x27f4) == PROC_CANOE) + { setDoStatus(0x17); if (doTrigger()) { @@ -191,8 +276,6 @@ asm int daAlink_c::checkSwimUpAction() { #pragma pop /* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */ -// setInWater needs work -#ifdef NONMATCHING void daAlink_c::swimOutAfter(int param_0) { i_onNoResetFlg0(FLG0_UNK_100); i_onEndResetFlg1(ERFLG1_UNK_100); @@ -213,16 +296,6 @@ void daAlink_c::swimOutAfter(int param_0) { resetUpperAnime(UPPER_2, lit_6109); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swimOutAfter(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s" -} -#pragma pop -#endif /* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text checkSwimFall__9daAlink_cFv */ bool daAlink_c::checkSwimFall() { @@ -267,7 +340,8 @@ bool daAlink_c::checkUpSwimButtonAccept() { /* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv */ BOOL daAlink_c::checkSwimButtonMove() { - return !i_checkNoResetFlg0(FLG0_UNK_100) && (checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton(); + return !i_checkNoResetFlg0(FLG0_UNK_100) && + (checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton(); } /* 80103F94-80103FE8 0FE8D4 0054+00 3/3 0/0 0/0 .text checkZoraSwimMove__9daAlink_cFv */ @@ -284,7 +358,7 @@ BOOL daAlink_c::checkSwimNeckUpDown() const { /* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv */ void daAlink_c::setSwimUpDownOffset() { - mCommonCounter += (s16)((cM_rndF(lit_16570) + lit_27477) * lit_27476); + field_0x300c += (s16)((cM_rndF(lit_16570) + lit_27477) * lit_27476); f32 var_f1; if (i_checkWolf()) { @@ -297,70 +371,280 @@ void daAlink_c::setSwimUpDownOffset() { var_f1 = daAlinkHIO_swim_c0::m.mWaitVibrationIntensity; } - field_0x2b98 = var_f1 * cM_ssin(mCommonCounter); + field_0x2b98 = var_f1 * cM_ssin(field_0x300c); } /* 801040F8-801041E8 0FEA38 00F0+00 2/2 0/0 0/0 .text procSwimUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s" +int daAlink_c::procSwimUpInit() { + commonProcInit(PROC_SWIM_UP); + + if (field_0x3000 != 0 && !checkZoraWearAbility()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + + speed.y = FLOAT_LABEL(lit_6108); + current.pos.y = mWaterY; + field_0x3080 = 0; + i_onNoResetFlg0(FLG0_UNK_100); + mZ2Link.setInWater(false); + setSingleAnimeParam(ANM_SWIM_RESURFACE, &daAlinkHIO_swim_c0::m.mResurfaceAnm); + dComIfGp_setPlayerStatus0(0, 0x100000); + field_0x3008 = 0; + field_0x3010 = 0; + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + field_0x3000 = 0; + + seStartMapInfo(Z2SE_AL_OUTOF_WATER); + swimDeleteItem(); + field_0x2fcd = 15; + return 1; } -#pragma pop /* 801041E8-801042F8 0FEB28 0110+00 1/0 0/0 0/0 .text procSwimUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimUp() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s" +int daAlink_c::procSwimUp() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + setNormalSpeedF(FLOAT_LABEL(lit_6108), daAlinkHIO_swim_c0::m.mDeceleration); + + if (checkSetItemTrigger(HVY_BOOTS)) { + setHeavyBoots(1); + } + + if (checkBootsOrArmorHeavy()) { + if (checkInputOnR()) { + procSwimMoveInit(); + } else { + procSwimWaitInit(0); + } + } else if (checkAnmEnd(frame_ctrl)) { + procSwimWaitInit(0); + } else if (frame_ctrl->getFrame() > daAlinkHIO_swim_c0::m.mResurfaceAnm.mCheckFrame && + checkInputOnR()) + { + procSwimMoveInit(); + } else { + current.pos.y = mWaterY; + } + + return 1; } -#pragma pop /* 801042F8-801044B4 0FEC38 01BC+00 15/15 0/0 0/0 .text procSwimWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s" +int daAlink_c::procSwimWaitInit(int param_0) { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + u32 mode_40000 = i_checkModeFlg(0x40000); + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + i_offNoResetFlg0(FLG0_UNDERWATER); + current.pos.y += daAlinkHIO_swim_c0::m.mInitHeight; + } + + commonProcInit(PROC_SWIM_WAIT); + + if (param_0) { + seStartMapInfo(Z2SE_AL_INTO_WATER); + field_0x3010 = 0; + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + } else if (!mode_40000) { + field_0x3010 = 0; + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + } + + swimDeleteItem(); + + if (!checkUnderMove0BckNoArc(ANM_SWIM_WAIT)) { + setSingleAnimeBaseSpeed(ANM_SWIM_WAIT, daAlinkHIO_swim_c0::m.mWaitAnmSpeed, + daAlinkHIO_swim_c0::m.mWaitInterpolation); + } else if (frame_ctrl->getRate() < lit_9054) { + setSingleAnimeBaseSpeed(ANM_SWIM_WAIT, daAlinkHIO_swim_c0::m.mWaitAnmSpeed, lit_6041); + } + + field_0x30d0 = 0; + field_0x3198 = 0x14; + field_0x32cc = mEquipItem; + + if (field_0x3080 != 0) { + setOldRootQuaternion(field_0x3080, 0, 0); + field_0x3080 = 0; + } + + dComIfGp_setPlayerStatus0(0, 0x100000); + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + current.pos.y = mWaterY; + speed.y = FLOAT_LABEL(lit_6108); + } + + field_0x300c = 0; + field_0x3008 = 0; + field_0x594 = getSwimFrontMaxSpeed(); + return 1; } -#pragma pop /* 801044B4-80104670 0FEDF4 01BC+00 1/0 0/0 0/0 .text procSwimWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimWait() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s" +int daAlink_c::procSwimWait() { + if (mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) { + setShapeAngleToTalkActor(); + current.angle.y = shape_angle.y; + } + + mMaxFallSpeed = getSwimMaxFallSpeed(); + field_0x594 = getSwimFrontMaxSpeed(); + + setSpeedAndAngleSwim(); + + if (mEquipItem != field_0x32cc) { + field_0x32cc = mEquipItem; + setSingleAnimeBaseSpeed(ANM_SWIM_WAIT, daAlinkHIO_swim_c0::m.mWaitAnmSpeed, + daAlinkHIO_swim_c0::m.mWaitInterpolation); + } + + setSwimUpDownOffset(); + + if (i_checkEquipHeavyBoots() && mEquipItem != NO_ITEM) { + setDoStatus(0x4); + } + + if (checkSwimUpAction()) { + return 1; + } + + if (checkNextActionSwim()) { + return 1; + } + + if (checkFrontWallTypeAction()) { + swimOutAfter(1); + return 1; + } + + if (checkSwimButtonAccept() && doTrigger()) { + procSwimDiveInit(); + } else if ((checkInputOnR() && mNormalSpeed >= daAlinkHIO_swim_c0::m.mForwardMinSpeed) || + (checkUpSwimButtonAccept() && doButton())) + { + if (checkUpSwimButtonAccept() && doButton()) { + field_0x3000 = 30; + } + + procSwimMoveInit(); + } + + return 1; } -#pragma pop /* 80104670-801047B8 0FEFB0 0148+00 9/9 0/0 0/0 .text procSwimMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s" +int daAlink_c::procSwimMoveInit() { + u32 mode_40000 = i_checkModeFlg(0x40000); + bool proc_dive_jump = mProcID == PROC_DIVE_JUMP; + bool proc_swim_dive = mProcID == PROC_SWIM_DIVE; + + commonProcInit(PROC_SWIM_MOVE); + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + i_offNoResetFlg0(FLG0_UNDERWATER); + } + + if (!mode_40000) { + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + field_0x3010 = 0; + } + + if (proc_swim_dive || proc_dive_jump) { + field_0x3198 = 199; + + if (proc_dive_jump) { + field_0x3080 = 0x2800; + field_0x300e = field_0x3080; + field_0x3010 = 1; + setOldRootQuaternion(-field_0x3080, 0, 0); + } + } else { + field_0x3198 = -1; + } + + field_0x2f98 = 5; + setSwimMoveAnime(); + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + current.pos.y = mWaterY; + speed.y = FLOAT_LABEL(lit_6108); + } + + swimDeleteItem(); + dComIfGp_setPlayerStatus0(0, 0x100000); + field_0x3008 = 0; + return 1; } -#pragma pop /* 801047B8-80104958 0FF0F8 01A0+00 1/0 0/0 0/0 .text procSwimMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s" +int daAlink_c::procSwimMove() { + setSpeedAndAngleSwim(); + + if (checkUpSwimButtonAccept() && doButton()) { + field_0x3000 = 30; + } + + setSwimMoveAnime(); + + if (checkSwimUpAction()) { + return 1; + } + + if (checkNextActionSwim()) { + return 1; + } + + if (checkInputOnR() && checkFrontWallTypeAction()) { + swimOutAfter(1); + return 1; + } + + if (checkSwimButtonAccept() && doTrigger() && !getZoraSwim()) { + procSwimDiveInit(); + } else if (i_dComIfGp_getDoStatus() == 9 && doTrigger()) { + i_onNoResetFlg1(FLG1_DASH_MODE); + field_0x30d0 = daAlinkHIO_swim_c0::m.field_0x5c; + setSingleAnimeParam(ANM_SWIM_DASH, &daAlinkHIO_swim_c0::m.mDashAnm); + field_0x3198 = 0xC6; + } else if (!checkZoraSwimMove() && (!checkUpSwimButtonAccept() || !doButton()) && + mNormalSpeed < daAlinkHIO_swim_c0::m.mForwardMinSpeed) + { + procSwimWaitInit(0); + } + + return 1; } -#pragma pop /* 80104958-80104AA0 0FF298 0148+00 4/4 0/0 0/0 .text procSwimDiveInit__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSwimDiveInit() { + commonProcInit(PROC_SWIM_DIVE); + setSpecialGravity(0.0f, mMaxFallSpeed, 0); + speed.y = 0.0f; + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + field_0x300c = 1; + setSingleAnimeParam(ANM_SWIM_DIVE, &daAlinkHIO_swim_c0::m.mDiveAnm); + voiceStart(Z2SE_AL_V_DIVING); + } else { + field_0x300c = 0; + setSingleAnimeParam(ANM_SWIM_DIVE, &daAlinkHIO_swim_c0::m.mUnderwaterDiveAnm); + } + + field_0x2f99 = 0x10; + field_0x3588 = l_waitBaseAnime; + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + field_0x3010 = 0; + + dComIfGp_setPlayerStatus0(0, 0x100000); + field_0x3000 = 30; + field_0x3478 = 0.0f; + field_0x347c = 1.0f / daAlinkHIO_swim_c0::m.mUnderwaterDiveAnm.mEndFrame; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -369,8 +653,55 @@ asm int daAlink_c::procSwimDiveInit() { #include "asm/d/a/d_a_alink/procSwimDiveInit__9daAlink_cFv.s" } #pragma pop +#endif /* 80104AA0-80104C50 0FF3E0 01B0+00 1/0 0/0 0/0 .text procSwimDive__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSwimDive() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (field_0x300c == 0) { + setDoStatus(0x4C); + } else if (i_checkNoResetFlg0(FLG0_UNK_100) && frame_ctrl->getFrame() > 20.0f) { + i_offNoResetFlg0(FLG0_UNK_100); + mZ2Link.setInWater(true); + } + + field_0x2f99 = 7; + field_0x3000 = 30; + setNormalSpeedF(0.0f, daAlinkHIO_swim_c0::m.mDeceleration); + + field_0x3478 = field_0x347c * frame_ctrl->getFrame(); + if (field_0x3478 > 1.0f) { + field_0x3478 = 1.0f; + } + + if (frame_ctrl->checkPass(15.0f) && field_0x300c != 0) { + cXyz pos(current.pos.x, mWaterY, current.pos.z); + fopKyM_createWpillar(&pos, 0.7f, 0); + } + + if (mLinkAcch.GetGroundH() > current.pos.y - field_0x598 * 0.5f) { + current.pos.y = field_0x598 * 0.5f + mLinkAcch.GetGroundH(); + } + + if (checkAnmEnd(frame_ctrl)) { + speed.y = daAlinkHIO_swim_c0::m.mMaxSinkSpeed; + + if (field_0x300c != 0) { + field_0x3080 = 0x2800; + field_0x300e = field_0x3080; + field_0x3010 = 1; + } + + setOldRootQuaternion(-field_0x3080, 0, 0); + return procSwimMoveInit(); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -379,50 +710,261 @@ asm int daAlink_c::procSwimDive() { #include "asm/d/a/d_a_alink/procSwimDive__9daAlink_cFv.s" } #pragma pop +#endif /* 80104C50-80104D7C 0FF590 012C+00 1/1 0/0 0/0 .text procSwimHookshotSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimHookshotSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s" +int daAlink_c::procSwimHookshotSubjectInit() { + if (!commonProcInitNotSameProc(PROC_SWIM_HOOKSHOT_SUBJECT)) { + return 0; + } + + initHookshotUpperAnimeSpeed(1); + + if (!checkUnderMove0BckNoArc(ANM_SWIM_WAIT)) { + setSingleAnimeBaseSpeed(ANM_SWIM_WAIT, daAlinkHIO_swim_c0::m.mWaitAnmSpeed, + daAlinkHIO_hookshot_c0::m.mStartInterpolation); + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + + if (field_0x3080 != 0) { + setOldRootQuaternion(field_0x3080, 0, 0); + field_0x3080 = 0; + } + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + current.pos.y = mWaterY; + speed.y = FLOAT_LABEL(lit_6108); + } + + field_0x300c = 0; + field_0x3008 = 0; + field_0x594 = getSwimFrontMaxSpeed(); + + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + field_0x3010 = 0; + field_0x30d0 = 0; + + setHookshotReadyMaterial(); + dComIfGp_setPlayerStatus0(0, 0x104000); + return 1; } -#pragma pop /* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimHookshotSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s" +int daAlink_c::procSwimHookshotSubject() { + mMaxFallSpeed = getSwimMaxFallSpeed(); + field_0x594 = getSwimFrontMaxSpeed(); + + if (checkHookshotWait()) { + setDoStatus(0x12); + } + + setShapeAngleToAtnActor(0); + mSight.offDrawFlg(); + + if (checkSwimUpAction()) { + return 1; + } + + if (checkNextActionFromButton()) { + return 1; + } + + if (!checkHookshotAnime()) { + return procSwimWaitInit(0); + } + + if (!checkNextActionHookshot()) { + if (checkHookshotWait()) { + if (setBodyAngleToCamera()) { + setHookshotSight(); + } + + dComIfGp_clearPlayerStatus0(0, 0x40000); + } else { + dComIfGp_setPlayerStatus0(0, 0x40000); + } + } + + return 1; } -#pragma pop /* 80104EB8-80104FC4 0FF7F8 010C+00 1/1 0/0 0/0 .text procSwimHookshotMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimHookshotMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s" +int daAlink_c::procSwimHookshotMoveInit() { + if (!commonProcInitNotSameProc(PROC_SWIM_HOOKSHOT_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + initHookshotUpperAnimeSpeed(0); + field_0x3198 = -1; + field_0x2f98 = 5; + + if (field_0x3018 == 0) { + setSwimMoveAnime(); + } + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + current.pos.y = mWaterY; + speed.y = FLOAT_LABEL(lit_6108); + } + + field_0x3008 = 0; + + if (field_0x3080 != 0) { + setOldRootQuaternion(field_0x3080, 0, 0); + field_0x3080 = 0; + } + + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + field_0x3010 = 0; + field_0x30d0 = 0; + + dComIfGp_setPlayerStatus0(0, 0x104000); + return 1; } -#pragma pop /* 80104FC4-8010519C 0FF904 01D8+00 1/0 0/0 0/0 .text procSwimHookshotMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwimHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s" +int daAlink_c::procSwimHookshotMove() { + cancelHookshotMove(); + + if (checkHookshotWait() && !checkZoraWearAbility()) { + setDoStatus(0x12); + } + + if (field_0x3018 == 0) { + setSpeedAndAngleSwim(); + setSwimMoveAnime(); + } + + if (checkSwimUpAction()) { + return 1; + } + + if (checkSwimButtonAccept() && doTrigger()) { + return procSwimDiveInit(); + } + + if (checkUpSwimButtonAccept() && doTrigger()) { + field_0x3000 = 30; + return procSwimMoveInit(); + } + + if (checkHookshotWait() || checkBossOctaIealRoom()) { + setShapeAngleToAtnActor(0); + } + + if (checkNextActionFromButton()) { + return 1; + } + + if (!checkHookshotAnime()) { + return procSwimWaitInit(0); + } + + if (!checkNextActionHookshot()) { + if (checkZeroSpeedF()) { + onModeFlg(1); + } else { + offModeFlg(1); + } + + if (checkHookshotWait() || (mTargetedActor != NULL && checkBossOctaIealRoom())) { + setBodyAngleXReadyAnime(0); + } + } + + return 1; } -#pragma pop /* 8010519C-80105728 0FFADC 058C+00 1/1 0/0 0/0 .text * procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf */ +// instruction block order issue +#ifdef NONMATCHING +int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { + seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL); + dComIfGp_getVibration().StartShock(2, 31, cXyz(0.0f, 1.0f, 0.0f)); + + BOOL bvar4 = + i_checkNoResetFlg0(FLG0_UNK_100) || ((param_0 != NULL && param_0->GetTgHitAc() != NULL) && + fopAcM_GetName(param_0->GetTgHitAc()) == PROC_E_SG); + + if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) { + return 1; + } + + cXyz* temp_r30; + cXyz sp30; + + if (param_0 != NULL) { + temp_r30 = (cXyz*)getDamageVec(param_0); + } else { + sp30.set(-cM_ssin(current.angle.y), 0.0f, -cM_scos(current.angle.y)); + temp_r30 = &sp30; + } + + f32 scale = + temp_r30->abs() * daAlinkHIO_damSwim_c0::m.field_0x80 + daAlinkHIO_damSwim_c0::m.field_0x7C; + if (scale > daAlinkHIO_damSwim_c0::m.field_0x88) { + scale = daAlinkHIO_damSwim_c0::m.field_0x88; + } + + field_0x3750 = temp_r30->normZP(); + field_0x3750 *= scale; + + if (getZoraSwim()) { + setUpperAnimeParam(0xBF, UPPER_2, &daAlinkHIO_damSwim_c0::m.field_0x50); + setFacePriBck(0xEA); + setFacePriTexture(FTANM_UNK_27); + return 1; + } + + commonProcInit(PROC_SWIM_DAMAGE); + cXyz sp24(temp_r30->z * -cM_ssin(shape_angle.y) + temp_r30->x * cM_scos(shape_angle.y), + temp_r30->y, + temp_r30->z * cM_scos(shape_angle.y) + temp_r30->x * cM_ssin(shape_angle.y)); + + field_0x3008 = + cLib_minMaxLimit(cM_atan2s(sp24.z, sp24.y), (s16)-daAlinkHIO_damSwim_c0::m.field_0x78, + (s16)daAlinkHIO_damSwim_c0::m.field_0x78); + + field_0x300a = cLib_minMaxLimit( + cM_atan2s(sp24.x, -JMAFastSqrt(sp24.y * sp24.y + sp24.z * sp24.z)), + (s16)-daAlinkHIO_damSwim_c0::m.field_0x7A, (s16)daAlinkHIO_damSwim_c0::m.field_0x7A); + + int dir = getDirectionFromAngle(cM_atan2s(-sp24.x, -sp24.z)); + if (bvar4) { + setSingleAnimeParam(ANM_SWIM_DMG_FREEZE, &daAlinkHIO_damSwim_c0::m.field_0x64); + field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x64.mCheckFrame; + field_0x3008 = 0; + field_0x300a = 0; + } else if (dir == DIR_FORWARD) { + setSingleAnimeParam(ANM_SWIM_DMG_FRONT, &daAlinkHIO_damSwim_c0::m.field_0x0); + field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x0.mCheckFrame; + } else if (dir == DIR_BACKWARD) { + setSingleAnimeParam(ANM_SWIM_DMG_BACK, &daAlinkHIO_damSwim_c0::m.field_0x14); + field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x14.mCheckFrame; + } else if (dir == DIR_LEFT) { + setSingleAnimeParam(ANM_SWIM_DMG_LEFT, &daAlinkHIO_damSwim_c0::m.field_0x28); + field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x28.mCheckFrame; + } else { + setSingleAnimeParam(ANM_SWIM_DMG_RIGHT, &daAlinkHIO_damSwim_c0::m.field_0x3C); + field_0x3478 = daAlinkHIO_damSwim_c0::m.field_0x3C.mCheckFrame; + } + + mNormalSpeed = 0.0f; + field_0x347c = 3.141593f / (mUnderFrameCtrl->getEnd() - mUnderFrameCtrl->getStart()); + field_0x3480 = daAlinkHIO_swim_c0::m.mInitHeight; + current.angle.y = shape_angle.y; + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -431,8 +973,38 @@ asm int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { #include "asm/d/a/d_a_alink/procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf.s" } #pragma pop +#endif /* 80105728-801058A0 100068 0178+00 1/0 0/0 0/0 .text procSwimDamage__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSwimDamage() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + f32 fvar8 = cM_fsin(field_0x347c * (frame_ctrl->getFrame() - frame_ctrl->getStart())); + mBodyAngle.x = field_0x3008 * fvar8; + mBodyAngle.z = -field_0x300a * fvar8; + mBodyAngle.y = 0; + + if (checkSwimUpAction()) { + return 1; + } + + if (checkAnmEnd(frame_ctrl)) { + if (!checkNextActionSwim()) { + return procSwimWaitInit(0); + } + } else if (frame_ctrl->getFrame() > field_0x3478) { + onModeFlg(4); + + if (!checkNextActionSwim() && checkInputOnR()) { + return procSwimMoveInit(); + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -441,9 +1013,55 @@ asm int daAlink_c::procSwimDamage() { #include "asm/d/a/d_a_alink/procSwimDamage__9daAlink_cFv.s" } #pragma pop +#endif /* 801058A0-80105A00 1001E0 0160+00 2/2 0/0 0/0 .text procOctaIealSpitInit__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procOctaIealSpitInit() { + u32 temp_r30 = i_checkModeFlg(MODE_SWIMMING); + commonProcInit(PROC_OCTAIEAL_SPIT); + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + i_offNoResetFlg0(FLG0_UNDERWATER); + } + + setSingleAnimeBase(ANM_MORPHEEL_SPIT_OUT); + field_0x3750 = cXyz::Zero; + field_0x3080 = 0; + field_0x3000 = 0; + speed.y = field_0x340c; + mNormalSpeed = field_0x3408; + field_0x3478 = field_0x3408 * 0.1f; + + setDamagePointNormal(field_0x318c); + + if (field_0x3478 < 1.0f) { + field_0x3478 = 1.0f; + } + + if (temp_r30) { + field_0x2f99 = 15; + field_0x33b0 = -45.0f; + } else { + field_0x2f99 = 16; + current.pos.y += 145.0f; + } + + field_0x3588 = l_waitBaseAnime; + i_offNoResetFlg0(FLG0_UNK_100); + current.angle.y = field_0x2ffe; + + if (mNormalSpeed > 0.0f) { + shape_angle.y = current.angle.y + 0x8000; + } else { + shape_angle.y = current.angle.y; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -452,6 +1070,7 @@ asm int daAlink_c::procOctaIealSpitInit() { #include "asm/d/a/d_a_alink/procOctaIealSpitInit__9daAlink_cFv.s" } #pragma pop +#endif /* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text procOctaIealSpit__9daAlink_cFv */ int daAlink_c::procOctaIealSpit() { diff --git a/src/d/a/d_a_alink_whistle.inc b/src/d/a/d_a_alink_whistle.inc index 7b30d84c25..8b6781e56f 100644 --- a/src/d/a/d_a_alink_whistle.inc +++ b/src/d/a/d_a_alink_whistle.inc @@ -67,7 +67,7 @@ int daAlink_c::procGrassWhistleGetInit() { field_0x280c.setData(field_0x27f4); daObjYobikusa_c* yobikusa = (daObjYobikusa_c*)field_0x27f4; - mCommonCounter = yobikusa->getType(); + field_0x300c = yobikusa->getType(); field_0x300e = yobikusa->getPathID(); field_0x3010 = yobikusa->isPlayerCorrect(); field_0x3012 = yobikusa->shape_angle.y + 0x8000; @@ -94,9 +94,9 @@ int daAlink_c::procGrassWhistleGet() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; if (frameCtrl->checkAnmEnd()) { - procGrassWhistleWaitInit(mCommonCounter, field_0x300e, field_0x3010, field_0x3012, &field_0x37c8); + procGrassWhistleWaitInit(field_0x300c, field_0x300e, field_0x3010, field_0x3012, &field_0x37c8); } else if (mEquipItem == NO_ITEM && frameCtrl->getFrame() >= lit_7710) { - setGrassWhistleModel(mCommonCounter); + setGrassWhistleModel(field_0x300c); if (field_0x280c.getActor() != NULL) { fopAcM_setCarryNow(field_0x280c.getActor(), 0); @@ -199,8 +199,8 @@ int daAlink_c::procHawkSubjectInit() { field_0x280c.setData(actor); } - mCommonCounter = 0; - mBodyAngleY = 0; + field_0x300c = 0; + mBodyAngle.y = 0; deleteEquipItem(0, 1); return 1; } diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index 3f1df634e4..25ed52f66c 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -71,7 +71,7 @@ void daAlink_c::setWolfDigStatus(u8 flag) { BOOL daAlink_c::checkWolfShapeReverse() const { return ((mProcID == PROC_WOLF_SLIDE_READY || mProcID == PROC_WOLF_LOCK_ATTACK_TURN || mProcID == PROC_WOLF_JUMP_AT_SLIDE_LAND) && - mCommonCounter != 0) || + field_0x300c != 0) || mProcID == PROC_WOLF_SLIP_TURN_LAND || (mProcID == PROC_WOLF_LARGE_DAMAGE_UP && field_0x3198 != 0) || mProcID == PROC_WOLF_ROPE_TURN; @@ -855,7 +855,7 @@ asm int daAlink_c::procWolfBackJumpInit(int param_0) { /* 8012E508-8012E5F4 128E48 00EC+00 1/0 0/0 0/0 .text procWolfBackJump__9daAlink_cFv */ int daAlink_c::procWolfBackJump() { - cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, + cLib_addCalcAngleS(&shape_angle.y, field_0x300c, daAlinkHIO_wlAtnMove_c0::m.field_0x4, daAlinkHIO_wlAtnMove_c0::m.field_0x0, daAlinkHIO_wlAtnMove_c0::m.field_0x2); @@ -940,7 +940,7 @@ int daAlink_c::procWolfHowlInit(int param_0) { } mNormalSpeed = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; + field_0x300c = 0; return 1; } @@ -1007,7 +1007,7 @@ int daAlink_c::procWolfLandInit() { setSingleWolfAnimeParam(WANM_JUMP_ATTACK_END, &daAlinkHIO_wlAutoJump_c0::m.field_0x14); field_0x3478 = daAlinkHIO_wlAutoJump_c0::m.field_0x14.mCheckFrame; - mCommonCounter = 1; + field_0x300c = 1; field_0x2f9d = 4; setFootEffectProcType(4); @@ -1030,7 +1030,7 @@ asm int daAlink_c::procWolfLandInit() { int daAlink_c::procWolfLand() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (mCommonCounter != 0) { + if (field_0x300c != 0) { field_0x2f99 = 4; } @@ -1092,7 +1092,7 @@ int daAlink_c::procWolfStepMoveInit() { setSingleAnimeWolfParam(WANM_BUMP_START, &daAlinkHIO_wlWallHang_c0::m.field_0x50); field_0x3478 = 0.5f * mNormalSpeed; mNormalSpeed = 0.0f; - mCommonCounter = 0; + field_0x300c = 0; field_0x3588 = l_wolfBaseAnime; current.pos.x -= cM_ssin(shape_angle.y) * 10.0f; @@ -1367,7 +1367,7 @@ void daAlink_c::setWolfHowlNotHappen(int param_0) { field_0x32cc = 0x535; } - mCommonCounter = 0; + field_0x300c = 0; if (!checkUnderMove0BckNoArcWolf(WANM_HOWL_END)) { if (param_0 != 0) { @@ -1628,7 +1628,7 @@ int daAlink_c::procWolfRopeSubjectivityInit() { setSingleAnimeWolfBaseSpeed(WANM_ROPE_WALK, FLOAT_LABEL(lit_6108), daAlinkHIO_wlRope_c0::m.field_0x20); } - mCommonCounter = initWolfRopeShapeAngle(); + field_0x300c = initWolfRopeShapeAngle(); current.angle.y = shape_angle.y; setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); @@ -1752,7 +1752,7 @@ int daAlink_c::procWolfGiantPuzzleInit() { current.angle.y = shape_angle.y; field_0x2f98 = 4; - mCommonCounter = shape_angle.y; + field_0x300c = shape_angle.y; field_0x3478 = FLOAT_LABEL(lit_6108); field_0x347c = daAlinkHIO_wlMoveNoP_c0::m.field_0x10; field_0x594 = daAlinkHIO_wlMoveNoP_c0::m.field_0x8; @@ -1802,7 +1802,7 @@ int daAlink_c::procWolfHangReadyInit() { 12, daAlinkHIO_wlWallHang_c0::m.field_0x0.mInterpolation); field_0x3198 = field_0x2f91; - mCommonCounter = field_0x306e + 0x8000; + field_0x300c = field_0x306e + 0x8000; f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; @@ -1815,11 +1815,11 @@ int daAlink_c::procWolfHangReadyInit() { int daAlink_c::procWolfHangReady() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, 2, 0x1000, 0x400); + cLib_addCalcAngleS(&shape_angle.y, field_0x300c, 2, 0x1000, 0x400); current.angle.y = shape_angle.y; if (frameCtrl->checkAnmEnd()) { - shape_angle.y = mCommonCounter; + shape_angle.y = field_0x300c; current.angle.y = shape_angle.y; if (!procWolfHangWallCatchInit(field_0x3198)) { @@ -1975,7 +1975,7 @@ int daAlink_c::procWolfScreamWaitInit() { setWolfScreamWaitAnime(); } else { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, daAlinkHIO_wlMove_c0::m.field_0xBC); - mCommonCounter = 0; + field_0x300c = 0; } mNormalSpeed = FLOAT_LABEL(lit_6108); @@ -2007,7 +2007,7 @@ int daAlink_c::procWolfScreamWait() { daAlinkHIO_wlDamLarge_c0::m.field_0x0.mInterpolation); field_0x2f99 = 13; } - } else if (mCommonCounter == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + } else if (field_0x300c == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { setWolfScreamWaitAnime(); } @@ -2705,7 +2705,7 @@ int daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) { field_0x2f9d = 0x18; mNormalSpeed = FLOAT_LABEL(lit_6108); field_0x3012 = 0; - mCommonCounter = param_0; + field_0x300c = param_0; field_0x2f99 = 12; field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; @@ -2733,7 +2733,7 @@ int daAlink_c::procWolfJumpAttackNormalLand() { if (frameCtrl->checkAnmEnd()) { checkNextActionWolf(0); } else if (frameCtrl->getFrame() > daAlinkHIO_wlAtLand_c0::m.field_0x0.mCheckFrame) { - if (mCommonCounter != 0) { + if (field_0x300c != 0) { shape_angle.y -= -0x8000; return procWolfJumpAttackInit(3); } @@ -2965,7 +2965,7 @@ int daAlink_c::procWolfEnemyHangBiteInit() { field_0x2f99 = 0x50; field_0x3008 = daAlinkHIO_wlAtBite_c0::m.field_0x28; field_0x300a = 0; - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; field_0x3478 = daAlinkHIO_wlAtBite_c0::m.field_0x40; field_0x3010 = shape_angle.y; @@ -3089,14 +3089,14 @@ int daAlink_c::procWolfPush() { field_0x2f99 = 4; if (frameCtrl->checkAnmEnd()) { - if (mCommonCounter != 0) { + if (field_0x300c != 0) { setSingleAnimeWolf(WANM_PUSH_LIGHT, lit_6040, FLOAT_LABEL(lit_6108), field_0x300e, lit_6109); mUnderFrameCtrl[0].setAttribute(0); - mCommonCounter = 0; + field_0x300c = 0; } else { checkNextActionWolf(0); } - } else if (mCommonCounter == 0 && frameCtrl->checkPass(lit_52470)) { + } else if (field_0x300c == 0 && frameCtrl->checkPass(lit_52470)) { if (field_0x280c.getActor() != NULL) { fopAcM_setCarryNow(field_0x280c.getActor(), 0); } @@ -3128,10 +3128,10 @@ int daAlink_c::procWolfCargoCarryInit() { daAlink_WANM wanm; if (checkCargoCarry()) { - mCommonCounter = 1; + field_0x300c = 1; wanm = WANM_WAIT_KARGOROK; } else { - mCommonCounter = 0; + field_0x300c = 0; fopAc_ac_c* cargo_actor = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchEnemyCargo, NULL); if (cargo_actor != NULL) { @@ -3224,7 +3224,7 @@ int daAlink_c::procWolfChainReadyInit() { field_0x280c.setData(field_0x27f4); setSingleAnimeWolfParam(WANM_ATTACK_A_START, &daAlinkHIO_wlAtNjump_c0::m.field_0x0); mNormalSpeed = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; + field_0x300c = 0; field_0x300e = 0; return 1; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index bd0cec2e52..ff1c6fe29d 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -584,7 +584,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u8 data_80450B44[4]; extern "C" u8 stopStatus__10fopAc_ac_c[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 7abc70abf2..d4e23512b4 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1427,10 +1427,6 @@ bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNa /* 80451DE0-80451DE8 0003E0 0008+00 1/1 0/0 0/0 .sdata2 @5123 */ SECTION_SDATA2 static f64 lit_5123 = 1.0 / 29.999998435378155; -inline Z2SoundStarter* Z2GetSoundStarter() { - return data_80450B74; -} - /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ #ifdef NONMATCHING void dDemo_c::create() { diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index b597366a57..08c4b158e6 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -76,7 +76,6 @@ SECTION_SDATA2 static f32 lit_3862 = 2.0f; SECTION_SDATA2 static f32 lit_3863 = 45.0f; /* 8009CA48-8009CB14 097388 00CC+00 0/0 1/1 0/0 .text update__12dEyeHL_mng_cFv */ -// small issue with cLib_minMaxLimit #ifdef NONMATCHING void dEyeHL_mng_c::update() { dEyeHL_mng_c* obj = m_obj; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index fe0bac2ca8..8d4dab58e9 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -2244,20 +2244,9 @@ static int dStage_lgtvInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, /* 80025738-80025744 020078 000C+00 0/0 1/1 0/0 .text * dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi */ -#ifdef NONMATCHING u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) { - return p_info[layer].mParticleNo; + return p_info->mParticleNo[layer]; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) { - nofralloc -#include "asm/d/d_stage/dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi.s" -} -#pragma pop -#endif /* 80025744-8002582C 020084 00E8+00 1/0 0/0 0/0 .text dStage_stagInfoInit__FP11dStage_dt_cPviPv */ static int dStage_stagInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) { diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index c7f83f2ca9..521b7d2a91 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -555,7 +555,6 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 data_80450B70[4]; extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 246bad975f..f1893ffe22 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -353,7 +353,6 @@ extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */] extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 data_80450B70[4]; extern "C" u8 m_control__7dDemo_c[4]; extern "C" u8 m_mesgControl__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 79f62ba9f3..59040fd36a 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -10,18 +10,6 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_dvd_thread.h" -// -// Types: -// - -struct JAIStreamDataMgr { - /* 802A3AD8 */ ~JAIStreamDataMgr(); -}; - -struct JAISoundInfo { - /* 802A2D50 */ ~JAISoundInfo(); -}; - // // Forward References: // @@ -87,19 +75,6 @@ extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; extern "C" extern void* __vt__11Z2SoundInfo[20]; extern "C" extern void* __vt__15Z2SpeechStarter[5]; extern "C" extern void* __vt__10Z2AudioMgr[3]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B64[4]; -extern "C" extern u8 data_80450B68[4]; -extern "C" extern u8 data_80450B6C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 4cf30775e9..4da4290994 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -5,6 +5,8 @@ #include "m_Do/m_Do_main.h" #include "DynamicLink.h" +#include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JFramework/JFWSystem.h" #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JUtility/JUTAssert.h" @@ -20,36 +22,12 @@ #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" -#include "JSystem/JAudio2/JASGadget.h" -#include "JSystem/JAudio2/JASAudioThread.h" // // Forward References: // extern "C" extern char const* const m_Do_m_Do_main__stringBase0; -extern "C" extern u8 data_80450B38[4]; -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B54[4]; -extern "C" extern u8 data_80450B58[4]; -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B64[4]; -extern "C" extern u8 data_80450B68[4]; -extern "C" extern u8 data_80450B6C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B78[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 data_80450B8C[4]; -extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; // // External References: @@ -153,7 +131,8 @@ void CheckHeap(u32 i_padNo) { // if L + R + Z is pressed if ((mDoCPd_c::getHold(i_padNo) & ~CButton::Z) == (CButton::L + CButton::R) && - mDoCPd_c::getTrig(i_padNo) & CButton::Z) { + mDoCPd_c::getTrig(i_padNo) & CButton::Z) + { comboCheck = true; } @@ -321,8 +300,8 @@ bool Debug_console(u32 i_padNo) { console_scroll_init = 1; } - if (mDoCPd_c::getTrig(i_padNo) & CButton::Z && - !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) { + if (mDoCPd_c::getTrig(i_padNo) & CButton::Z && !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) + { console->setVisible(console->isVisible() == false); JUTAssertion::setMessageCount(0); } @@ -330,12 +309,14 @@ bool Debug_console(u32 i_padNo) { if (console->isVisible()) { u32 holdButtons = mDoCPd_c::getHold(i_padNo); if ((holdButtons & CButton::L && holdButtons & CButton::R) || - ((mDoCPd_c::getAnalogL(i_padNo) > 0.0f && mDoCPd_c::getAnalogR(i_padNo) > 0.0f))) { + ((mDoCPd_c::getAnalogL(i_padNo) > 0.0f && mDoCPd_c::getAnalogR(i_padNo) > 0.0f))) + { f32 stick_x = mDoCPd_c::getStickX(i_padNo); f32 stick_y = mDoCPd_c::getStickY(i_padNo); if (holdButtons & (CButton::Y | CButton::X) && - mDoCPd_c::getTrig(i_padNo) & CButton::START) { + mDoCPd_c::getTrig(i_padNo) & CButton::START) + { console->clear(); } @@ -433,13 +414,15 @@ static void debug() { } if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::R && - mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) { + mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) + { mDisplayHeapSize ^= 1; } if (mDisplayHeapSize) { if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::L && - mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) { + mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) + { mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ : mDoMain::mHeapBriefType = 1; } @@ -631,129 +614,91 @@ REGISTER_CTORS(0x800065E0, __sinit_m_Do_main_cpp); /* ############################################################################################## */ /* 80450B38-80450B3C 000038 0004+00 0/0 2/2 0/0 .sbss * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -extern u8 data_80450B38[4]; -u8 data_80450B38[4]; +Z2WolfHowlMgr* JASGlobalInstance::sInstance; /* 80450B3C-80450B40 00003C 0004+00 0/0 6/6 0/0 .sbss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> */ -extern u8 data_80450B3C[4]; -u8 data_80450B3C[4]; +Z2EnvSeMgr* JASGlobalInstance::sInstance; /* 80450B40-80450B44 000040 0004+00 0/0 6/6 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2FxLineMgr> */ -extern u8 data_80450B40[4]; -u8 data_80450B40[4]; +Z2FxLineMgr* JASGlobalInstance::sInstance; /* 80450B44-80450B48 000044 0004+00 0/0 18/18 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2Audience> */ -extern u8 data_80450B44[4]; -u8 data_80450B44[4]; +Z2Audience* JASGlobalInstance::sInstance; /* 80450B48-80450B4C 000048 0004+00 0/0 17/17 0/0 .sbss * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -extern u8 data_80450B48[4]; -u8 data_80450B48[4]; +Z2SoundObjMgr* JASGlobalInstance::sInstance; /* 80450B4C-80450B50 00004C 0004+00 0/0 10/10 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2SoundInfo> */ -extern u8 data_80450B4C[4]; -u8 data_80450B4C[4]; +Z2SoundInfo* JASGlobalInstance::sInstance; /* 80450B50-80450B54 000050 0004+00 0/0 5/5 0/0 .sbss * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -extern u8 data_80450B50[4]; -u8 data_80450B50[4]; +JAUSoundInfo* JASGlobalInstance::sInstance; /* 80450B54-80450B58 000054 0004+00 0/0 2/2 0/0 .sbss * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -extern u8 data_80450B54[4]; -u8 data_80450B54[4]; +JAUSoundNameTable* JASGlobalInstance::sInstance; /* 80450B58-80450B5C 000058 0004+00 0/0 12/12 0/0 .sbss * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -extern u8 data_80450B58[4]; -u8 data_80450B58[4]; +JAUSoundTable* JASGlobalInstance::sInstance; /* 80450B5C-80450B60 00005C 0004+00 0/0 6/6 0/0 .sbss * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -extern u8 data_80450B5C[4]; -u8 data_80450B5C[4]; +JAISoundInfo* JASGlobalInstance::sInstance; /* 80450B60-80450B64 000060 0004+00 0/0 29/29 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2SoundMgr> */ -// TODO: fix type -Z2SoundMgr* data_80450B60; +Z2SoundMgr* JASGlobalInstance::sInstance; /* 80450B64-80450B68 000064 0004+00 0/0 2/2 0/0 .sbss * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -extern u8 data_80450B64[4]; -u8 data_80450B64[4]; +JAIStreamMgr* JASGlobalInstance::sInstance; /* 80450B68-80450B6C 000068 0004+00 0/0 3/3 0/0 .sbss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -extern u8 data_80450B68[4]; -u8 data_80450B68[4]; +JAISeqMgr* JASGlobalInstance::sInstance; /* 80450B6C-80450B70 00006C 0004+00 0/0 4/4 0/0 .sbss sInstance__28JASGlobalInstance<8JAISeMgr> */ -extern u8 data_80450B6C[4]; -u8 data_80450B6C[4]; +JAISeMgr* JASGlobalInstance::sInstance; /* 80450B70-80450B74 000070 0004+00 0/0 9/9 0/0 .sbss * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -extern u8 data_80450B70[4]; -u8 data_80450B70[4]; +Z2SpeechMgr2* JASGlobalInstance::sInstance; /* 80450B74-80450B78 000074 0004+00 0/0 22/22 0/0 .sbss * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -extern u8 data_80450B74[4]; -u8 data_80450B74[4]; +Z2SoundStarter* JASGlobalInstance::sInstance; /* 80450B78-80450B7C 000078 0004+00 0/0 2/2 0/0 .sbss * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -extern u8 data_80450B78[4]; -u8 data_80450B78[4]; +JAISoundStarter* JASGlobalInstance::sInstance; /* 80450B7C-80450B80 00007C 0004+00 0/0 34/34 0/0 .sbss * sInstance__32JASGlobalInstance<11Z2StatusMgr> */ -extern u8 data_80450B7C[4]; -u8 data_80450B7C[4]; +Z2StatusMgr* JASGlobalInstance::sInstance; /* 80450B80-80450B84 000080 0004+00 0/0 46/46 0/0 .sbss * sInstance__31JASGlobalInstance<10Z2SceneMgr> */ -extern u8 data_80450B80[4]; -u8 data_80450B80[4]; +Z2SceneMgr* JASGlobalInstance::sInstance; /* 80450B84-80450B88 000084 0004+00 0/0 38/38 0/0 .sbss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -extern u8 data_80450B84[4]; -u8 data_80450B84[4]; +Z2SeqMgr* JASGlobalInstance::sInstance; /* 80450B88-80450B8C 000088 0004+00 0/0 25/25 0/0 .sbss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -extern u8 data_80450B88[4]; -u8 data_80450B88[4]; +Z2SeMgr* JASGlobalInstance::sInstance; /* 80450B8C-80450B90 00008C 0004+00 0/0 6/6 0/0 .sbss * sInstance__35JASGlobalInstance<14JASAudioThread> */ -extern u8 data_80450B8C[4]; -u8 data_80450B8C[4]; -//JASAudioThread* JASGlobalInstance::sInstance; +JASAudioThread* JASGlobalInstance::sInstance; /* 80450B90-80450B98 000090 0004+04 0/0 4/4 0/0 .sbss * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -extern u8 data_80450B90[4 + 4 /* padding */]; -u8 data_80450B90[4 + 4 /* padding */]; - -/* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss None */ -bool __OSReport_disable; - -bool __OSReport_Error_disable; - -bool __OSReport_Warning_disable; - -bool __OSReport_System_disable; - -/* 80450B9C-80450BA0 00009C 0004+00 0/0 3/3 0/0 .sbss None */ -bool __OSReport_enable; - -/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +JASDefaultBankTable* JASGlobalInstance::sInstance; diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 58606fb4df..4b61d7155d 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -12,6 +12,18 @@ #include "dolphin/base/PPCArch.h" #include "MSL_C/MSL_Common/Src/file_io.h" +/* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss None */ +u8 __OSReport_disable; + +u8 __OSReport_Error_disable; + +u8 __OSReport_Warning_disable; + +u8 __OSReport_System_disable; + +/* 80450B9C-80450BA0 00009C 0004+00 0/0 3/3 0/0 .sbss None */ +u8 __OSReport_enable; + /* 80006798-800067C8 0010D8 0030+00 1/1 0/0 0/0 .text OSSwitchFiberEx__FUlUlUlUlUlUl */ #pragma push #pragma optimization_level 0 diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index baad240efb..0a2981c7d0 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -129,7 +129,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 data_80450B70[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; //