mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-06 11:07:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start Z2SceneMgr and Various Fixes (#11)

Browse Source 
* Start Z2SceneMgr

* Various Fixes After Merge

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
jdflyer
2020-12-02 18:35:32 -07:00
committed by GitHub
parent 3b18e45c56
commit 7643baec7d
39 changed files with 3808 additions and 3579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/JAudio2/JAISoundParams.s
+2 -2
View File
@@ -3,8 +3,8 @@
.section .text, "ax" # 802a2db4
.global JAISoundParamsMove_NS_moveVolume
JAISoundParamsMove_NS_moveVolume:
.global moveVolume__18JAISoundParamsMoveFfUl
moveVolume__18JAISoundParamsMoveFfUl:
/* 802A2DB4 0029FCF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A2DB8 0029FCF8 28 04 00 00 */ cmplwi r4, 0
/* 802A2DBC 0029FCFC 40 82 00 14 */ bne lbl_802A2DD0
asm/JStudio_JAudio2/object-sound.s
+1 -1
View File
@@ -10,7 +10,7 @@ JStudio_JAudio2_NS__unnamed_object_sound_cpp__NS_setValue_VOLUME_:
/* 8028D730 0028A670 90 01 00 14 */ stw r0, 0x14(r1)
/* 8028D734 0028A674 38 80 00 00 */ li r4, 0
/* 8028D738 0028A678 38 63 00 48 */ addi r3, r3, 0x48
/* 8028D73C 0028A67C 48 01 56 79 */ bl JAISoundParamsMove_NS_moveVolume
/* 8028D73C 0028A67C 48 01 56 79 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 8028D740 0028A680 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8028D744 0028A684 7C 08 03 A6 */ mtlr r0
/* 8028D748 0028A688 38 21 00 10 */ addi r1, r1, 0x10
asm/Z2AudioLib/Z2AudioMgr.s
+14 -14
View File
@@ -15,7 +15,7 @@ Z2AudioMgr:
/* 802CD264 002CA1A4 38 7F 03 D0 */ addi r3, r31, 0x3d0
/* 802CD268 002CA1A8 4B FE 1C 39 */ bl Z2SeqMgr
/* 802CD26C 002CA1AC 38 7F 04 A4 */ addi r3, r31, 0x4a4
/* 802CD270 002CA1B0 4B FE 95 D1 */ bl Z2SceneMgr
/* 802CD270 002CA1B0 4B FE 95 D1 */ bl __ct__10Z2SceneMgrFv
/* 802CD274 002CA1B4 38 7F 04 C4 */ addi r3, r31, 0x4c4
/* 802CD278 002CA1B8 4B FE 8C A5 */ bl Z2StatusMgr
/* 802CD27C 002CA1BC 38 7F 04 F4 */ addi r3, r31, 0x4f4
@@ -144,52 +144,52 @@ Z2AudioMgr_NS_init:
/* 802CD458 002CA398 38 7F 00 1C */ addi r3, r31, 0x1c
/* 802CD45C 002CA39C C0 2D 82 78 */ lfs f1, lbl_804507F8-_SDA_BASE_(r13)
/* 802CD460 002CA3A0 38 80 00 00 */ li r4, 0
/* 802CD464 002CA3A4 4B FD 59 51 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD464 002CA3A4 4B FD 59 51 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD468 002CA3A8 38 7F 00 88 */ addi r3, r31, 0x88
/* 802CD46C 002CA3AC C0 2D 82 7C */ lfs f1, lbl_804507FC-_SDA_BASE_(r13)
/* 802CD470 002CA3B0 38 80 00 00 */ li r4, 0
/* 802CD474 002CA3B4 4B FD 59 41 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD474 002CA3B4 4B FD 59 41 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD478 002CA3B8 38 7F 00 F4 */ addi r3, r31, 0xf4
/* 802CD47C 002CA3BC C0 2D 82 80 */ lfs f1, lbl_80450800-_SDA_BASE_(r13)
/* 802CD480 002CA3C0 38 80 00 00 */ li r4, 0
/* 802CD484 002CA3C4 4B FD 59 31 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD484 002CA3C4 4B FD 59 31 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD488 002CA3C8 38 7F 01 60 */ addi r3, r31, 0x160
/* 802CD48C 002CA3CC C0 2D 82 84 */ lfs f1, lbl_80450804-_SDA_BASE_(r13)
/* 802CD490 002CA3D0 38 80 00 00 */ li r4, 0
/* 802CD494 002CA3D4 4B FD 59 21 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD494 002CA3D4 4B FD 59 21 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD498 002CA3D8 38 7F 01 CC */ addi r3, r31, 0x1cc
/* 802CD49C 002CA3DC C0 2D 82 90 */ lfs f1, lbl_80450810-_SDA_BASE_(r13)
/* 802CD4A0 002CA3E0 38 80 00 00 */ li r4, 0
/* 802CD4A4 002CA3E4 4B FD 59 11 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4A4 002CA3E4 4B FD 59 11 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4A8 002CA3E8 38 7F 02 38 */ addi r3, r31, 0x238
/* 802CD4AC 002CA3EC C0 2D 82 88 */ lfs f1, lbl_80450808-_SDA_BASE_(r13)
/* 802CD4B0 002CA3F0 38 80 00 00 */ li r4, 0
/* 802CD4B4 002CA3F4 4B FD 59 01 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4B4 002CA3F4 4B FD 59 01 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4B8 002CA3F8 38 7F 02 A4 */ addi r3, r31, 0x2a4
/* 802CD4BC 002CA3FC C0 2D 82 8C */ lfs f1, lbl_8045080C-_SDA_BASE_(r13)
/* 802CD4C0 002CA400 38 80 00 00 */ li r4, 0
/* 802CD4C4 002CA404 4B FD 58 F1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4C4 002CA404 4B FD 58 F1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4C8 002CA408 38 7F 03 10 */ addi r3, r31, 0x310
/* 802CD4CC 002CA40C C0 2D 82 88 */ lfs f1, lbl_80450808-_SDA_BASE_(r13)
/* 802CD4D0 002CA410 38 80 00 00 */ li r4, 0
/* 802CD4D4 002CA414 4B FD 58 E1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4D4 002CA414 4B FD 58 E1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4D8 002CA418 38 7F 03 7C */ addi r3, r31, 0x37c
/* 802CD4DC 002CA41C C0 2D 82 90 */ lfs f1, lbl_80450810-_SDA_BASE_(r13)
/* 802CD4E0 002CA420 38 80 00 00 */ li r4, 0
/* 802CD4E4 002CA424 4B FD 58 D1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4E4 002CA424 4B FD 58 D1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4E8 002CA428 38 7F 03 E8 */ addi r3, r31, 0x3e8
/* 802CD4EC 002CA42C C0 2D 82 94 */ lfs f1, lbl_80450814-_SDA_BASE_(r13)
/* 802CD4F0 002CA430 38 80 00 00 */ li r4, 0
/* 802CD4F4 002CA434 4B FD 58 C1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD4F4 002CA434 4B FD 58 C1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD4F8 002CA438 38 7F 06 D4 */ addi r3, r31, 0x6d4
/* 802CD4FC 002CA43C C0 22 C5 5C */ lfs f1, lbl_80455F5C-_SDA2_BASE_(r2)
/* 802CD500 002CA440 38 80 00 00 */ li r4, 0
/* 802CD504 002CA444 4B FD 58 B1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD504 002CA444 4B FD 58 B1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD508 002CA448 3B BE 0C 58 */ addi r29, r30, 0xc58
/* 802CD50C 002CA44C 38 7D 00 14 */ addi r3, r29, 0x14
/* 802CD510 002CA450 C0 2D 82 74 */ lfs f1, lbl_804507F4-_SDA_BASE_(r13)
/* 802CD514 002CA454 38 80 00 00 */ li r4, 0
/* 802CD518 002CA458 4B FD 58 9D */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD518 002CA458 4B FD 58 9D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD51C 002CA45C 38 60 00 50 */ li r3, 0x50
/* 802CD520 002CA460 7F 64 DB 78 */ mr r4, r27
/* 802CD524 002CA464 38 A0 00 00 */ li r5, 0
@@ -255,7 +255,7 @@ lbl_802CD5F4:
/* 802CD5F8 002CA538 38 7E 0C D0 */ addi r3, r30, 0xcd0
/* 802CD5FC 002CA53C C0 2D 82 74 */ lfs f1, lbl_804507F4-_SDA_BASE_(r13)
/* 802CD600 002CA540 38 80 00 00 */ li r4, 0
/* 802CD604 002CA544 4B FD 57 B1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD604 002CA544 4B FD 57 B1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CD608 002CA548 88 0D 8D D4 */ lbz r0, lbl_80451354-_SDA_BASE_(r13)
/* 802CD60C 002CA54C 7C 00 07 75 */ extsb. r0, r0
/* 802CD610 002CA550 40 82 00 34 */ bne lbl_802CD644
asm/Z2AudioLib/Z2Creature.s
+16 -16
View File
@@ -322,7 +322,7 @@ lbl_802C07C8:
/* 802C0834 002BD774 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C0838 002BD778 38 63 00 48 */ addi r3, r3, 0x48
/* 802C083C 002BD77C 38 80 00 00 */ li r4, 0
/* 802C0840 002BD780 4B FE 25 75 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C0840 002BD780 4B FE 25 75 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C0844 002BD784 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C0848 002BD788 38 63 00 48 */ addi r3, r3, 0x48
/* 802C084C 002BD78C FC 20 F8 90 */ fmr f1, f31
@@ -428,7 +428,7 @@ lbl_802C0988:
/* 802C09C4 002BD904 38 63 00 48 */ addi r3, r3, 0x48
/* 802C09C8 002BD908 FC 20 F8 90 */ fmr f1, f31
/* 802C09CC 002BD90C 38 80 00 00 */ li r4, 0
/* 802C09D0 002BD910 4B FE 23 E5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C09D0 002BD910 4B FE 23 E5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C09D4 002BD914 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C09D8 002BD918 38 63 00 48 */ addi r3, r3, 0x48
/* 802C09DC 002BD91C FC 20 F0 90 */ fmr f1, f30
@@ -448,7 +448,7 @@ lbl_802C09EC:
/* 802C0A10 002BD950 C0 02 C2 0C */ lfs f0, lbl_80455C0C-_SDA2_BASE_(r2)
/* 802C0A14 002BD954 EC 21 00 24 */ fdivs f1, f1, f0
/* 802C0A18 002BD958 38 80 00 00 */ li r4, 0
/* 802C0A1C 002BD95C 4B FE 23 99 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C0A1C 002BD95C 4B FE 23 99 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C0A20:
/* 802C0A20 002BD960 7F E3 FB 78 */ mr r3, r31
lbl_802C0A24:
@@ -1032,7 +1032,7 @@ lbl_802C11E8:
/* 802C1284 002BE1C4 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1288 002BE1C8 FC 20 F8 90 */ fmr f1, f31
/* 802C128C 002BE1CC 38 80 00 00 */ li r4, 0
/* 802C1290 002BE1D0 4B FE 1B 25 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C1290 002BE1D0 4B FE 1B 25 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C1294 002BE1D4 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C1298 002BE1D8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C129C 002BE1DC FC 20 F0 90 */ fmr f1, f30
@@ -1184,7 +1184,7 @@ lbl_802C146C:
/* 802C14C4 002BE404 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C14C8 002BE408 38 63 00 48 */ addi r3, r3, 0x48
/* 802C14CC 002BE40C 38 80 00 00 */ li r4, 0
/* 802C14D0 002BE410 4B FE 18 E5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C14D0 002BE410 4B FE 18 E5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C14D4 002BE414 48 00 01 8C */ b lbl_802C1660
lbl_802C14D8:
/* 802C14D8 002BE418 7F C4 F3 78 */ mr r4, r30
@@ -1232,7 +1232,7 @@ lbl_802C14E4:
/* 802C157C 002BE4BC 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1580 002BE4C0 FC 20 F0 90 */ fmr f1, f30
/* 802C1584 002BE4C4 38 80 00 00 */ li r4, 0
/* 802C1588 002BE4C8 4B FE 18 2D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C1588 002BE4C8 4B FE 18 2D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C158C 002BE4CC 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C1590 002BE4D0 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1594 002BE4D4 FC 20 F8 90 */ fmr f1, f31
@@ -1281,7 +1281,7 @@ lbl_802C15A4:
/* 802C163C 002BE57C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1640 002BE580 FC 20 F0 90 */ fmr f1, f30
/* 802C1644 002BE584 38 80 00 00 */ li r4, 0
/* 802C1648 002BE588 4B FE 17 6D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C1648 002BE588 4B FE 17 6D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C164C 002BE58C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C1650 002BE590 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1654 002BE594 FC 20 F8 90 */ fmr f1, f31
@@ -1884,7 +1884,7 @@ lbl_802C1E38:
/* 802C1ED4 002BEE14 80 7D 00 00 */ lwz r3, 0(r29)
/* 802C1ED8 002BEE18 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1EDC 002BEE1C 38 80 00 00 */ li r4, 0
/* 802C1EE0 002BEE20 4B FE 0E D5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C1EE0 002BEE20 4B FE 0E D5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C1EE4:
/* 802C1EE4 002BEE24 28 1E 00 00 */ cmplwi r30, 0
/* 802C1EE8 002BEE28 41 82 00 54 */ beq lbl_802C1F3C
@@ -1907,7 +1907,7 @@ lbl_802C1EE4:
/* 802C1F2C 002BEE6C 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C1F30 002BEE70 38 63 00 48 */ addi r3, r3, 0x48
/* 802C1F34 002BEE74 38 80 00 00 */ li r4, 0
/* 802C1F38 002BEE78 4B FE 0E 7D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C1F38 002BEE78 4B FE 0E 7D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C1F3C:
/* 802C1F3C 002BEE7C 39 61 00 40 */ addi r11, r1, 0x40
/* 802C1F40 002BEE80 48 0A 02 E9 */ bl _restgpr_29
@@ -2723,7 +2723,7 @@ lbl_802C284C:
/* 802C2B40 002BFA80 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B44 002BFA84 FC 20 F8 90 */ fmr f1, f31
/* 802C2B48 002BFA88 38 80 00 00 */ li r4, 0
/* 802C2B4C 002BFA8C 4B FE 02 69 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2B4C 002BFA8C 4B FE 02 69 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C2B50 002BFA90 80 7C 00 00 */ lwz r3, 0(r28)
/* 802C2B54 002BFA94 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B58 002BFA98 FC 20 F0 90 */ fmr f1, f30
@@ -2742,7 +2742,7 @@ lbl_802C2B70:
/* 802C2B84 002BFAC4 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B88 002BFAC8 FC 20 F8 90 */ fmr f1, f31
/* 802C2B8C 002BFACC 38 80 00 00 */ li r4, 0
/* 802C2B90 002BFAD0 4B FE 02 25 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2B90 002BFAD0 4B FE 02 25 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C2B94 002BFAD4 80 7D 00 00 */ lwz r3, 0(r29)
/* 802C2B98 002BFAD8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2B9C 002BFADC FC 20 F0 90 */ fmr f1, f30
@@ -2761,7 +2761,7 @@ lbl_802C2BB4:
/* 802C2BC8 002BFB08 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2BCC 002BFB0C FC 20 F8 90 */ fmr f1, f31
/* 802C2BD0 002BFB10 38 80 00 00 */ li r4, 0
/* 802C2BD4 002BFB14 4B FE 01 E1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2BD4 002BFB14 4B FE 01 E1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C2BD8 002BFB18 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C2BDC 002BFB1C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2BE0 002BFB20 FC 20 F0 90 */ fmr f1, f30
@@ -2780,7 +2780,7 @@ lbl_802C2BF8:
/* 802C2C0C 002BFB4C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2C10 002BFB50 FC 20 F8 90 */ fmr f1, f31
/* 802C2C14 002BFB54 38 80 00 00 */ li r4, 0
/* 802C2C18 002BFB58 4B FE 01 9D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2C18 002BFB58 4B FE 01 9D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C2C1C 002BFB5C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C2C20 002BFB60 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2C24 002BFB64 FC 20 F0 90 */ fmr f1, f30
@@ -2879,7 +2879,7 @@ lbl_802C2C5C:
/* 802C2D8C 002BFCCC 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2D90 002BFCD0 FC 20 F8 90 */ fmr f1, f31
/* 802C2D94 002BFCD4 38 80 00 00 */ li r4, 0
/* 802C2D98 002BFCD8 4B FE 00 1D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2D98 002BFCD8 4B FE 00 1D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C2D9C 002BFCDC 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C2DA0 002BFCE0 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2DA4 002BFCE4 FC 20 F0 90 */ fmr f1, f30
@@ -2952,7 +2952,7 @@ Z2_E_ms_modVol:
/* 802C2E7C 002BFDBC 38 63 00 48 */ addi r3, r3, 0x48
/* 802C2E80 002BFDC0 C0 22 C2 8C */ lfs f1, lbl_80455C8C-_SDA2_BASE_(r2)
/* 802C2E84 002BFDC4 38 80 00 00 */ li r4, 0
/* 802C2E88 002BFDC8 4B FD FF 2D */ bl JAISoundParamsMove_NS_moveVolume
/* 802C2E88 002BFDC8 4B FD FF 2D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C2E8C:
/* 802C2E8C 002BFDCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C2E90 002BFDD0 7C 08 03 A6 */ mtlr r0
@@ -3062,7 +3062,7 @@ lbl_802C2FF0:
/* 802C3008 002BFF48 38 63 00 48 */ addi r3, r3, 0x48
/* 802C300C 002BFF4C FC 20 F0 90 */ fmr f1, f30
/* 802C3010 002BFF50 38 80 00 00 */ li r4, 0
/* 802C3014 002BFF54 4B FD FD A1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C3014 002BFF54 4B FD FD A1 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C3018:
/* 802C3018 002BFF58 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0
/* 802C301C 002BFF5C CB E1 00 30 */ lfd f31, 0x30(r1)
asm/Z2AudioLib/Z2EnvSeMgr.s
+1 -1
View File
@@ -240,7 +240,7 @@ lbl_802C5BEC:
/* 802C5BF0 002C2B30 38 63 00 48 */ addi r3, r3, 0x48
/* 802C5BF4 002C2B34 FC 20 D8 90 */ fmr f1, f27
/* 802C5BF8 002C2B38 7F E4 FB 78 */ mr r4, r31
/* 802C5BFC 002C2B3C 4B FD D1 B9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C5BFC 002C2B3C 4B FD D1 B9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C5C00 002C2B40 80 7E 00 04 */ lwz r3, 4(r30)
/* 802C5C04 002C2B44 38 63 00 48 */ addi r3, r3, 0x48
/* 802C5C08 002C2B48 FC 20 E0 90 */ fmr f1, f28
asm/Z2AudioLib/Z2LinkMgr.s
+6 -6
View File
@@ -435,7 +435,7 @@ lbl_802C4EA4:
/* 802C4F18 002C1E58 38 63 00 48 */ addi r3, r3, 0x48
/* 802C4F1C 002C1E5C C0 22 C2 FC */ lfs f1, lbl_80455CFC-_SDA2_BASE_(r2)
/* 802C4F20 002C1E60 38 80 00 00 */ li r4, 0
/* 802C4F24 002C1E64 4B FD DE 91 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C4F24 002C1E64 4B FD DE 91 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C4F28 002C1E68 80 78 00 00 */ lwz r3, 0(r24)
/* 802C4F2C 002C1E6C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C4F30 002C1E70 C0 22 C3 1C */ lfs f1, lbl_80455D1C-_SDA2_BASE_(r2)
@@ -771,7 +771,7 @@ lbl_802C537C:
/* 802C53F0 002C2330 38 63 00 48 */ addi r3, r3, 0x48
/* 802C53F4 002C2334 C0 22 C2 FC */ lfs f1, lbl_80455CFC-_SDA2_BASE_(r2)
/* 802C53F8 002C2338 38 80 00 00 */ li r4, 0
/* 802C53FC 002C233C 4B FD D9 B9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C53FC 002C233C 4B FD D9 B9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C5400 002C2340 80 7D 00 00 */ lwz r3, 0(r29)
/* 802C5404 002C2344 38 63 00 48 */ addi r3, r3, 0x48
/* 802C5408 002C2348 C0 22 C3 1C */ lfs f1, lbl_80455D1C-_SDA2_BASE_(r2)
@@ -902,7 +902,7 @@ lbl_802C5498:
/* 802C55E8 002C2528 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C55EC 002C252C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C55F0 002C2530 38 80 00 00 */ li r4, 0
/* 802C55F4 002C2534 4B FD D7 C1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C55F4 002C2534 4B FD D7 C1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C55F8 002C2538 48 00 00 A0 */ b lbl_802C5698
lbl_802C55FC:
/* 802C55FC 002C253C 3C 80 00 06 */ lis r4, 0x0006004F@ha
@@ -943,7 +943,7 @@ lbl_802C55FC:
/* 802C5688 002C25C8 80 7E 00 00 */ lwz r3, 0(r30)
/* 802C568C 002C25CC 38 63 00 48 */ addi r3, r3, 0x48
/* 802C5690 002C25D0 38 80 00 00 */ li r4, 0
/* 802C5694 002C25D4 4B FD D7 21 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C5694 002C25D4 4B FD D7 21 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C5698:
/* 802C5698 002C25D8 D3 FF 00 20 */ stfs f31, 0x20(r31)
/* 802C569C 002C25DC 7F C3 F3 78 */ mr r3, r30
@@ -1011,7 +1011,7 @@ lbl_802C5698:
/* 802C5794 002C26D4 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C5798 002C26D8 38 63 00 48 */ addi r3, r3, 0x48
/* 802C579C 002C26DC 38 80 00 00 */ li r4, 0
/* 802C57A0 002C26E0 4B FD D6 15 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C57A0 002C26E0 4B FD D6 15 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C57A4:
/* 802C57A4 002C26E4 7F E3 FB 78 */ mr r3, r31
/* 802C57A8 002C26E8 83 E1 00 2C */ lwz r31, 0x2c(r1)
@@ -1063,7 +1063,7 @@ lbl_802C57A4:
/* 802C5860 002C27A0 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C5864 002C27A4 38 63 00 48 */ addi r3, r3, 0x48
/* 802C5868 002C27A8 38 80 00 00 */ li r4, 0
/* 802C586C 002C27AC 4B FD D5 49 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C586C 002C27AC 4B FD D5 49 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C5870:
/* 802C5870 002C27B0 7F E3 FB 78 */ mr r3, r31
/* 802C5874 002C27B4 39 61 00 20 */ addi r11, r1, 0x20
asm/Z2AudioLib/Z2SceneMgr.s
+2 -3414
View File
File diff suppressed because it is too large Load Diff
asm/Z2AudioLib/Z2SeMgr.s
+45 -45
View File
@@ -2298,7 +2298,7 @@ lbl_802AD6C4:
/* 802AD6D8 002AA618 38 63 00 48 */ addi r3, r3, 0x48
/* 802AD6DC 002AA61C FC 20 F0 90 */ fmr f1, f30
/* 802AD6E0 002AA620 38 80 00 00 */ li r4, 0
/* 802AD6E4 002AA624 4B FF 56 D1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AD6E4 002AA624 4B FF 56 D1 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802AD6E8:
/* 802AD6E8 002AA628 C0 02 BE B8 */ lfs f0, lbl_804558B8-_SDA2_BASE_(r2)
/* 802AD6EC 002AA62C FC 00 E8 00 */ fcmpu cr0, f0, f29
@@ -2515,8 +2515,8 @@ Z2SeMgr_NS_seStopAll:
/* 802AD9EC 002AA92C 38 21 00 10 */ addi r1, r1, 0x10
/* 802AD9F0 002AA930 4E 80 00 20 */ blr
.global Z2SeMgr_NS_seMoveVolumeAll
Z2SeMgr_NS_seMoveVolumeAll:
.global seMoveVolumeAll__7Z2SeMgrFfUl
seMoveVolumeAll__7Z2SeMgrFfUl:
/* 802AD9F4 002AA934 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802AD9F8 002AA938 7C 08 02 A6 */ mflr r0
/* 802AD9FC 002AA93C 90 01 00 24 */ stw r0, 0x24(r1)
@@ -2537,42 +2537,42 @@ lbl_802ADA2C:
/* 802ADA34 002AA974 C0 0D 82 7C */ lfs f0, lbl_804507FC-_SDA_BASE_(r13)
/* 802ADA38 002AA978 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADA3C 002AA97C 7F C4 F3 78 */ mr r4, r30
/* 802ADA40 002AA980 4B FF 53 75 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADA40 002AA980 4B FF 53 75 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADA44 002AA984 38 7F 00 F8 */ addi r3, r31, 0xf8
/* 802ADA48 002AA988 C0 0D 82 80 */ lfs f0, lbl_80450800-_SDA_BASE_(r13)
/* 802ADA4C 002AA98C EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADA50 002AA990 7F C4 F3 78 */ mr r4, r30
/* 802ADA54 002AA994 4B FF 53 61 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADA54 002AA994 4B FF 53 61 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADA58 002AA998 38 7F 01 64 */ addi r3, r31, 0x164
/* 802ADA5C 002AA99C C0 0D 82 84 */ lfs f0, lbl_80450804-_SDA_BASE_(r13)
/* 802ADA60 002AA9A0 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADA64 002AA9A4 7F C4 F3 78 */ mr r4, r30
/* 802ADA68 002AA9A8 4B FF 53 4D */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADA68 002AA9A8 4B FF 53 4D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADA6C 002AA9AC 38 7F 01 D0 */ addi r3, r31, 0x1d0
/* 802ADA70 002AA9B0 C0 0D 82 90 */ lfs f0, lbl_80450810-_SDA_BASE_(r13)
/* 802ADA74 002AA9B4 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADA78 002AA9B8 7F C4 F3 78 */ mr r4, r30
/* 802ADA7C 002AA9BC 4B FF 53 39 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADA7C 002AA9BC 4B FF 53 39 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADA80 002AA9C0 38 7F 02 3C */ addi r3, r31, 0x23c
/* 802ADA84 002AA9C4 C0 0D 82 88 */ lfs f0, lbl_80450808-_SDA_BASE_(r13)
/* 802ADA88 002AA9C8 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADA8C 002AA9CC 7F C4 F3 78 */ mr r4, r30
/* 802ADA90 002AA9D0 4B FF 53 25 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADA90 002AA9D0 4B FF 53 25 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADA94 002AA9D4 38 7F 02 A8 */ addi r3, r31, 0x2a8
/* 802ADA98 002AA9D8 C0 0D 82 8C */ lfs f0, lbl_8045080C-_SDA_BASE_(r13)
/* 802ADA9C 002AA9DC EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADAA0 002AA9E0 7F C4 F3 78 */ mr r4, r30
/* 802ADAA4 002AA9E4 4B FF 53 11 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADAA4 002AA9E4 4B FF 53 11 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADAA8 002AA9E8 38 7F 03 14 */ addi r3, r31, 0x314
/* 802ADAAC 002AA9EC C0 0D 82 88 */ lfs f0, lbl_80450808-_SDA_BASE_(r13)
/* 802ADAB0 002AA9F0 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADAB4 002AA9F4 7F C4 F3 78 */ mr r4, r30
/* 802ADAB8 002AA9F8 4B FF 52 FD */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADAB8 002AA9F8 4B FF 52 FD */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADABC 002AA9FC 38 7F 03 80 */ addi r3, r31, 0x380
/* 802ADAC0 002AAA00 C0 0D 82 90 */ lfs f0, lbl_80450810-_SDA_BASE_(r13)
/* 802ADAC4 002AAA04 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADAC8 002AAA08 7F C4 F3 78 */ mr r4, r30
/* 802ADACC 002AAA0C 4B FF 52 E9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADACC 002AAA0C 4B FF 52 E9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADAD0 002AAA10 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802ADAD4 002AAA14 88 03 00 2C */ lbz r0, 0x2c(r3)
/* 802ADAD8 002AAA18 28 00 00 0C */ cmplwi r0, 0xc
@@ -2581,7 +2581,7 @@ lbl_802ADA2C:
/* 802ADAE4 002AAA24 C0 0D 82 94 */ lfs f0, lbl_80450814-_SDA_BASE_(r13)
/* 802ADAE8 002AAA28 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802ADAEC 002AAA2C 7F C4 F3 78 */ mr r4, r30
/* 802ADAF0 002AAA30 4B FF 52 C5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADAF0 002AAA30 4B FF 52 C5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802ADAF4:
/* 802ADAF4 002AAA34 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0
/* 802ADAF8 002AAA38 CB E1 00 10 */ lfd f31, 0x10(r1)
@@ -2626,45 +2626,45 @@ Z2SeMgr_NS_talkInSe:
/* 802ADB7C 002AAABC 40 82 00 10 */ bne lbl_802ADB8C
/* 802ADB80 002AAAC0 C0 22 BE 78 */ lfs f1, lbl_80455878-_SDA2_BASE_(r2)
/* 802ADB84 002AAAC4 38 80 00 00 */ li r4, 0
/* 802ADB88 002AAAC8 4B FF FE 6D */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802ADB88 002AAAC8 4B FF FE 6D */ bl seMoveVolumeAll__7Z2SeMgrFfUl
lbl_802ADB8C:
/* 802ADB8C 002AAACC 83 ED 85 E0 */ lwz r31, lbl_80450B60-_SDA_BASE_(r13)
/* 802ADB90 002AAAD0 38 7F 00 20 */ addi r3, r31, 0x20
/* 802ADB94 002AAAD4 C0 2D 82 9C */ lfs f1, lbl_8045081C-_SDA_BASE_(r13)
/* 802ADB98 002AAAD8 38 80 00 02 */ li r4, 2
/* 802ADB9C 002AAADC 4B FF 52 19 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADB9C 002AAADC 4B FF 52 19 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBA0 002AAAE0 38 7F 00 8C */ addi r3, r31, 0x8c
/* 802ADBA4 002AAAE4 C0 2D 82 A0 */ lfs f1, lbl_80450820-_SDA_BASE_(r13)
/* 802ADBA8 002AAAE8 38 80 00 02 */ li r4, 2
/* 802ADBAC 002AAAEC 4B FF 52 09 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBAC 002AAAEC 4B FF 52 09 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBB0 002AAAF0 38 7F 00 F8 */ addi r3, r31, 0xf8
/* 802ADBB4 002AAAF4 C0 2D 82 A4 */ lfs f1, lbl_80450824-_SDA_BASE_(r13)
/* 802ADBB8 002AAAF8 38 80 00 02 */ li r4, 2
/* 802ADBBC 002AAAFC 4B FF 51 F9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBBC 002AAAFC 4B FF 51 F9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBC0 002AAB00 38 7F 01 64 */ addi r3, r31, 0x164
/* 802ADBC4 002AAB04 C0 2D 82 A8 */ lfs f1, lbl_80450828-_SDA_BASE_(r13)
/* 802ADBC8 002AAB08 38 80 00 02 */ li r4, 2
/* 802ADBCC 002AAB0C 4B FF 51 E9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBCC 002AAB0C 4B FF 51 E9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBD0 002AAB10 38 7F 01 D0 */ addi r3, r31, 0x1d0
/* 802ADBD4 002AAB14 C0 2D 82 B4 */ lfs f1, lbl_80450834-_SDA_BASE_(r13)
/* 802ADBD8 002AAB18 38 80 00 02 */ li r4, 2
/* 802ADBDC 002AAB1C 4B FF 51 D9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBDC 002AAB1C 4B FF 51 D9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBE0 002AAB20 38 7F 02 3C */ addi r3, r31, 0x23c
/* 802ADBE4 002AAB24 C0 2D 82 AC */ lfs f1, lbl_8045082C-_SDA_BASE_(r13)
/* 802ADBE8 002AAB28 38 80 00 02 */ li r4, 2
/* 802ADBEC 002AAB2C 4B FF 51 C9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBEC 002AAB2C 4B FF 51 C9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADBF0 002AAB30 38 7F 02 A8 */ addi r3, r31, 0x2a8
/* 802ADBF4 002AAB34 C0 2D 82 B0 */ lfs f1, lbl_80450830-_SDA_BASE_(r13)
/* 802ADBF8 002AAB38 38 80 00 02 */ li r4, 2
/* 802ADBFC 002AAB3C 4B FF 51 B9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADBFC 002AAB3C 4B FF 51 B9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADC00 002AAB40 38 7F 03 14 */ addi r3, r31, 0x314
/* 802ADC04 002AAB44 C0 2D 82 AC */ lfs f1, lbl_8045082C-_SDA_BASE_(r13)
/* 802ADC08 002AAB48 38 80 00 02 */ li r4, 2
/* 802ADC0C 002AAB4C 4B FF 51 A9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADC0C 002AAB4C 4B FF 51 A9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADC10 002AAB50 38 7F 03 80 */ addi r3, r31, 0x380
/* 802ADC14 002AAB54 C0 2D 82 B4 */ lfs f1, lbl_80450834-_SDA_BASE_(r13)
/* 802ADC18 002AAB58 38 80 00 02 */ li r4, 2
/* 802ADC1C 002AAB5C 4B FF 51 99 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADC1C 002AAB5C 4B FF 51 99 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADC20 002AAB60 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802ADC24 002AAB64 88 03 00 2C */ lbz r0, 0x2c(r3)
/* 802ADC28 002AAB68 28 00 00 0C */ cmplwi r0, 0xc
@@ -2672,7 +2672,7 @@ lbl_802ADB8C:
/* 802ADC30 002AAB70 38 7F 03 EC */ addi r3, r31, 0x3ec
/* 802ADC34 002AAB74 C0 2D 82 B8 */ lfs f1, lbl_80450838-_SDA_BASE_(r13)
/* 802ADC38 002AAB78 38 80 00 02 */ li r4, 2
/* 802ADC3C 002AAB7C 4B FF 51 79 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADC3C 002AAB7C 4B FF 51 79 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802ADC40:
/* 802ADC40 002AAB80 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802ADC44 002AAB84 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -2696,45 +2696,45 @@ Z2SeMgr_NS_talkOutSe:
/* 802ADC80 002AABC0 40 82 00 10 */ bne lbl_802ADC90
/* 802ADC84 002AABC4 C0 22 BE 78 */ lfs f1, lbl_80455878-_SDA2_BASE_(r2)
/* 802ADC88 002AABC8 38 80 00 00 */ li r4, 0
/* 802ADC8C 002AABCC 4B FF FD 69 */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802ADC8C 002AABCC 4B FF FD 69 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
lbl_802ADC90:
/* 802ADC90 002AABD0 83 ED 85 E0 */ lwz r31, lbl_80450B60-_SDA_BASE_(r13)
/* 802ADC94 002AABD4 38 7F 00 20 */ addi r3, r31, 0x20
/* 802ADC98 002AABD8 C0 2D 82 78 */ lfs f1, lbl_804507F8-_SDA_BASE_(r13)
/* 802ADC9C 002AABDC 38 80 00 02 */ li r4, 2
/* 802ADCA0 002AABE0 4B FF 51 15 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCA0 002AABE0 4B FF 51 15 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCA4 002AABE4 38 7F 00 8C */ addi r3, r31, 0x8c
/* 802ADCA8 002AABE8 C0 2D 82 7C */ lfs f1, lbl_804507FC-_SDA_BASE_(r13)
/* 802ADCAC 002AABEC 38 80 00 02 */ li r4, 2
/* 802ADCB0 002AABF0 4B FF 51 05 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCB0 002AABF0 4B FF 51 05 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCB4 002AABF4 38 7F 00 F8 */ addi r3, r31, 0xf8
/* 802ADCB8 002AABF8 C0 2D 82 80 */ lfs f1, lbl_80450800-_SDA_BASE_(r13)
/* 802ADCBC 002AABFC 38 80 00 02 */ li r4, 2
/* 802ADCC0 002AAC00 4B FF 50 F5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCC0 002AAC00 4B FF 50 F5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCC4 002AAC04 38 7F 01 64 */ addi r3, r31, 0x164
/* 802ADCC8 002AAC08 C0 2D 82 84 */ lfs f1, lbl_80450804-_SDA_BASE_(r13)
/* 802ADCCC 002AAC0C 38 80 00 02 */ li r4, 2
/* 802ADCD0 002AAC10 4B FF 50 E5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCD0 002AAC10 4B FF 50 E5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCD4 002AAC14 38 7F 01 D0 */ addi r3, r31, 0x1d0
/* 802ADCD8 002AAC18 C0 2D 82 90 */ lfs f1, lbl_80450810-_SDA_BASE_(r13)
/* 802ADCDC 002AAC1C 38 80 00 02 */ li r4, 2
/* 802ADCE0 002AAC20 4B FF 50 D5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCE0 002AAC20 4B FF 50 D5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCE4 002AAC24 38 7F 02 3C */ addi r3, r31, 0x23c
/* 802ADCE8 002AAC28 C0 2D 82 88 */ lfs f1, lbl_80450808-_SDA_BASE_(r13)
/* 802ADCEC 002AAC2C 38 80 00 02 */ li r4, 2
/* 802ADCF0 002AAC30 4B FF 50 C5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADCF0 002AAC30 4B FF 50 C5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADCF4 002AAC34 38 7F 02 A8 */ addi r3, r31, 0x2a8
/* 802ADCF8 002AAC38 C0 2D 82 8C */ lfs f1, lbl_8045080C-_SDA_BASE_(r13)
/* 802ADCFC 002AAC3C 38 80 00 02 */ li r4, 2
/* 802ADD00 002AAC40 4B FF 50 B5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADD00 002AAC40 4B FF 50 B5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADD04 002AAC44 38 7F 03 14 */ addi r3, r31, 0x314
/* 802ADD08 002AAC48 C0 2D 82 88 */ lfs f1, lbl_80450808-_SDA_BASE_(r13)
/* 802ADD0C 002AAC4C 38 80 00 02 */ li r4, 2
/* 802ADD10 002AAC50 4B FF 50 A5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADD10 002AAC50 4B FF 50 A5 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADD14 002AAC54 38 7F 03 80 */ addi r3, r31, 0x380
/* 802ADD18 002AAC58 C0 2D 82 90 */ lfs f1, lbl_80450810-_SDA_BASE_(r13)
/* 802ADD1C 002AAC5C 38 80 00 02 */ li r4, 2
/* 802ADD20 002AAC60 4B FF 50 95 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADD20 002AAC60 4B FF 50 95 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADD24 002AAC64 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802ADD28 002AAC68 88 03 00 2C */ lbz r0, 0x2c(r3)
/* 802ADD2C 002AAC6C 28 00 00 0C */ cmplwi r0, 0xc
@@ -2742,7 +2742,7 @@ lbl_802ADC90:
/* 802ADD34 002AAC74 38 7F 03 EC */ addi r3, r31, 0x3ec
/* 802ADD38 002AAC78 C0 2D 82 94 */ lfs f1, lbl_80450814-_SDA_BASE_(r13)
/* 802ADD3C 002AAC7C 38 80 00 02 */ li r4, 2
/* 802ADD40 002AAC80 4B FF 50 75 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADD40 002AAC80 4B FF 50 75 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802ADD44:
/* 802ADD44 002AAC84 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802ADD48 002AAC88 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -2766,45 +2766,45 @@ Z2SeMgr_NS_menuInSe:
/* 802ADD84 002AACC4 40 82 00 10 */ bne lbl_802ADD94
/* 802ADD88 002AACC8 C0 22 BE 78 */ lfs f1, lbl_80455878-_SDA2_BASE_(r2)
/* 802ADD8C 002AACCC 38 80 00 00 */ li r4, 0
/* 802ADD90 002AACD0 4B FF FC 65 */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802ADD90 002AACD0 4B FF FC 65 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
lbl_802ADD94:
/* 802ADD94 002AACD4 83 ED 85 E0 */ lwz r31, lbl_80450B60-_SDA_BASE_(r13)
/* 802ADD98 002AACD8 38 7F 00 20 */ addi r3, r31, 0x20
/* 802ADD9C 002AACDC C0 2D 82 C0 */ lfs f1, lbl_80450840-_SDA_BASE_(r13)
/* 802ADDA0 002AACE0 38 80 00 02 */ li r4, 2
/* 802ADDA4 002AACE4 4B FF 50 11 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDA4 002AACE4 4B FF 50 11 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDA8 002AACE8 38 7F 00 8C */ addi r3, r31, 0x8c
/* 802ADDAC 002AACEC C0 2D 82 C4 */ lfs f1, lbl_80450844-_SDA_BASE_(r13)
/* 802ADDB0 002AACF0 38 80 00 02 */ li r4, 2
/* 802ADDB4 002AACF4 4B FF 50 01 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDB4 002AACF4 4B FF 50 01 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDB8 002AACF8 38 7F 00 F8 */ addi r3, r31, 0xf8
/* 802ADDBC 002AACFC C0 2D 82 C8 */ lfs f1, lbl_80450848-_SDA_BASE_(r13)
/* 802ADDC0 002AAD00 38 80 00 02 */ li r4, 2
/* 802ADDC4 002AAD04 4B FF 4F F1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDC4 002AAD04 4B FF 4F F1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDC8 002AAD08 38 7F 01 64 */ addi r3, r31, 0x164
/* 802ADDCC 002AAD0C C0 2D 82 CC */ lfs f1, lbl_8045084C-_SDA_BASE_(r13)
/* 802ADDD0 002AAD10 38 80 00 02 */ li r4, 2
/* 802ADDD4 002AAD14 4B FF 4F E1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDD4 002AAD14 4B FF 4F E1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDD8 002AAD18 38 7F 01 D0 */ addi r3, r31, 0x1d0
/* 802ADDDC 002AAD1C C0 2D 82 D8 */ lfs f1, lbl_80450858-_SDA_BASE_(r13)
/* 802ADDE0 002AAD20 38 80 00 02 */ li r4, 2
/* 802ADDE4 002AAD24 4B FF 4F D1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDE4 002AAD24 4B FF 4F D1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDE8 002AAD28 38 7F 02 3C */ addi r3, r31, 0x23c
/* 802ADDEC 002AAD2C C0 2D 82 D0 */ lfs f1, lbl_80450850-_SDA_BASE_(r13)
/* 802ADDF0 002AAD30 38 80 00 02 */ li r4, 2
/* 802ADDF4 002AAD34 4B FF 4F C1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADDF4 002AAD34 4B FF 4F C1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADDF8 002AAD38 38 7F 02 A8 */ addi r3, r31, 0x2a8
/* 802ADDFC 002AAD3C C0 2D 82 D4 */ lfs f1, lbl_80450854-_SDA_BASE_(r13)
/* 802ADE00 002AAD40 38 80 00 02 */ li r4, 2
/* 802ADE04 002AAD44 4B FF 4F B1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADE04 002AAD44 4B FF 4F B1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADE08 002AAD48 38 7F 03 14 */ addi r3, r31, 0x314
/* 802ADE0C 002AAD4C C0 2D 82 D0 */ lfs f1, lbl_80450850-_SDA_BASE_(r13)
/* 802ADE10 002AAD50 38 80 00 02 */ li r4, 2
/* 802ADE14 002AAD54 4B FF 4F A1 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADE14 002AAD54 4B FF 4F A1 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADE18 002AAD58 38 7F 03 80 */ addi r3, r31, 0x380
/* 802ADE1C 002AAD5C C0 2D 82 D8 */ lfs f1, lbl_80450858-_SDA_BASE_(r13)
/* 802ADE20 002AAD60 38 80 00 02 */ li r4, 2
/* 802ADE24 002AAD64 4B FF 4F 91 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADE24 002AAD64 4B FF 4F 91 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802ADE28 002AAD68 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802ADE2C 002AAD6C 88 03 00 2C */ lbz r0, 0x2c(r3)
/* 802ADE30 002AAD70 28 00 00 0C */ cmplwi r0, 0xc
@@ -2812,7 +2812,7 @@ lbl_802ADD94:
/* 802ADE38 002AAD78 38 7F 03 EC */ addi r3, r31, 0x3ec
/* 802ADE3C 002AAD7C C0 2D 82 DC */ lfs f1, lbl_8045085C-_SDA_BASE_(r13)
/* 802ADE40 002AAD80 38 80 00 02 */ li r4, 2
/* 802ADE44 002AAD84 4B FF 4F 71 */ bl JAISoundParamsMove_NS_moveVolume
/* 802ADE44 002AAD84 4B FF 4F 71 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802ADE48:
/* 802ADE48 002AAD88 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802ADE4C 002AAD8C 80 01 00 14 */ lwz r0, 0x14(r1)
asm/Z2AudioLib/Z2SeqMgr.s
+6 -6
View File
@@ -193,7 +193,7 @@ lbl_802AF148:
/* 802AF158 002AC098 98 03 00 1C */ stb r0, 0x1c(r3)
/* 802AF15C 002AC09C 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13)
/* 802AF160 002AC0A0 38 80 00 00 */ li r4, 0
/* 802AF164 002AC0A4 48 00 77 7D */ bl Z2SceneMgr_NS_setSceneExist
/* 802AF164 002AC0A4 48 00 77 7D */ bl setSceneExist__10Z2SceneMgrFb
/* 802AF168 002AC0A8 7F 83 E3 78 */ mr r3, r28
/* 802AF16C 002AC0AC 38 80 00 01 */ li r4, 1
/* 802AF170 002AC0B0 48 00 4F F5 */ bl Z2SeqMgr_NS_setBattleBgmOff
@@ -1012,7 +1012,7 @@ lbl_802AFCA8:
lbl_802AFCC8:
/* 802AFCC8 002ACC08 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13)
/* 802AFCCC 002ACC0C 38 80 00 01 */ li r4, 1
/* 802AFCD0 002ACC10 48 00 6C 11 */ bl Z2SceneMgr_NS_setSceneExist
/* 802AFCD0 002ACC10 48 00 6C 11 */ bl setSceneExist__10Z2SceneMgrFb
/* 802AFCD4 002ACC14 48 00 01 00 */ b lbl_802AFDD4
lbl_802AFCD8:
/* 802AFCD8 002ACC18 80 7F 00 00 */ lwz r3, 0(r31)
@@ -5502,7 +5502,7 @@ lbl_802B3DC4:
lbl_802B3DF8:
/* 802B3DF8 002B0D38 38 64 00 48 */ addi r3, r4, 0x48
/* 802B3DFC 002B0D3C 38 80 00 00 */ li r4, 0
/* 802B3E00 002B0D40 4B FE EF B5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E00 002B0D40 4B FE EF B5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E04:
/* 802B3E04 002B0D44 80 7F 00 04 */ lwz r3, 4(r31)
/* 802B3E08 002B0D48 28 03 00 00 */ cmplwi r3, 0
@@ -5513,7 +5513,7 @@ lbl_802B3E04:
/* 802B3E1C 002B0D5C C0 1F 00 64 */ lfs f0, 0x64(r31)
/* 802B3E20 002B0D60 EC 21 00 32 */ fmuls f1, f1, f0
/* 802B3E24 002B0D64 38 80 00 00 */ li r4, 0
/* 802B3E28 002B0D68 4B FE EF 8D */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E28 002B0D68 4B FE EF 8D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E2C:
/* 802B3E2C 002B0D6C 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 802B3E30 002B0D70 28 03 00 00 */ cmplwi r3, 0
@@ -5524,7 +5524,7 @@ lbl_802B3E2C:
/* 802B3E44 002B0D84 C0 1F 00 44 */ lfs f0, 0x44(r31)
/* 802B3E48 002B0D88 EC 21 00 32 */ fmuls f1, f1, f0
/* 802B3E4C 002B0D8C 38 80 00 00 */ li r4, 0
/* 802B3E50 002B0D90 4B FE EF 65 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B3E50 002B0D90 4B FE EF 65 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B3E54:
/* 802B3E54 002B0D94 C0 1F 00 94 */ lfs f0, 0x94(r31)
/* 802B3E58 002B0D98 38 00 00 1E */ li r0, 0x1e
@@ -5702,7 +5702,7 @@ lbl_802B40B0:
/* 802B40B0 002B0FF0 7F E3 FB 78 */ mr r3, r31
/* 802B40B4 002B0FF4 FC 20 E8 90 */ fmr f1, f29
/* 802B40B8 002B0FF8 7F C4 F3 78 */ mr r4, r30
/* 802B40BC 002B0FFC 4B FE EC F9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B40BC 002B0FFC 4B FE EC F9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802B40C0 002B1000 C0 02 BF B4 */ lfs f0, lbl_804559B4-_SDA2_BASE_(r2)
/* 802B40C4 002B1004 FC 00 F0 00 */ fcmpu cr0, f0, f30
/* 802B40C8 002B1008 41 82 00 14 */ beq lbl_802B40DC
asm/Z2AudioLib/Z2SoundMgr.s
+9 -9
View File
@@ -397,7 +397,7 @@ lbl_802AA134:
/* 802AA14C 002A708C 38 7B 00 08 */ addi r3, r27, 8
/* 802AA150 002A7090 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2)
/* 802AA154 002A7094 38 80 00 2D */ li r4, 0x2d
/* 802AA158 002A7098 4B FF 8C 5D */ bl JAISoundParamsMove_NS_moveVolume
/* 802AA158 002A7098 4B FF 8C 5D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802AA15C:
/* 802AA15C 002A709C 80 1D 00 00 */ lwz r0, 0(r29)
/* 802AA160 002A70A0 90 01 00 08 */ stw r0, 8(r1)
@@ -604,8 +604,8 @@ lbl_802AA418:
/* 802AA428 002A7368 38 21 00 30 */ addi r1, r1, 0x30
/* 802AA42C 002A736C 4E 80 00 20 */ blr
.global Z2SoundMgr_NS_resetFilterAll
Z2SoundMgr_NS_resetFilterAll:
.global resetFilterAll__10Z2SoundMgrFv
resetFilterAll__10Z2SoundMgrFv:
/* 802AA430 002A7370 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802AA434 002A7374 7C 08 02 A6 */ mflr r0
/* 802AA438 002A7378 90 01 00 24 */ stw r0, 0x24(r1)
@@ -845,29 +845,29 @@ Z2SoundMgr_NS_pauseAllGameSound:
/* 802AA760 002A76A0 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802AA764 002A76A4 C0 22 BE 44 */ lfs f1, lbl_80455844-_SDA2_BASE_(r2)
/* 802AA768 002A76A8 38 80 00 0A */ li r4, 0xa
/* 802AA76C 002A76AC 48 00 32 89 */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802AA76C 002A76AC 48 00 32 89 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802AA770 002A76B0 38 7E 07 3C */ addi r3, r30, 0x73c
/* 802AA774 002A76B4 C0 22 BE 44 */ lfs f1, lbl_80455844-_SDA2_BASE_(r2)
/* 802AA778 002A76B8 38 80 00 0A */ li r4, 0xa
/* 802AA77C 002A76BC 4B FF 86 39 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AA77C 002A76BC 4B FF 86 39 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802AA780 002A76C0 38 7E 07 A0 */ addi r3, r30, 0x7a0
/* 802AA784 002A76C4 C0 22 BE 44 */ lfs f1, lbl_80455844-_SDA2_BASE_(r2)
/* 802AA788 002A76C8 38 80 00 0A */ li r4, 0xa
/* 802AA78C 002A76CC 4B FF 86 29 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AA78C 002A76CC 4B FF 86 29 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802AA790 002A76D0 48 00 00 34 */ b lbl_802AA7C4
lbl_802AA794:
/* 802AA794 002A76D4 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802AA798 002A76D8 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2)
/* 802AA79C 002A76DC 38 80 00 0A */ li r4, 0xa
/* 802AA7A0 002A76E0 48 00 32 55 */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802AA7A0 002A76E0 48 00 32 55 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802AA7A4 002A76E4 38 7E 07 3C */ addi r3, r30, 0x73c
/* 802AA7A8 002A76E8 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2)
/* 802AA7AC 002A76EC 38 80 00 0A */ li r4, 0xa
/* 802AA7B0 002A76F0 4B FF 86 05 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AA7B0 002A76F0 4B FF 86 05 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802AA7B4 002A76F4 38 7E 07 A0 */ addi r3, r30, 0x7a0
/* 802AA7B8 002A76F8 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2)
/* 802AA7BC 002A76FC 38 80 00 0A */ li r4, 0xa
/* 802AA7C0 002A7700 4B FF 85 F5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AA7C0 002A7700 4B FF 85 F5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802AA7C4:
/* 802AA7C4 002A7704 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802AA7C8 002A7708 83 C1 00 08 */ lwz r30, 8(r1)
asm/Z2AudioLib/Z2SoundObject.s
+2 -2
View File
@@ -746,7 +746,7 @@ Z2SoundObjSimple:
/* 802BE97C 002BB8BC 38 63 00 48 */ addi r3, r3, 0x48
/* 802BE980 002BB8C0 FC 20 F8 90 */ fmr f1, f31
/* 802BE984 002BB8C4 38 80 00 00 */ li r4, 0
/* 802BE988 002BB8C8 4B FE 44 2D */ bl JAISoundParamsMove_NS_moveVolume
/* 802BE988 002BB8C8 4B FE 44 2D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802BE98C:
/* 802BE98C 002BB8CC 7F E3 FB 78 */ mr r3, r31
/* 802BE990 002BB8D0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0
@@ -849,7 +849,7 @@ lbl_802BEAEC:
/* 802BEB04 002BBA44 38 63 00 48 */ addi r3, r3, 0x48
/* 802BEB08 002BBA48 FC 20 F8 90 */ fmr f1, f31
/* 802BEB0C 002BBA4C 38 80 00 00 */ li r4, 0
/* 802BEB10 002BBA50 4B FE 42 A5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802BEB10 002BBA50 4B FE 42 A5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802BEB14:
/* 802BEB14 002BBA54 7F E3 FB 78 */ mr r3, r31
/* 802BEB18 002BBA58 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0
asm/Z2AudioLib/Z2SoundStarter.s
+1 -1
View File
@@ -197,7 +197,7 @@ lbl_802AAE38:
/* 802AAE48 002A7D88 38 63 00 48 */ addi r3, r3, 0x48
/* 802AAE4C 002A7D8C FC 20 E8 90 */ fmr f1, f29
/* 802AAE50 002A7D90 7F E4 FB 78 */ mr r4, r31
/* 802AAE54 002A7D94 4B FF 7F 61 */ bl JAISoundParamsMove_NS_moveVolume
/* 802AAE54 002A7D94 4B FF 7F 61 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802AAE58:
/* 802AAE58 002A7D98 C0 02 BE 60 */ lfs f0, lbl_80455860-_SDA2_BASE_(r2)
/* 802AAE5C 002A7D9C FC 00 F0 00 */ fcmpu cr0, f0, f30
asm/Z2AudioLib/Z2SpeechMgr2.s
+1 -1
View File
@@ -1533,7 +1533,7 @@ lbl_802CD1A4:
/* 802CD1B4 002CA0F4 38 63 00 48 */ addi r3, r3, 0x48
/* 802CD1B8 002CA0F8 FC 20 E8 90 */ fmr f1, f29
/* 802CD1BC 002CA0FC 7F E4 FB 78 */ mr r4, r31
/* 802CD1C0 002CA100 4B FD 5B F5 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CD1C0 002CA100 4B FD 5B F5 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802CD1C4:
/* 802CD1C4 002CA104 C0 02 C5 38 */ lfs f0, lbl_80455F38-_SDA2_BASE_(r2)
/* 802CD1C8 002CA108 FC 00 F0 00 */ fcmpu cr0, f0, f30
asm/Z2AudioLib/Z2StatusMgr.s
+2 -2
View File
@@ -381,7 +381,7 @@ lbl_802B6410:
/* 802B6438 002B3378 38 63 03 EC */ addi r3, r3, 0x3ec
/* 802B643C 002B337C C0 22 C0 1C */ lfs f1, lbl_80455A1C-_SDA2_BASE_(r2)
/* 802B6440 002B3380 38 80 00 00 */ li r4, 0
/* 802B6444 002B3384 4B FE C9 71 */ bl JAISoundParamsMove_NS_moveVolume
/* 802B6444 002B3384 4B FE C9 71 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802B6448 002B3388 48 00 02 BC */ b lbl_802B6704
lbl_802B644C:
/* 802B644C 002B338C 7F C3 F3 78 */ mr r3, r30
@@ -397,7 +397,7 @@ lbl_802B644C:
/* 802B6474 002B33B4 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6478 002B33B8 C0 22 C0 1C */ lfs f1, lbl_80455A1C-_SDA2_BASE_(r2)
/* 802B647C 002B33BC 38 80 00 00 */ li r4, 0
/* 802B6480 002B33C0 4B FF 75 75 */ bl Z2SeMgr_NS_seMoveVolumeAll
/* 802B6480 002B33C0 4B FF 75 75 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802B6484 002B33C4 48 00 02 80 */ b lbl_802B6704
lbl_802B6488:
/* 802B6488 002B33C8 7F C3 F3 78 */ mr r3, r30
asm/Z2AudioLib/Z2WolfHowlMgr.s
+4 -4
View File
@@ -107,7 +107,7 @@ Z2WolfHowlMgr_NS_calcVolumeMod:
/* 802CAC1C 002C7B5C 38 64 00 48 */ addi r3, r4, 0x48
/* 802CAC20 002C7B60 C0 22 C4 64 */ lfs f1, lbl_80455E64-_SDA2_BASE_(r2)
/* 802CAC24 002C7B64 38 80 00 00 */ li r4, 0
/* 802CAC28 002C7B68 4B FD 81 8D */ bl JAISoundParamsMove_NS_moveVolume
/* 802CAC28 002C7B68 4B FD 81 8D */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CAC2C 002C7B6C 48 00 00 70 */ b lbl_802CAC9C
lbl_802CAC30:
/* 802CAC30 002C7B70 C0 C2 C4 64 */ lfs f6, lbl_80455E64-_SDA2_BASE_(r2)
@@ -135,7 +135,7 @@ lbl_802CAC74:
/* 802CAC84 002C7BC4 38 63 00 48 */ addi r3, r3, 0x48
/* 802CAC88 002C7BC8 C0 3F 00 18 */ lfs f1, 0x18(r31)
/* 802CAC8C 002C7BCC 38 80 00 00 */ li r4, 0
/* 802CAC90 002C7BD0 4B FD 81 25 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CAC90 002C7BD0 4B FD 81 25 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802CAC94:
/* 802CAC94 002C7BD4 C0 1F 00 18 */ lfs f0, 0x18(r31)
/* 802CAC98 002C7BD8 D0 1F 00 1C */ stfs f0, 0x1c(r31)
@@ -1136,14 +1136,14 @@ lbl_802CBA28:
/* 802CBA48 002C8988 38 63 00 48 */ addi r3, r3, 0x48
/* 802CBA4C 002C898C C0 22 C4 D4 */ lfs f1, lbl_80455ED4-_SDA2_BASE_(r2)
/* 802CBA50 002C8990 38 80 00 00 */ li r4, 0
/* 802CBA54 002C8994 4B FD 73 61 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CBA54 002C8994 4B FD 73 61 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802CBA58 002C8998 48 00 00 18 */ b lbl_802CBA70
lbl_802CBA5C:
/* 802CBA5C 002C899C 80 7D 00 04 */ lwz r3, 4(r29)
/* 802CBA60 002C89A0 38 63 00 48 */ addi r3, r3, 0x48
/* 802CBA64 002C89A4 C0 22 C4 D8 */ lfs f1, lbl_80455ED8-_SDA2_BASE_(r2)
/* 802CBA68 002C89A8 38 80 00 00 */ li r4, 0
/* 802CBA6C 002C89AC 4B FD 73 49 */ bl JAISoundParamsMove_NS_moveVolume
/* 802CBA6C 002C89AC 4B FD 73 49 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802CBA70:
/* 802CBA70 002C89B0 39 61 00 40 */ addi r11, r1, 0x40
/* 802CBA74 002C89B4 48 09 67 B5 */ bl _restgpr_29
asm/d/s/d_s_play.s
+2 -2
View File
@@ -632,13 +632,13 @@ lbl_80259C9C:
/* 80259CF0 00256C30 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 80259CF4 00256C34 38 63 04 A4 */ addi r3, r3, 0x4a4
/* 80259CF8 00256C38 38 80 00 01 */ li r4, 1
/* 80259CFC 00256C3C 48 05 CB B5 */ bl Z2SceneMgr_NS_setInDarkness
/* 80259CFC 00256C3C 48 05 CB B5 */ bl setInDarkness__10Z2SceneMgrFb
/* 80259D00 00256C40 48 00 00 14 */ b lbl_80259D14
lbl_80259D04:
/* 80259D04 00256C44 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 80259D08 00256C48 38 63 04 A4 */ addi r3, r3, 0x4a4
/* 80259D0C 00256C4C 38 80 00 00 */ li r4, 0
/* 80259D10 00256C50 48 05 CB A1 */ bl Z2SceneMgr_NS_setInDarkness
/* 80259D10 00256C50 48 05 CB A1 */ bl setInDarkness__10Z2SceneMgrFb
lbl_80259D14:
/* 80259D14 00256C54 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80259D18 00256C58 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l
asm/m/Do/m_Do_audio.s
+3 -3
View File
@@ -163,7 +163,7 @@ mDoAud_setSceneName:
/* 800071D8 00004118 38 63 04 A4 */ addi r3, r3, 0x4a4
/* 800071DC 0000411C 7C E4 3B 78 */ mr r4, r7
/* 800071E0 00004120 7C 05 03 78 */ mr r5, r0
/* 800071E4 00004124 48 2A F9 15 */ bl Z2SceneMgr_NS_setSceneName
/* 800071E4 00004124 48 2A F9 15 */ bl setSceneName__10Z2SceneMgrFPcll
/* 800071E8 00004128 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800071EC 0000412C 7C 08 03 A6 */ mtlr r0
/* 800071F0 00004130 38 21 00 10 */ addi r1, r1, 0x10
@@ -192,7 +192,7 @@ mDoAud_setFadeOutStart:
/* 80007234 00004174 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 80007238 00004178 38 63 04 A4 */ addi r3, r3, 0x4a4
/* 8000723C 0000417C 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80007240 00004180 48 2A F7 3D */ bl Z2SceneMgr_NS_setFadeOutStart
/* 80007240 00004180 48 2A F7 3D */ bl setFadeOutStart__10Z2SceneMgrFUc
/* 80007244 00004184 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80007248 00004188 7C 08 03 A6 */ mtlr r0
/* 8000724C 0000418C 38 21 00 10 */ addi r1, r1, 0x10
@@ -207,7 +207,7 @@ mDoAud_setFadeInStart:
/* 80007264 000041A4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13)
/* 80007268 000041A8 38 63 04 A4 */ addi r3, r3, 0x4a4
/* 8000726C 000041AC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80007270 000041B0 48 2A F7 A9 */ bl Z2SceneMgr_NS_setFadeInStart
/* 80007270 000041B0 48 2A F7 A9 */ bl setFadeInStart__10Z2SceneMgrFUc
/* 80007274 000041B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80007278 000041B8 7C 08 03 A6 */ mtlr r0
/* 8000727C 000041BC 38 21 00 10 */ addi r1, r1, 0x10
asmdiff.sh
+1 -2
View File
@@ -1,8 +1,7 @@
#!/bin/bash
OBJDUMP="$DEVKITPPC/bin/powerpc-eabi-objdump -D -bbinary -EB -mpowerpc -M gekko"
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
echo $OPTIONS
OPTIONS="--start-address=$(($1)) --stop-address=$(($2+0x4))"
$OBJDUMP $OPTIONS baserom.dol > baserom.dump
$OBJDUMP $OPTIONS build/dolzel2/main.dol > main.dump
diff -u --color=always baserom.dump main.dump
include/Z2AudioLib/Z2Calc/Z2Calc.h
+1 -1
View File
@@ -1,4 +1,4 @@
#include "dolphin/types.h"
#include "global.h"
namespace Z2Calc{
struct CurveSign{
include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
+1 -1
View File
@@ -1,4 +1,4 @@
#include "dolphin/types.h"
#include "global.h"
struct Vec{ // move later
float x, y, z;
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s
+1 -1
View File
@@ -68,7 +68,7 @@ lbl_802C382C:
/* 802C3880 002C07C0 38 63 00 48 */ addi r3, r3, 0x48
/* 802C3884 002C07C4 FC 20 F8 90 */ fmr f1, f31
/* 802C3888 002C07C8 38 80 00 00 */ li r4, 0
/* 802C388C 002C07CC 4B FD F5 29 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C388C 002C07CC 4B FD F5 29 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C3890:
/* 802C3890 002C07D0 88 1F 00 CB */ lbz r0, 0xcb(r31)
/* 802C3894 002C07D4 54 00 07 FF */ clrlwi. r0, r0, 0x1f
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s
+2 -2
View File
@@ -102,7 +102,7 @@ lbl_802C3CC0:
/* 802C3D58 002C0C98 38 63 00 48 */ addi r3, r3, 0x48
/* 802C3D5C 002C0C9C FC 20 F8 90 */ fmr f1, f31
/* 802C3D60 002C0CA0 38 80 00 00 */ li r4, 0
/* 802C3D64 002C0CA4 4B FD F0 51 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C3D64 002C0CA4 4B FD F0 51 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C3D68 002C0CA8 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C3D6C 002C0CAC 38 63 00 48 */ addi r3, r3, 0x48
/* 802C3D70 002C0CB0 FC 20 F0 90 */ fmr f1, f30
@@ -151,7 +151,7 @@ lbl_802C3D80:
/* 802C3E18 002C0D58 38 63 00 48 */ addi r3, r3, 0x48
/* 802C3E1C 002C0D5C FC 20 F0 90 */ fmr f1, f30
/* 802C3E20 002C0D60 38 80 00 00 */ li r4, 0
/* 802C3E24 002C0D64 4B FD EF 91 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C3E24 002C0D64 4B FD EF 91 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C3E28 002C0D68 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C3E2C 002C0D6C 38 63 00 48 */ addi r3, r3, 0x48
/* 802C3E30 002C0D70 FC 20 F8 90 */ fmr f1, f31
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s
+1 -1
View File
@@ -301,7 +301,7 @@ lbl_802C42CC:
/* 802C42D0 002C1210 38 63 00 48 */ addi r3, r3, 0x48
/* 802C42D4 002C1214 FC 20 F8 90 */ fmr f1, f31
/* 802C42D8 002C1218 7F C4 F3 78 */ mr r4, r30
/* 802C42DC 002C121C 4B FD EA D9 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C42DC 002C121C 4B FD EA D9 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C42E0 002C1220 80 7F 00 00 */ lwz r3, 0(r31)
/* 802C42E4 002C1224 38 63 00 48 */ addi r3, r3, 0x48
/* 802C42E8 002C1228 FC 20 F0 90 */ fmr f1, f30
include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s
+1 -1
View File
@@ -61,7 +61,7 @@ lbl_802C4650:
/* 802C4684 002C15C4 38 63 00 48 */ addi r3, r3, 0x48
/* 802C4688 002C15C8 FC 20 F8 90 */ fmr f1, f31
/* 802C468C 002C15CC 38 80 00 00 */ li r4, 0
/* 802C4690 002C15D0 4B FD E7 25 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C4690 002C15D0 4B FD E7 25 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802C4694 002C15D4 80 6D 85 F4 */ lwz r3, lbl_80450B74-_SDA_BASE_(r13)
/* 802C4698 002C15D8 7F C4 F3 78 */ mr r4, r30
/* 802C469C 002C15DC 38 A0 00 08 */ li r5, 8
include/Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s
+1 -1
View File
@@ -41,7 +41,7 @@ lbl_802C48A0:
/* 802C48A8 002C17E8 C0 02 C3 18 */ lfs f0, lbl_80455D18-_SDA2_BASE_(r2)
/* 802C48AC 002C17EC EC 3F 00 24 */ fdivs f1, f31, f0
/* 802C48B0 002C17F0 38 80 00 00 */ li r4, 0
/* 802C48B4 002C17F4 4B FD E5 01 */ bl JAISoundParamsMove_NS_moveVolume
/* 802C48B4 002C17F4 4B FD E5 01 */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802C48B8:
/* 802C48B8 002C17F8 7F E3 FB 78 */ mr r3, r31
lbl_802C48BC:
include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
+69
View File
@@ -0,0 +1,69 @@
#include "global.h"
class JAISoundParamsMove{
public:
void moveVolume(float param_1, u32 param_2);
private:
float unk_1;
};
class Z2SoundMgr{
public:
void resetFilterAll();
u8 p1[0x3ec];
JAISoundParamsMove* JAISoundParamsMove;
private:
};
class Z2SeMgr{
public:
void seMoveVolumeAll(float param_1, u32 param_2);
};
class Z2SeqMgr{
private:
u8 p1[0xD0];
u8 unk_1;
public:
void setFieldBgmPlay(bool param_1);
};
class Z2SceneMgr{
private:
long BGM_ID;
int field_0x4;
int timer;
s8 roomNum;
u8 SeWave_1;
u8 SeWaveToErase_1;
u8 SeWave_2;
u8 SeWaveToErase_2;
u8 BgmWave_1;
u8 BgmWaveToErase_1;
u8 BgmWave_2;
u8 BgmWaveToErase_2;
u8 SeWave_3;
u8 SeWaveToErase_3;
u8 field_0x17;
u8 field_0x18;
u8 field_0x19;
u8 field_0x1a;
u8 field_0x1b;
u8 field_0x1c;
bool field_0x1d;
bool inDarkness;
public:
Z2SceneMgr(void);
void setInDarkness(bool param_1);
void setSceneExist(bool param_1);
void setFadeOutStart(u8 param_1);
void setFadeInStart(u8 param_1);
void setSceneName(char* stageName, long roomNum, long layerNum);
int checkFirstWaves(void);
};
struct JAISoundID
{
u32 soundId;
JAISoundID(JAISoundID const &soundIdToSet);
};
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s
+28
View File
@@ -0,0 +1,28 @@
/* 802B6840 002B3780 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802B6844 002B3784 90 6D 86 00 */ stw r3, lbl_80450B80-_SDA_BASE_(r13)
/* 802B6848 002B3788 38 00 FF FF */ li r0, -1
/* 802B684C 002B378C 90 03 00 04 */ stw r0, 4(r3)
/* 802B6850 002B3790 90 01 00 08 */ stw r0, 8(r1)
/* 802B6854 002B3794 90 03 00 00 */ stw r0, 0(r3)
/* 802B6858 002B3798 98 03 00 0C */ stb r0, 0xc(r3)
/* 802B685C 002B379C 38 00 00 00 */ li r0, 0
/* 802B6860 002B37A0 98 03 00 0D */ stb r0, 0xd(r3)
/* 802B6864 002B37A4 98 03 00 0E */ stb r0, 0xe(r3)
/* 802B6868 002B37A8 98 03 00 0F */ stb r0, 0xf(r3)
/* 802B686C 002B37AC 98 03 00 10 */ stb r0, 0x10(r3)
/* 802B6870 002B37B0 98 03 00 11 */ stb r0, 0x11(r3)
/* 802B6874 002B37B4 98 03 00 12 */ stb r0, 0x12(r3)
/* 802B6878 002B37B8 98 03 00 13 */ stb r0, 0x13(r3)
/* 802B687C 002B37BC 98 03 00 14 */ stb r0, 0x14(r3)
/* 802B6880 002B37C0 98 03 00 15 */ stb r0, 0x15(r3)
/* 802B6884 002B37C4 98 03 00 16 */ stb r0, 0x16(r3)
/* 802B6888 002B37C8 98 03 00 18 */ stb r0, 0x18(r3)
/* 802B688C 002B37CC 98 03 00 19 */ stb r0, 0x19(r3)
/* 802B6890 002B37D0 98 03 00 1A */ stb r0, 0x1a(r3)
/* 802B6894 002B37D4 98 03 00 1B */ stb r0, 0x1b(r3)
/* 802B6898 002B37D8 98 03 00 1D */ stb r0, 0x1d(r3)
/* 802B689C 002B37DC 98 03 00 1C */ stb r0, 0x1c(r3)
/* 802B68A0 002B37E0 98 03 00 1E */ stb r0, 0x1e(r3)
/* 802B68A4 002B37E4 98 03 00 17 */ stb r0, 0x17(r3)
/* 802B68A8 002B37E8 38 21 00 10 */ addi r1, r1, 0x10
/* 802B68AC 002B37EC 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B68B0.s
+13
View File
@@ -0,0 +1,13 @@
/* 802B68B0 002B37F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802B68B4 002B37F4 7C 08 02 A6 */ mflr r0
/* 802B68B8 002B37F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802B68BC 002B37FC 98 83 00 1E */ stb r4, 0x1e(r3)
/* 802B68C0 002B3800 54 80 06 3F */ clrlwi. r0, r4, 0x18
/* 802B68C4 002B3804 40 82 00 0C */ bne lbl_802B68D0
/* 802B68C8 002B3808 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13)
/* 802B68CC 002B380C 4B FF 3B 65 */ bl resetFilterAll__10Z2SoundMgrFv
lbl_802B68D0:
/* 802B68D0 002B3810 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802B68D4 002B3814 7C 08 03 A6 */ mtlr r0
/* 802B68D8 002B3818 38 21 00 10 */ addi r1, r1, 0x10
/* 802B68DC 002B381C 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s
+43
View File
@@ -0,0 +1,43 @@
/* 802B68E0 002B3820 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802B68E4 002B3824 7C 08 02 A6 */ mflr r0
/* 802B68E8 002B3828 90 01 00 14 */ stw r0, 0x14(r1)
/* 802B68EC 002B382C 98 83 00 1D */ stb r4, 0x1d(r3)
/* 802B68F0 002B3830 38 00 00 00 */ li r0, 0
/* 802B68F4 002B3834 90 03 00 08 */ stw r0, 8(r3)
/* 802B68F8 002B3838 80 AD 85 E0 */ lwz r5, lbl_80450B60-_SDA_BASE_(r13)
/* 802B68FC 002B383C 54 80 06 3F */ clrlwi. r0, r4, 0x18
/* 802B6900 002B3840 41 82 00 5C */ beq lbl_802B695C
/* 802B6904 002B3844 38 00 00 01 */ li r0, 1
/* 802B6908 002B3848 98 03 00 1C */ stb r0, 0x1c(r3)
/* 802B690C 002B384C 88 03 00 15 */ lbz r0, 0x15(r3)
/* 802B6910 002B3850 28 00 00 85 */ cmplwi r0, 0x85
/* 802B6914 002B3854 40 82 00 18 */ bne lbl_802B692C
/* 802B6918 002B3858 38 65 03 EC */ addi r3, r5, 0x3ec
/* 802B691C 002B385C C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B6920 002B3860 38 80 00 00 */ li r4, 0
/* 802B6924 002B3864 4B FE C4 91 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802B6928 002B3868 48 00 00 44 */ b lbl_802B696C
lbl_802B692C:
/* 802B692C 002B386C 28 00 00 7F */ cmplwi r0, 0x7f
/* 802B6930 002B3870 40 82 00 18 */ bne lbl_802B6948
/* 802B6934 002B3874 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6938 002B3878 C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B693C 002B387C 38 80 00 00 */ li r4, 0
/* 802B6940 002B3880 4B FF 70 B5 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802B6944 002B3884 48 00 00 28 */ b lbl_802B696C
lbl_802B6948:
/* 802B6948 002B3888 38 65 03 EC */ addi r3, r5, 0x3ec
/* 802B694C 002B388C C0 22 C0 3C */ lfs f1, lbl_80455A3C-_SDA2_BASE_(r2)
/* 802B6950 002B3890 38 80 00 21 */ li r4, 0x21
/* 802B6954 002B3894 4B FE C4 61 */ bl moveVolume__18JAISoundParamsMoveFfUl
/* 802B6958 002B3898 48 00 00 14 */ b lbl_802B696C
lbl_802B695C:
/* 802B695C 002B389C 38 65 03 EC */ addi r3, r5, 0x3ec
/* 802B6960 002B38A0 C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B6964 002B38A4 38 80 00 B4 */ li r4, 0xb4
/* 802B6968 002B38A8 4B FE C4 4D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B696C:
/* 802B696C 002B38AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802B6970 002B38B0 7C 08 03 A6 */ mtlr r0
/* 802B6974 002B38B4 38 21 00 10 */ addi r1, r1, 0x10
/* 802B6978 002B38B8 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s
+39
View File
@@ -0,0 +1,39 @@
/* 802B697C 002B38BC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802B6980 002B38C0 7C 08 02 A6 */ mflr r0
/* 802B6984 002B38C4 90 01 00 24 */ stw r0, 0x24(r1)
/* 802B6988 002B38C8 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802B698C 002B38CC 7C 7F 1B 78 */ mr r31, r3
/* 802B6990 002B38D0 38 80 00 00 */ li r4, 0
/* 802B6994 002B38D4 4B FF FF 4D */ bl setSceneExist__10Z2SceneMgrFb
/* 802B6998 002B38D8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B699C 002B38DC C0 03 00 74 */ lfs f0, 0x74(r3)
/* 802B69A0 002B38E0 38 00 00 21 */ li r0, 0x21
/* 802B69A4 002B38E4 90 03 00 80 */ stw r0, 0x80(r3)
/* 802B69A8 002B38E8 C0 62 C0 40 */ lfs f3, lbl_80455A40-_SDA2_BASE_(r2)
/* 802B69AC 002B38EC EC 43 00 28 */ fsubs f2, f3, f0
/* 802B69B0 002B38F0 80 03 00 80 */ lwz r0, 0x80(r3)
/* 802B69B4 002B38F4 C8 22 C0 48 */ lfd f1, lbl_80455A48-_SDA2_BASE_(r2)
/* 802B69B8 002B38F8 90 01 00 0C */ stw r0, 0xc(r1)
/* 802B69BC 002B38FC 3C 00 43 30 */ lis r0, 0x4330
/* 802B69C0 002B3900 90 01 00 08 */ stw r0, 8(r1)
/* 802B69C4 002B3904 C8 01 00 08 */ lfd f0, 8(r1)
/* 802B69C8 002B3908 EC 00 08 28 */ fsubs f0, f0, f1
/* 802B69CC 002B390C EC 02 00 24 */ fdivs f0, f2, f0
/* 802B69D0 002B3910 D0 03 00 78 */ stfs f0, 0x78(r3)
/* 802B69D4 002B3914 D0 63 00 7C */ stfs f3, 0x7c(r3)
/* 802B69D8 002B3918 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B69DC 002B391C C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B69E0 002B3920 38 80 00 21 */ li r4, 0x21
/* 802B69E4 002B3924 4B FF 70 11 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802B69E8 002B3928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B69EC 002B392C 38 80 00 01 */ li r4, 1
/* 802B69F0 002B3930 4B FF D7 75 */ bl Z2SeqMgr_NS_setBattleBgmOff
/* 802B69F4 002B3934 38 00 00 28 */ li r0, 0x28
/* 802B69F8 002B3938 98 1F 00 17 */ stb r0, 0x17(r31)
/* 802B69FC 002B393C 38 00 FF FF */ li r0, -1
/* 802B6A00 002B3940 90 1F 00 08 */ stw r0, 8(r31)
/* 802B6A04 002B3944 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802B6A08 002B3948 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802B6A0C 002B394C 7C 08 03 A6 */ mtlr r0
/* 802B6A10 002B3950 38 21 00 20 */ addi r1, r1, 0x20
/* 802B6A14 002B3954 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s
+59
View File
@@ -0,0 +1,59 @@
/* 802B6A18 002B3958 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802B6A1C 002B395C 7C 08 02 A6 */ mflr r0
/* 802B6A20 002B3960 90 01 00 24 */ stw r0, 0x24(r1)
/* 802B6A24 002B3964 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802B6A28 002B3968 7C 7F 1B 78 */ mr r31, r3
/* 802B6A2C 002B396C 88 03 00 15 */ lbz r0, 0x15(r3)
/* 802B6A30 002B3970 28 00 00 7F */ cmplwi r0, 0x7f
/* 802B6A34 002B3974 40 82 00 18 */ bne lbl_802B6A4C
/* 802B6A38 002B3978 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6A3C 002B397C C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B6A40 002B3980 38 80 00 00 */ li r4, 0
/* 802B6A44 002B3984 4B FF 6F B1 */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802B6A48 002B3988 48 00 00 34 */ b lbl_802B6A7C
lbl_802B6A4C:
/* 802B6A4C 002B398C 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B6A50 002B3990 C0 22 C0 3C */ lfs f1, lbl_80455A3C-_SDA2_BASE_(r2)
/* 802B6A54 002B3994 38 80 00 21 */ li r4, 0x21
/* 802B6A58 002B3998 4B FF 6F 9D */ bl seMoveVolumeAll__7Z2SeMgrFfUl
/* 802B6A5C 002B399C 88 1F 00 15 */ lbz r0, 0x15(r31)
/* 802B6A60 002B39A0 28 00 00 85 */ cmplwi r0, 0x85
/* 802B6A64 002B39A4 40 82 00 18 */ bne lbl_802B6A7C
/* 802B6A68 002B39A8 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13)
/* 802B6A6C 002B39AC 38 63 03 EC */ addi r3, r3, 0x3ec
/* 802B6A70 002B39B0 C0 22 C0 38 */ lfs f1, lbl_80455A38-_SDA2_BASE_(r2)
/* 802B6A74 002B39B4 38 80 00 00 */ li r4, 0
/* 802B6A78 002B39B8 4B FE C3 3D */ bl moveVolume__18JAISoundParamsMoveFfUl
lbl_802B6A7C:
/* 802B6A7C 002B39BC C0 02 C0 3C */ lfs f0, lbl_80455A3C-_SDA2_BASE_(r2)
/* 802B6A80 002B39C0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6A84 002B39C4 D0 03 00 B4 */ stfs f0, 0xb4(r3)
/* 802B6A88 002B39C8 80 6D 85 FC */ lwz r3, lbl_80450B7C-_SDA_BASE_(r13)
/* 802B6A8C 002B39CC 4B FF F6 F1 */ bl Z2StatusMgr_NS_menuOut
/* 802B6A90 002B39D0 88 1F 00 1A */ lbz r0, 0x1a(r31)
/* 802B6A94 002B39D4 28 00 00 00 */ cmplwi r0, 0
/* 802B6A98 002B39D8 40 82 00 44 */ bne lbl_802B6ADC
/* 802B6A9C 002B39DC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802B6AA0 002B39E0 C0 03 00 74 */ lfs f0, 0x74(r3)
/* 802B6AA4 002B39E4 38 00 00 21 */ li r0, 0x21
/* 802B6AA8 002B39E8 90 03 00 80 */ stw r0, 0x80(r3)
/* 802B6AAC 002B39EC C0 62 C0 3C */ lfs f3, lbl_80455A3C-_SDA2_BASE_(r2)
/* 802B6AB0 002B39F0 EC 43 00 28 */ fsubs f2, f3, f0
/* 802B6AB4 002B39F4 80 03 00 80 */ lwz r0, 0x80(r3)
/* 802B6AB8 002B39F8 C8 22 C0 48 */ lfd f1, lbl_80455A48-_SDA2_BASE_(r2)
/* 802B6ABC 002B39FC 90 01 00 0C */ stw r0, 0xc(r1)
/* 802B6AC0 002B3A00 3C 00 43 30 */ lis r0, 0x4330
/* 802B6AC4 002B3A04 90 01 00 08 */ stw r0, 8(r1)
/* 802B6AC8 002B3A08 C8 01 00 08 */ lfd f0, 8(r1)
/* 802B6ACC 002B3A0C EC 00 08 28 */ fsubs f0, f0, f1
/* 802B6AD0 002B3A10 EC 02 00 24 */ fdivs f0, f2, f0
/* 802B6AD4 002B3A14 D0 03 00 78 */ stfs f0, 0x78(r3)
/* 802B6AD8 002B3A18 D0 63 00 7C */ stfs f3, 0x7c(r3)
lbl_802B6ADC:
/* 802B6ADC 002B3A1C 38 00 00 01 */ li r0, 1
/* 802B6AE0 002B3A20 98 1F 00 1C */ stb r0, 0x1c(r31)
/* 802B6AE4 002B3A24 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802B6AE8 002B3A28 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802B6AEC 002B3A2C 7C 08 03 A6 */ mtlr r0
/* 802B6AF0 002B3A30 38 21 00 20 */ addi r1, r1, 0x20
/* 802B6AF4 002B3A34 4E 80 00 20 */ blr
include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
+3198
View File
File diff suppressed because it is too large Load Diff
include/Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s
+4
View File
@@ -0,0 +1,4 @@
/* 802B9968 002B68A8 88 03 00 D0 */ lbz r0, 0xd0(r3)
/* 802B996C 002B68AC 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d
/* 802B9970 002B68B0 98 03 00 D0 */ stb r0, 0xd0(r3)
/* 802B9974 002B68B4 4E 80 00 20 */ blr
include/functions.h
+71 -30
View File
@@ -93,7 +93,6 @@ extern "C" {
void func_80003540(void);
void func_80362324(void);
void func_8036221C(void);
void func_803621D0(void);
void func_8036221C(void);
void countUsed__FP10JKRExpHeap(void);
void JUTReport(void);
@@ -262,10 +261,53 @@ extern "C" {
void mDoMch_HeapCheckAll(void);
}
//Z2SoundMgr
extern "C"{
void resetFilterAll__10Z2SoundMgrFv(void);
void seMoveVolumeAll__7Z2SeMgrFfUl(void);
void moveVolume__18JAISoundParamsMoveFfUl(void);
void Z2SeqMgr_NS_setBattleBgmOff(void);
void setSceneExist__10Z2SceneMgrFb(void);
void Z2StatusMgr_NS_menuOut(void);
void func_803621F4(void);
void Z2SceneMgr_NS_sceneChange(void);
void __ct__10JAISoundIDFRC10JAISoundID(void);
void Z2EnvSeMgr_NS_initSceneEnvSe(void);
void setFieldBgmPlay__8Z2SeqMgrFb(void);
void Z2SeqMgr_NS_setTimeProcVolMod(void);
void Z2SeqMgr_NS_setHeightVolMod(void);
void JAISound_NS_stop(void);
void JAUSoundTable_NS_getTypeID(void);
void JAIStreamMgr_NS_isActive(void);
void JAISound_NS_getID(void);
void JSUList_X1_(void);
void dComIfGs_isStageSwitch(void);
void dComIfGs_getStartPoint(void);
void Z2StatusMgr_NS_checkDayTime(void);
void Z2SeqMgr_NS_bgmStop(void);
void isSwitch__10dSv_info_cCFii(void);
void Z2SoundObjMgr_NS_setForceBattleArea(void);
void Z2SeqMgr_NS_unMuteSceneBgm(void);
void Z2SeqMgr_NS_muteSceneBgm(void);
void dComIfGs_isEventBit(void);
void Z2SeqMgr_NS_changeBgmStatus(void);
void JAISoundID_NS___as(void);
void dComIfGs_isSaveSwitch(void);
void Z2StatusMgr_NS_setDemoName(void);
void Z2SeMgr_NS_resetModY(void);
void Z2SoundObjMgr_NS_setGhostEnemyState(void);
void Z2SeMgr_NS_resetCrowdSize(void);
void Z2SeqMgr_NS_setTwilightGateVol(void);
void Z2SeqMgr_NS_setWindStoneVol(void);
void Z2SeqMgr_NS_resetBattleBgmParams(void);
void JAISoundID_X1_(void);
void func_803621A8(void);
void moveVolume__18JAISoundParamsMoveFfUl(void);
void seMoveVolumeAll__7Z2SeMgrFfUl(void);
}
// Z2LinkMgr
#include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
extern "C" {
void Z2CreatureLink_NS_startLinkSound(u32, u32, s8);
void Z2CreatureLink_NS_startLinkSound(void);
void Z2SoundObjSimple(void);
void Z2LinkSoundStarter(void);
void Z2Creature(void);
@@ -274,36 +316,35 @@ extern "C" {
void Z2SoundObjBase_NS_dtor(void);
void Z2Creature_NS_deleteObject(void);
void deleteKantera__14Z2CreatureLinkFv(void);
void Z2Creature_NS_init_X1_(Vec*, Vec*, Vec*, u8, u8, u8);
void Z2Creature_NS_init_X1_(void);
void Z2SoundObjBase_NS_deleteObject(void);
float PSVECSquareDistance(Vec*, Vec*);
void JAISoundParamsMove_NS_moveVolume(float, u32);
int* Z2CreatureLink_NS_startLinkSoundLevel(JAISoundID, u32, s8);
u32 Z2SeMgr_NS_seStartLevel(JAISoundID, Vec*, u32, s8, float, float, float, float, u8);
void Z2Creature_NS_framework(u32, s8);
void Z2Audience_NS_setTargetVolume(float, int);
void Z2SoundObjMgr_NS_setGhostEnemyState(u8);
void Z2FxLineMgr_NS_setFxForceOff(bool);
u32 Z2SeMgr_NS_seStart(JAISoundID, Vec*, u32, s8, float, float, float, float, u8);
void JAISoundParamsMove_NS_movePitch(float, u32);
float Z2Calc_NS_linearTransform(float, float, float, float, float, bool);
void JAISound_NS_stop(u32);
u8 Z2SoundHandles_NS_getHandleSoundID(JAISoundID);
void Z2SeqMgr_NS_setBattleSeqState(u8);
void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(JAISoundID, u32, s8);
void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(JAISoundID, u32, s8);
void Z2SoundStarter_NS_setPortData(JAISoundHandle*, u32, u16, s8);
void Z2SoundObjBase_NS_startCollisionSE(u32, u32, Z2SoundObjBase*);
void Z2SeqMgr_NS_setBattleLastHit(u8);
void PSVECSquareDistance(void);
void moveVolume__18JAISoundParamsMoveFfUl(void);
void Z2CreatureLink_NS_startLinkSoundLevel(void);
void Z2SeMgr_NS_seStartLevel(void);
void Z2Creature_NS_framework(void);
void Z2Audience_NS_setTargetVolume(void);
void Z2SoundObjMgr_NS_setGhostEnemyState(void);
void Z2FxLineMgr_NS_setFxForceOff(void);
void Z2SeMgr_NS_seStart(void);
void JAISoundParamsMove_NS_movePitch(void);
void Z2Calc_NS_linearTransform(void);
void JAISound_NS_stop(void);
void Z2SoundHandles_NS_getHandleSoundID(void);
void Z2SeqMgr_NS_setBattleSeqState(void);
void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void);
void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void);
void Z2SoundStarter_NS_setPortData(void);
void Z2SoundObjBase_NS_startCollisionSE(void);
void Z2SeqMgr_NS_setBattleLastHit(void);
}
// Z2Calc
#include "Z2AudioLib/Z2Calc/Z2Calc.h"
extern "C" {
float linearTransform__6Z2CalcFfffffb(float, float, float, float, float, bool);
double func_8036C740(double);
double func_8036C780(double,double);
float getRandom_0_1__6Z2CalcFv();
float getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(float, float, float, float, float, float, Z2Calc::CurveSign);
void JMath_NS_TRandom_fast_(u32);
void linearTransform__6Z2CalcFfffffb(void);
void func_8036C740(void);
void func_8036C780(void);
void getRandom_0_1__6Z2CalcFv(void);
void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void);
void JMath_NS_TRandom_fast_(void);
}
include/variables.h
+16 -5
View File
@@ -89,6 +89,7 @@ extern JKRHeap* lbl_80451378; // JKRHeap::sRootHeap
extern JKRHeap* lbl_80451374; // JKRHeap::sCurrentHeap
extern void* lbl_8045137C; // JKRHeap::mErrorHandler
extern u8 lbl_804508B0[8]; // ::*fill*
extern u8 lbl_80451380[4]; // DAT_80451380
@@ -127,8 +128,6 @@ extern u8 lbl_803CAD10[0x20];
extern u32 lbl_80450B44;
// func_80450B88
extern u32 lbl_80450B88;
extern u32 lbl_80450B7C;
extern u32 lbl_80455C98;
extern u32 lbl_80455C9C;
extern u8 lbl_80455CA0[8];
@@ -142,10 +141,8 @@ extern u32 lbl_80455CC0;
// func_802C3AFC
extern u32 lbl_80450B40;
extern u32 lbl_80450B48;
// func_802C3BD4
extern u32 lbl_80450B84;
extern u8 lbl_80455CE0[8];
extern u32 lbl_80455CC4;
extern u32 lbl_80455CC8;
@@ -181,4 +178,18 @@ extern u32 lbl_80455834;
// func_802A98D4
extern u32 lbl_80451330;
extern u32 lbl_80451334;
extern u32 lbl_80450B80;
//Z2SoundLib SInstance
class Z2SceneMgr;
extern Z2SceneMgr* lbl_80450B80; // Z2SceneMgr sInstance
class Z2SoundMgr;
extern Z2SoundMgr* lbl_80450B60; // Z2SoundMgr sInstance
class Z2SeqMgr;
extern Z2SeqMgr* lbl_80450B84; //Z2SeqMgr sInstance
class Z2StatusMgr;
extern Z2StatusMgr* lbl_80450B7C; //Z2StatusMgr sInstance
class Z2SeMgr;
extern Z2SeMgr* lbl_80450B88; //Z2SeMgr sInstance
class Z2SoundObjMgr;
extern Z2SoundObjMgr* lbl_80450B48; //Z2SoundObjMgr sInstance
libs/Z2AudioLib/Z2Calc.cpp
+1 -2
View File
@@ -1,5 +1,4 @@
//#include "Z2AudioLib/Z2Calc/Z2calc.h"
#include "global.h"
#include "Z2AudioLib/Z2Calc/Z2calc.h"
// 1 instruction off
#ifdef NONMATCHING
libs/Z2AudioLib/Z2LinkMgr.cpp
+1 -2
View File
@@ -1,5 +1,4 @@
//#include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
#include "global.h"
#include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h"
void Z2CreatureLink::setLinkGroupInfo(u8 param1) {
return;
libs/Z2AudioLib/Z2SceneMgr.cpp
+139 -1
View File
@@ -1 +1,139 @@
// ok
#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
//Missing 2 instructions (beginning and end)
#ifdef NONMATCHING
Z2SceneMgr::Z2SceneMgr(void){
lbl_80450B80 = this;
this->field_0x4 = -1;
this->timer = -1;
this->BGM_ID = -1;
this->roomNum = -1;
this->SeWave_1 = 0;
this->SeWaveToErase_1 = 0;
this->SeWave_2 = 0;
this->SeWaveToErase_2 = 0;
this->BgmWave_1 = 0;
this->BgmWaveToErase_1 = 0;
this->BgmWave_2 = 0;
this->BgmWaveToErase_2 = 0;
this->SeWave_3 = 0;
this->SeWaveToErase_3 = 0;
this->field_0x18 = 0;
this->field_0x19 = 0;
this->field_0x1a = 0;
this->field_0x1b = 0;
this->field_0x1d = 0;
this->field_0x1c = 0;
this->field_0x1e = false;
this->field_0x17 = 0;
return;
}
#else
asm Z2SceneMgr::Z2SceneMgr(void){
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s"
}
#endif
void Z2SceneMgr::setInDarkness(bool param_1){
this->inDarkness = param_1;
if (param_1 == false){
lbl_80450B60->resetFilterAll();
}
return;
}
extern float lbl_80455A38;
extern float lbl_80455A3C;
#ifdef NONMATCHING
void Z2SceneMgr::setSceneExist(bool param_1){
Z2SoundMgr *Z2soundMgrPtr;
this->field_0x1d = param_1;
this->timer = 0;
Z2soundMgrPtr = lbl_80450B60;
if(param_1==false){
Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0xb4);
}
else{
this->field_0x1c = 1;
if (this->SeWave_3 == 0x85) {
Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0);
}
else{
if (this->SeWave_3 == 0x7f) {
lbl_80450B88->seMoveVolumeAll(lbl_80455A38,0);
}else{
Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A3C,0x21);
}
}
}
return;
}
#else
asm void Z2SceneMgr::setSceneExist(bool param_1){
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s"
}
#endif
extern float lbl_80455A40;
extern double lbl_80455A48;
asm void Z2SceneMgr::setFadeOutStart(u8 param_1) {
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s"
}
asm void Z2SceneMgr::setFadeInStart(u8 param_1) {
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s"
}
extern float lbl_80455A50;
extern char lbl_8039BFA8[]; //probably wrong
extern char* lbl_803CA5C0[]; //array of char*
extern void* lbl_803CA878[]; //switch table (array of void*)
extern void* lbl_803CA844[]; //switch table (array of void*)
extern void* lbl_803CA824[]; //switch table (array of void*)
extern void* lbl_803CA7F4[]; //switch table (array of void*)
extern void* lbl_803CA7BC[]; //switch table (array of void*)
extern void* lbl_803CA784[]; //switch table (array of void*)
extern float lbl_80455A54;
extern float lbl_80455A58;
extern void* lbl_803CA744[]; //switch table (array of void*)
extern void* lbl_803CA704[]; //switch table (array of void*)
extern float lbl_80455A5C;
extern u32 lbl_80450860;
extern float lbl_80455A60;
extern float lbl_80455A64;
extern void* lbl_80450B58; //JAUSoundTable sInstance
extern void* lbl_80450B3C; //Z2EnvSeMgr sInstance
asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum) {
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
}
JAISoundID::JAISoundID(JAISoundID const &soundIdToSet){
this->soundId = soundIdToSet.soundId;
return;
}
#ifdef NONMATCHING //1 Instruction off
void Z2SeqMgr::setFieldBgmPlay(bool param_1) {
this->unk_1 = (param_1 & 1U) << 2 | this->unk_1 & 0xfb;
}
#else
asm void Z2SeqMgr::setFieldBgmPlay(bool param_1){
nofralloc
#include "Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s"
}
#endif
obj_files.mk
+1
View File
@@ -405,6 +405,7 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/Z2AudioLib/Z2SeMgr.o \
$(BUILD_DIR)/asm/Z2AudioLib/Z2SeqMgr.o \
$(BUILD_DIR)/asm/Z2AudioLib/Z2StatusMgr.o \
$(BUILD_DIR)/libs/Z2AudioLib/Z2SceneMgr.o \
$(BUILD_DIR)/asm/Z2AudioLib/Z2SceneMgr.o \
$(BUILD_DIR)/asm/Z2AudioLib/Z2FxLineMgr.o \
$(BUILD_DIR)/asm/Z2AudioLib/Z2SoundInfo.o \