Merge remote-tracking branch 'upstream/master' into m_Do_audio2

This commit is contained in:
jdflyer
2021-01-21 21:58:53 -07:00
798 changed files with 7656 additions and 12286 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef __Z2SOUNDMGR_H__
#define __Z2SOUNDMGR_H__
#ifndef Z2SOUNDMGR_H_
#define Z2SOUNDMGR_H_
class Z2SoundMgr;
@@ -30,7 +30,7 @@ lbl_802A9F50:
/* 802A9F54 002A6E94 90 01 00 20 */ stw r0, 0x20(r1)
/* 802A9F58 002A6E98 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13)
/* 802A9F5C 002A6E9C 38 81 00 20 */ addi r4, r1, 0x20
/* 802A9F60 002A6EA0 48 01 1B 69 */ bl Z2SoundInfo_NS_getSwBit
/* 802A9F60 002A6EA0 48 01 1B 69 */ bl getSwBit__11Z2SoundInfoCF10JAISoundID
/* 802A9F64 002A6EA4 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c
/* 802A9F68 002A6EA8 41 82 00 4C */ beq lbl_802A9FB4
/* 802A9F6C 002A6EAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)