encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

add missing class and clang-format

Browse Source
This commit is contained in:
unknown
2020-12-25 21:16:13 -05:00
parent e066711553 e8315cdb81
commit 64a6a97b7b
244 changed files with 16175 additions and 15556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/JUtility/JUTXfb.s
+1 -10
View File
@@ -2,15 +2,6 @@
.section .text, "ax" # 802e5214
.global JUTXfb_NS_clearIndex
JUTXfb_NS_clearIndex:
/* 802E5214 002E2154 38 00 FF FF */ li r0, -1
/* 802E5218 002E2158 B0 03 00 14 */ sth r0, 0x14(r3)
/* 802E521C 002E215C B0 03 00 16 */ sth r0, 0x16(r3)
/* 802E5220 002E2160 B0 03 00 18 */ sth r0, 0x18(r3)
/* 802E5224 002E2164 4E 80 00 20 */ blr
.global JUTXfb_NS_common_init
JUTXfb_NS_common_init:
/* 802E5228 002E2168 94 21 FF F0 */ stwu r1, -0x10(r1)
@@ -19,7 +10,7 @@ JUTXfb_NS_common_init:
/* 802E5234 002E2174 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802E5238 002E2178 7C 7F 1B 78 */ mr r31, r3
/* 802E523C 002E217C 90 83 00 10 */ stw r4, 0x10(r3)
/* 802E5240 002E2180 4B FF FF D5 */ bl JUTXfb_NS_clearIndex
/* 802E5240 002E2180 4B FF FF D5 */ bl clearIndex__6JUTXfbFv
/* 802E5244 002E2184 38 00 00 63 */ li r0, 0x63
/* 802E5248 002E2188 90 1F 00 1C */ stw r0, 0x1c(r31)
/* 802E524C 002E218C 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/Z2AudioLib/Z2AudioMgr.s
+8 -8
View File
@@ -11,13 +11,13 @@ Z2AudioMgr:
/* 802CD254 002CA194 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802CD258 002CA198 93 C1 00 08 */ stw r30, 8(r1)
/* 802CD25C 002CA19C 7C 7F 1B 78 */ mr r31, r3
/* 802CD260 002CA1A0 4B FD E3 ED */ bl Z2SeMgr
/* 802CD260 002CA1A0 4B FD E3 ED */ bl __ct__7Z2SeMgrFv
/* 802CD264 002CA1A4 38 7F 03 D0 */ addi r3, r31, 0x3d0
/* 802CD268 002CA1A8 4B FE 1C 39 */ bl Z2SeqMgr
/* 802CD268 002CA1A8 4B FE 1C 39 */ bl __ct__8Z2SeqMgrFv
/* 802CD26C 002CA1AC 38 7F 04 A4 */ addi r3, r31, 0x4a4
/* 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
/* 802CD278 002CA1B8 4B FE 8C A5 */ bl __ct__11Z2StatusMgrFv
/* 802CD27C 002CA1BC 38 7F 04 F4 */ addi r3, r31, 0x4f4
/* 802CD280 002CA1C0 4B FF 26 A1 */ bl Z2SoundObjMgr
/* 802CD284 002CA1C4 3C 60 80 3D */ lis r3, lbl_803CBF38@ha
@@ -371,7 +371,7 @@ lbl_802CD7A0:
/* 802CD7A0 002CA6E0 7F 23 CB 78 */ mr r3, r25
/* 802CD7A4 002CA6E4 4B FD 79 55 */ bl JAUSection_NS_finishBuild
/* 802CD7A8 002CA6E8 7F C3 F3 78 */ mr r3, r30
/* 802CD7AC 002CA6EC 4B FD DF A5 */ bl Z2SeMgr_NS_initSe
/* 802CD7AC 002CA6EC 4B FD DF A5 */ bl initSe__7Z2SeMgrFv
.global seqCallback
/* 802CD7B0 002CA6F0 3C 60 80 2B */ lis r3, seqCallback@ha
.global seqCallback
@@ -456,15 +456,15 @@ Z2AudioMgr_NS_zeldaGFrameWork:
/* 802CD8C0 002CA800 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802CD8C4 002CA804 7C 7F 1B 78 */ mr r31, r3
/* 802CD8C8 002CA808 38 7F 04 C4 */ addi r3, r31, 0x4c4
/* 802CD8CC 002CA80C 4B FE 8E 51 */ bl Z2StatusMgr_NS_processTime
/* 802CD8CC 002CA80C 4B FE 8E 51 */ bl processTime__11Z2StatusMgrFv
/* 802CD8D0 002CA810 38 7F 0F 2C */ addi r3, r31, 0xf2c
/* 802CD8D4 002CA814 4B FF F0 FD */ bl Z2SpeechMgr2_NS_framework
/* 802CD8D8 002CA818 7F E3 FB 78 */ mr r3, r31
/* 802CD8DC 002CA81C 4B FE 08 A9 */ bl Z2SeMgr_NS_processSeFramework
/* 802CD8DC 002CA81C 4B FE 08 A9 */ bl processSeFramework__7Z2SeMgrFv
/* 802CD8E0 002CA820 38 7F 03 D0 */ addi r3, r31, 0x3d0
/* 802CD8E4 002CA824 4B FE 5A C5 */ bl Z2SeqMgr_NS_processBgmFramework
/* 802CD8E8 002CA828 38 7F 04 C4 */ addi r3, r31, 0x4c4
/* 802CD8EC 002CA82C 4B FE 86 91 */ bl Z2StatusMgr_NS_processHeartGaugeSound
/* 802CD8EC 002CA82C 4B FE 86 91 */ bl processHeartGaugeSound__11Z2StatusMgrFv
/* 802CD8F0 002CA830 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802CD8F4 002CA834 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802CD8F8 002CA838 7C 08 03 A6 */ mtlr r0
@@ -550,7 +550,7 @@ Z2AudioMgr_NS_resetRecover:
/* 802CDA0C 002CA94C 90 1F 04 70 */ stw r0, 0x470(r31)
/* 802CDA10 002CA950 D0 1F 04 6C */ stfs f0, 0x46c(r31)
/* 802CDA14 002CA954 38 7F 04 C4 */ addi r3, r31, 0x4c4
/* 802CDA18 002CA958 4B FE 87 65 */ bl Z2StatusMgr_NS_menuOut
/* 802CDA18 002CA958 4B FE 87 65 */ bl menuOut__11Z2StatusMgrFv
/* 802CDA1C 002CA95C C0 22 C5 5C */ lfs f1, lbl_80455F5C-_SDA2_BASE_(r2)
/* 802CDA20 002CA960 D0 3F 04 44 */ stfs f1, 0x444(r31)
/* 802CDA24 002CA964 C0 02 C5 60 */ lfs f0, lbl_80455F60-_SDA2_BASE_(r2)
asm/Z2AudioLib/Z2Creature.s
+8 -8
View File
@@ -369,7 +369,7 @@ lbl_802C08C4:
/* 802C08E4 002BD824 C0 62 C2 30 */ lfs f3, lbl_80455C30-_SDA2_BASE_(r2)
/* 802C08E8 002BD828 FC 80 18 90 */ fmr f4, f3
/* 802C08EC 002BD82C 39 00 00 00 */ li r8, 0
/* 802C08F0 002BD830 4B FE BC 1D */ bl Z2SeMgr_NS_seStartLevel
/* 802C08F0 002BD830 4B FE BC 1D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 802C08F4 002BD834 38 60 00 00 */ li r3, 0
/* 802C08F8 002BD838 48 00 01 2C */ b lbl_802C0A24
lbl_802C08FC:
@@ -660,7 +660,7 @@ Z2CreatureCitizen_NS_init:
/* 802C0D1C 002BDC5C 28 00 00 00 */ cmplwi r0, 0
/* 802C0D20 002BDC60 40 82 00 0C */ bne lbl_802C0D2C
/* 802C0D24 002BDC64 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802C0D28 002BDC68 4B FE AC 39 */ bl Z2SeMgr_NS_decrCrowdSize
/* 802C0D28 002BDC68 4B FE AC 39 */ bl decrCrowdSize__7Z2SeMgrFv
lbl_802C0D2C:
/* 802C0D2C 002BDC6C 7F E3 FB 78 */ mr r3, r31
/* 802C0D30 002BDC70 4B FF F7 B9 */ bl Z2Creature_NS_deleteObject
@@ -697,7 +697,7 @@ Z2CreatureCitizen_NS_setMdlType:
/* 802C0DA0 002BDCE0 98 1F 00 A0 */ stb r0, 0xa0(r31)
/* 802C0DA4 002BDCE4 40 82 00 0C */ bne lbl_802C0DB0
/* 802C0DA8 002BDCE8 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802C0DAC 002BDCEC 4B FE AB 91 */ bl Z2SeMgr_NS_incrCrowdSize
/* 802C0DAC 002BDCEC 4B FE AB 91 */ bl incrCrowdSize__7Z2SeMgrFv
lbl_802C0DB0:
/* 802C0DB0 002BDCF0 7F C0 07 75 */ extsb. r0, r30
/* 802C0DB4 002BDCF4 40 82 00 24 */ bne lbl_802C0DD8
@@ -769,7 +769,7 @@ lbl_802C0EA4:
/* 802C0EA8 002BDDE8 28 00 00 00 */ cmplwi r0, 0
/* 802C0EAC 002BDDEC 40 82 00 14 */ bne lbl_802C0EC0
/* 802C0EB0 002BDDF0 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802C0EB4 002BDDF4 4B FE AA AD */ bl Z2SeMgr_NS_decrCrowdSize
/* 802C0EB4 002BDDF4 4B FE AA AD */ bl decrCrowdSize__7Z2SeMgrFv
/* 802C0EB8 002BDDF8 38 00 00 01 */ li r0, 1
/* 802C0EBC 002BDDFC 98 1E 00 A2 */ stb r0, 0xa2(r30)
lbl_802C0EC0:
@@ -800,7 +800,7 @@ lbl_802C0F18:
/* 802C0F1C 002BDE5C 28 00 00 00 */ cmplwi r0, 0
/* 802C0F20 002BDE60 40 82 00 14 */ bne lbl_802C0F34
/* 802C0F24 002BDE64 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802C0F28 002BDE68 4B FE AA 39 */ bl Z2SeMgr_NS_decrCrowdSize
/* 802C0F28 002BDE68 4B FE AA 39 */ bl decrCrowdSize__7Z2SeMgrFv
/* 802C0F2C 002BDE6C 38 00 00 01 */ li r0, 1
/* 802C0F30 002BDE70 98 1E 00 A2 */ stb r0, 0xa2(r30)
lbl_802C0F34:
@@ -1714,7 +1714,7 @@ lbl_802C1C50:
/* 802C1C60 002BEBA0 40 80 00 30 */ bge lbl_802C1C90
/* 802C1C64 002BEBA4 3C 80 01 00 */ lis r4, 0x01000064@ha
/* 802C1C68 002BEBA8 38 84 00 64 */ addi r4, r4, 0x01000064@l
/* 802C1C6C 002BEBAC 4B FE D8 31 */ bl Z2SeqMgr_NS_subBgmStart
/* 802C1C6C 002BEBAC 4B FE D8 31 */ bl subBgmStart__8Z2SeqMgrFUl
/* 802C1C70 002BEBB0 48 00 00 20 */ b lbl_802C1C90
lbl_802C1C74:
/* 802C1C74 002BEBB4 28 04 03 E8 */ cmplwi r4, 0x3e8
@@ -1723,7 +1723,7 @@ lbl_802C1C74:
/* 802C1C80 002BEBC0 88 04 00 2C */ lbz r0, 0x2c(r4)
/* 802C1C84 002BEBC4 28 00 00 06 */ cmplwi r0, 6
/* 802C1C88 002BEBC8 41 82 00 08 */ beq lbl_802C1C90
/* 802C1C8C 002BEBCC 4B FE DB F9 */ bl Z2SeqMgr_NS_subBgmStop
/* 802C1C8C 002BEBCC 4B FE DB F9 */ bl subBgmStop__8Z2SeqMgrFv
lbl_802C1C90:
/* 802C1C90 002BEBD0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C1C94 002BEBD4 7C 08 03 A6 */ mtlr r0
@@ -1751,7 +1751,7 @@ lbl_802C1CD4:
/* 802C1CE4 002BEC24 88 04 00 2C */ lbz r0, 0x2c(r4)
/* 802C1CE8 002BEC28 28 00 00 06 */ cmplwi r0, 6
/* 802C1CEC 002BEC2C 41 82 00 08 */ beq lbl_802C1CF4
/* 802C1CF0 002BEC30 4B FE DB 95 */ bl Z2SeqMgr_NS_subBgmStop
/* 802C1CF0 002BEC30 4B FE DB 95 */ bl subBgmStop__8Z2SeqMgrFv
lbl_802C1CF4:
/* 802C1CF4 002BEC34 7F E3 FB 78 */ mr r3, r31
/* 802C1CF8 002BEC38 4B FF E7 F1 */ bl Z2Creature_NS_deleteObject
asm/Z2AudioLib/Z2EnvSeMgr.s
+102 -102
View File
File diff suppressed because it is too large Load Diff
asm/Z2AudioLib/Z2SceneMgr.s
+13 -13
View File
@@ -344,7 +344,7 @@ Z2SceneMgr_NS__load1stWaveInner_1:
/* 802B9DA8 002B6CE8 7C 7F 1B 78 */ mr r31, r3
/* 802B9DAC 002B6CEC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802B9DB0 002B6CF0 38 80 00 00 */ li r4, 0
/* 802B9DB4 002B6CF4 4B FF 3B 99 */ bl Z2SeMgr_NS_seStopAll
/* 802B9DB4 002B6CF4 4B FF 3B 99 */ bl seStopAll__7Z2SeMgrFUl
/* 802B9DB8 002B6CF8 80 6D 85 BC */ lwz r3, lbl_80450B3C-_SDA_BASE_(r13)
/* 802B9DBC 002B6CFC 48 00 CB E1 */ bl Z2EnvSeMgr_NS_resetSceneInner
/* 802B9DC0 002B6D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -478,7 +478,7 @@ lbl_802B9F8C:
/* 802B9F90 002B6ED0 41 82 00 1C */ beq lbl_802B9FAC
/* 802B9F94 002B6ED4 38 80 00 0F */ li r4, 0xf
/* 802B9F98 002B6ED8 38 A0 00 00 */ li r5, 0
/* 802B9F9C 002B6EDC 4B FF 54 6D */ bl Z2SeqMgr_NS_bgmStop
/* 802B9F9C 002B6EDC 4B FF 54 6D */ bl bgmStop__8Z2SeqMgrFUll
/* 802B9FA0 002B6EE0 38 00 FF F1 */ li r0, -15
/* 802B9FA4 002B6EE4 98 1F 00 17 */ stb r0, 0x17(r31)
/* 802B9FA8 002B6EE8 48 00 00 0C */ b lbl_802B9FB4
@@ -766,7 +766,7 @@ lbl_802BA378:
lbl_802BA37C:
/* 802BA37C 002B72BC 38 A0 00 00 */ li r5, 0
/* 802BA380 002B72C0 54 E6 06 3E */ clrlwi r6, r7, 0x18
/* 802BA384 002B72C4 4B FF 4C 8D */ bl Z2SeqMgr_NS_bgmStart
/* 802BA384 002B72C4 4B FF 4C 8D */ bl bgmStart__8Z2SeqMgrFUlUll
/* 802BA388 002B72C8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA38C 002B72CC C0 02 C0 3C */ lfs f0, lbl_80455A3C-_SDA2_BASE_(r2)
/* 802BA390 002B72D0 D0 03 00 34 */ stfs f0, 0x34(r3)
@@ -795,17 +795,17 @@ lbl_802BA37C:
/* 802BA3EC 002B732C 40 82 00 14 */ bne lbl_802BA400
/* 802BA3F0 002B7330 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA3F4 002B7334 38 80 00 05 */ li r4, 5
/* 802BA3F8 002B7338 4B FF 5B 95 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA3F8 002B7338 4B FF 5B 95 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA3FC 002B733C 48 00 01 38 */ b lbl_802BA534
lbl_802BA400:
/* 802BA400 002B7340 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA404 002B7344 88 9F 00 0C */ lbz r4, 0xc(r31)
/* 802BA408 002B7348 7C 84 07 74 */ extsb r4, r4
/* 802BA40C 002B734C 4B FF 5B 81 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA40C 002B734C 4B FF 5B 81 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA410 002B7350 48 00 01 24 */ b lbl_802BA534
/* 802BA414 002B7354 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA418 002B7358 38 80 00 00 */ li r4, 0
/* 802BA41C 002B735C 4B FF 5B 71 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA41C 002B735C 4B FF 5B 71 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA420 002B7360 48 00 01 14 */ b lbl_802BA534
/* 802BA424 002B7364 80 1F 00 04 */ lwz r0, 4(r31)
/* 802BA428 002B7368 2C 00 00 0A */ cmpwi r0, 0xa
@@ -846,12 +846,12 @@ lbl_802BA474:
/* 802BA4AC 002B73EC 40 82 00 14 */ bne lbl_802BA4C0
/* 802BA4B0 002B73F0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA4B4 002B73F4 38 80 00 02 */ li r4, 2
/* 802BA4B8 002B73F8 4B FF 5A D5 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA4B8 002B73F8 4B FF 5A D5 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA4BC 002B73FC 48 00 00 78 */ b lbl_802BA534
lbl_802BA4C0:
/* 802BA4C0 002B7400 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA4C4 002B7404 38 80 00 00 */ li r4, 0
/* 802BA4C8 002B7408 4B FF 5A C5 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA4C8 002B7408 4B FF 5A C5 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA4CC 002B740C 48 00 00 68 */ b lbl_802BA534
/* 802BA4D0 002B7410 80 1F 00 04 */ lwz r0, 4(r31)
/* 802BA4D4 002B7414 2C 00 00 06 */ cmpwi r0, 6
@@ -864,24 +864,24 @@ lbl_802BA4C0:
lbl_802BA4F0:
/* 802BA4F0 002B7430 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA4F4 002B7434 38 80 00 02 */ li r4, 2
/* 802BA4F8 002B7438 4B FF 5A 95 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA4F8 002B7438 4B FF 5A 95 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA4FC 002B743C 48 00 00 38 */ b lbl_802BA534
lbl_802BA500:
/* 802BA500 002B7440 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA504 002B7444 38 80 00 00 */ li r4, 0
/* 802BA508 002B7448 4B FF 5A 85 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BA508 002B7448 4B FF 5A 85 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BA50C 002B744C 48 00 00 28 */ b lbl_802BA534
lbl_802BA510:
/* 802BA510 002B7450 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA514 002B7454 4B FF 58 D9 */ bl Z2SeqMgr_NS_bgmStreamCheckReady
/* 802BA514 002B7454 4B FF 58 D9 */ bl bgmStreamCheckReady__8Z2SeqMgrFv
/* 802BA518 002B7458 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802BA51C 002B745C 40 82 00 10 */ bne lbl_802BA52C
/* 802BA520 002B7460 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA524 002B7464 80 9F 00 00 */ lwz r4, 0(r31)
/* 802BA528 002B7468 4B FF 56 6D */ bl Z2SeqMgr_NS_bgmStreamPrepare
/* 802BA528 002B7468 4B FF 56 6D */ bl bgmStreamPrepare__8Z2SeqMgrFUl
lbl_802BA52C:
/* 802BA52C 002B746C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA530 002B7470 4B FF 58 E9 */ bl Z2SeqMgr_NS_bgmStreamPlay
/* 802BA530 002B7470 4B FF 58 E9 */ bl bgmStreamPlay__8Z2SeqMgrFv
lbl_802BA534:
/* 802BA534 002B7474 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BA538 002B7478 C0 02 C0 3C */ lfs f0, lbl_80455A3C-_SDA2_BASE_(r2)
asm/Z2AudioLib/Z2SeMgr.s
-4053
View File
File diff suppressed because it is too large Load Diff
asm/Z2AudioLib/Z2SeqMgr.s
+26 -4409
View File
File diff suppressed because it is too large Load Diff
asm/Z2AudioLib/Z2SoundMgr.s
+6 -6
View File
@@ -48,11 +48,11 @@ seqCallback:
/* 802A9C68 002A6BA8 48 00 01 30 */ b lbl_802A9D98
/* 802A9C6C 002A6BAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802A9C70 002A6BB0 38 80 00 01 */ li r4, 1
/* 802A9C74 002A6BB4 48 00 8D 29 */ bl Z2SeqMgr_NS_onVariantBgmJumpEnd
/* 802A9C74 002A6BB4 48 00 8D 29 */ bl onVariantBgmJumpEnd__8Z2SeqMgrFb
/* 802A9C78 002A6BB8 48 00 01 20 */ b lbl_802A9D98
/* 802A9C7C 002A6BBC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802A9C80 002A6BC0 38 80 00 00 */ li r4, 0
/* 802A9C84 002A6BC4 48 00 8D 19 */ bl Z2SeqMgr_NS_onVariantBgmJumpEnd
/* 802A9C84 002A6BC4 48 00 8D 19 */ bl onVariantBgmJumpEnd__8Z2SeqMgrFb
/* 802A9C88 002A6BC8 48 00 01 10 */ b lbl_802A9D98
/* 802A9C8C 002A6BCC 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13)
/* 802A9C90 002A6BD0 83 C3 02 8C */ lwz r30, 0x28c(r3)
@@ -123,11 +123,11 @@ lbl_802A9D68:
/* 802A9D70 002A6CB0 48 00 00 28 */ b lbl_802A9D98
/* 802A9D74 002A6CB4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802A9D78 002A6CB8 38 80 00 07 */ li r4, 7
/* 802A9D7C 002A6CBC 48 00 62 11 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802A9D7C 002A6CBC 48 00 62 11 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802A9D80 002A6CC0 48 00 00 18 */ b lbl_802A9D98
/* 802A9D84 002A6CC4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802A9D88 002A6CC8 38 80 00 08 */ li r4, 8
/* 802A9D8C 002A6CCC 48 00 62 01 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802A9D8C 002A6CCC 48 00 62 01 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802A9D90 002A6CD0 48 00 00 08 */ b lbl_802A9D98
/* 802A9D94 002A6CD4 4B D8 5F 61 */ bl dComIfGs_staffroll_next_go
lbl_802A9D98:
@@ -298,7 +298,7 @@ lbl_802A9FD4:
/* 802A9FEC 002A6F2C 38 84 00 48 */ addi r4, r4, 0x01000048@l
/* 802A9FF0 002A6F30 38 A0 00 00 */ li r5, 0
/* 802A9FF4 002A6F34 38 C0 00 00 */ li r6, 0
/* 802A9FF8 002A6F38 48 00 50 19 */ bl Z2SeqMgr_NS_bgmStart
/* 802A9FF8 002A6F38 48 00 50 19 */ bl bgmStart__8Z2SeqMgrFUlUll
/* 802A9FFC 002A6F3C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802AA000 002A6F40 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2)
/* 802AA004 002A6F44 D0 23 00 34 */ stfs f1, 0x34(r3)
@@ -313,7 +313,7 @@ lbl_802A9FD4:
/* 802AA028 002A6F68 D0 03 00 4C */ stfs f0, 0x4c(r3)
/* 802AA02C 002A6F6C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802AA030 002A6F70 38 80 00 00 */ li r4, 0
/* 802AA034 002A6F74 48 00 5F 59 */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802AA034 002A6F74 48 00 5F 59 */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802AA038 002A6F78 38 00 00 0B */ li r0, 0xb
/* 802AA03C 002A6F7C 90 01 00 18 */ stw r0, 0x18(r1)
/* 802AA040 002A6F80 38 7C 00 04 */ addi r3, r28, 4
asm/Z2AudioLib/Z2SoundObjMgr.s
+7 -7
View File
@@ -316,7 +316,7 @@ lbl_802BFD78:
lbl_802BFD8C:
/* 802BFD8C 002BCCCC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFD90 002BCCD0 88 97 00 1B */ lbz r4, 0x1b(r23)
/* 802BFD94 002BCCD4 4B FF 20 61 */ bl Z2SeqMgr_NS_changeSubBgmStatus
/* 802BFD94 002BCCD4 4B FF 20 61 */ bl changeSubBgmStatus__8Z2SeqMgrFl
lbl_802BFD98:
/* 802BFD98 002BCCD8 28 18 00 2C */ cmplwi r24, 0x2c
/* 802BFD9C 002BCCDC 41 82 00 14 */ beq lbl_802BFDB0
@@ -402,12 +402,12 @@ lbl_802BFEA8:
/* 802BFEBC 002BCDFC 41 82 00 14 */ beq lbl_802BFED0
/* 802BFEC0 002BCE00 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFEC4 002BCE04 38 80 00 01 */ li r4, 1
/* 802BFEC8 002BCE08 4B FF 1F 2D */ bl Z2SeqMgr_NS_changeSubBgmStatus
/* 802BFEC8 002BCE08 4B FF 1F 2D */ bl changeSubBgmStatus__8Z2SeqMgrFl
/* 802BFECC 002BCE0C 48 00 00 F0 */ b lbl_802BFFBC
lbl_802BFED0:
/* 802BFED0 002BCE10 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFED4 002BCE14 38 80 00 00 */ li r4, 0
/* 802BFED8 002BCE18 4B FF 1F 1D */ bl Z2SeqMgr_NS_changeSubBgmStatus
/* 802BFED8 002BCE18 4B FF 1F 1D */ bl changeSubBgmStatus__8Z2SeqMgrFl
/* 802BFEDC 002BCE1C 48 00 00 E0 */ b lbl_802BFFBC
lbl_802BFEE0:
/* 802BFEE0 002BCE20 28 00 00 02 */ cmplwi r0, 2
@@ -417,12 +417,12 @@ lbl_802BFEE0:
/* 802BFEF0 002BCE30 41 82 00 14 */ beq lbl_802BFF04
/* 802BFEF4 002BCE34 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFEF8 002BCE38 38 80 00 01 */ li r4, 1
/* 802BFEFC 002BCE3C 4B FF 1E F9 */ bl Z2SeqMgr_NS_changeSubBgmStatus
/* 802BFEFC 002BCE3C 4B FF 1E F9 */ bl changeSubBgmStatus__8Z2SeqMgrFl
/* 802BFF00 002BCE40 48 00 00 BC */ b lbl_802BFFBC
lbl_802BFF04:
/* 802BFF04 002BCE44 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFF08 002BCE48 38 80 00 00 */ li r4, 0
/* 802BFF0C 002BCE4C 4B FF 1E E9 */ bl Z2SeqMgr_NS_changeSubBgmStatus
/* 802BFF0C 002BCE4C 4B FF 1E E9 */ bl changeSubBgmStatus__8Z2SeqMgrFl
/* 802BFF10 002BCE50 48 00 00 AC */ b lbl_802BFFBC
lbl_802BFF14:
/* 802BFF14 002BCE54 57 80 06 3F */ clrlwi. r0, r28, 0x18
@@ -432,12 +432,12 @@ lbl_802BFF14:
/* 802BFF24 002BCE64 41 82 00 14 */ beq lbl_802BFF38
/* 802BFF28 002BCE68 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFF2C 002BCE6C 38 80 00 01 */ li r4, 1
/* 802BFF30 002BCE70 4B FF 00 5D */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BFF30 002BCE70 4B FF 00 5D */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BFF34 002BCE74 48 00 00 88 */ b lbl_802BFFBC
lbl_802BFF38:
/* 802BFF38 002BCE78 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802BFF3C 002BCE7C 38 80 00 00 */ li r4, 0
/* 802BFF40 002BCE80 4B FF 00 4D */ bl Z2SeqMgr_NS_changeBgmStatus
/* 802BFF40 002BCE80 4B FF 00 4D */ bl changeBgmStatus__8Z2SeqMgrFl
/* 802BFF44 002BCE84 48 00 00 78 */ b lbl_802BFFBC
lbl_802BFF48:
/* 802BFF48 002BCE88 57 C0 06 3F */ clrlwi. r0, r30, 0x18
asm/Z2AudioLib/Z2SoundObject.s
+3 -3
View File
@@ -196,7 +196,7 @@ lbl_802BE184:
/* 802BE188 002BB0C8 90 01 00 18 */ stw r0, 0x18(r1)
/* 802BE18C 002BB0CC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802BE190 002BB0D0 38 81 00 18 */ addi r4, r1, 0x18
/* 802BE194 002BB0D4 4B FF 04 1D */ bl Z2SeMgr_NS_isSoundCulling
/* 802BE194 002BB0D4 4B FF 04 1D */ bl isSoundCulling__7Z2SeMgrF10JAISoundID
/* 802BE198 002BB0D8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802BE19C 002BB0DC 41 82 00 0C */ beq lbl_802BE1A8
/* 802BE1A0 002BB0E0 38 60 00 00 */ li r3, 0
@@ -353,7 +353,7 @@ lbl_802BE3B4:
/* 802BE3B8 002BB2F8 90 01 00 10 */ stw r0, 0x10(r1)
/* 802BE3BC 002BB2FC 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802BE3C0 002BB300 38 81 00 10 */ addi r4, r1, 0x10
/* 802BE3C4 002BB304 4B FF 01 ED */ bl Z2SeMgr_NS_isSoundCulling
/* 802BE3C4 002BB304 4B FF 01 ED */ bl isSoundCulling__7Z2SeMgrF10JAISoundID
/* 802BE3C8 002BB308 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802BE3CC 002BB30C 41 82 00 0C */ beq lbl_802BE3D8
/* 802BE3D0 002BB310 38 60 00 00 */ li r3, 0
@@ -1743,7 +1743,7 @@ lbl_802BF708:
/* 802BF73C 002BC67C 92 E1 00 0C */ stw r23, 0xc(r1)
/* 802BF740 002BC680 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13)
/* 802BF744 002BC684 38 81 00 0C */ addi r4, r1, 0xc
/* 802BF748 002BC688 4B FE EE 69 */ bl Z2SeMgr_NS_isSoundCulling
/* 802BF748 002BC688 4B FE EE 69 */ bl isSoundCulling__7Z2SeMgrF10JAISoundID
/* 802BF74C 002BC68C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802BF750 002BC690 40 82 01 20 */ bne lbl_802BF870
/* 802BF754 002BC694 7F 03 C3 78 */ mr r3, r24
asm/Z2AudioLib/Z2SpeechMgr2.s
+1 -1
View File
@@ -1183,7 +1183,7 @@ lbl_802CCCC8:
/* 802CCCD4 002C9C14 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802CCCD8 002C9C18 3C 80 01 00 */ lis r4, 0x0100000B@ha
/* 802CCCDC 002C9C1C 38 84 00 0B */ addi r4, r4, 0x0100000B@l
/* 802CCCE0 002C9C20 4B FE 27 BD */ bl Z2SeqMgr_NS_subBgmStart
/* 802CCCE0 002C9C20 4B FE 27 BD */ bl subBgmStart__8Z2SeqMgrFUl
/* 802CCCE4 002C9C24 48 00 02 84 */ b lbl_802CCF68
lbl_802CCCE8:
/* 802CCCE8 002C9C28 57 C0 04 3E */ clrlwi r0, r30, 0x10
asm/Z2AudioLib/Z2WolfHowlMgr.s
+3 -3
View File
@@ -738,7 +738,7 @@ lbl_802CB490:
/* 802CB4B4 002C83F4 C0 62 C4 7C */ lfs f3, lbl_80455E7C-_SDA2_BASE_(r2)
/* 802CB4B8 002C83F8 FC 80 18 90 */ fmr f4, f3
/* 802CB4BC 002C83FC 39 00 00 00 */ li r8, 0
/* 802CB4C0 002C8400 4B FE 04 C5 */ bl Z2SeMgr_NS_seStart
/* 802CB4C0 002C8400 4B FE 04 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 802CB4C4 002C8404 88 1F 00 8E */ lbz r0, 0x8e(r31)
/* 802CB4C8 002C8408 7C 00 07 74 */ extsb r0, r0
/* 802CB4CC 002C840C 2C 00 00 02 */ cmpwi r0, 2
@@ -752,7 +752,7 @@ lbl_802CB490:
/* 802CB4EC 002C842C 38 63 42 40 */ addi r3, r3, lbl_80434240@l
/* 802CB4F0 002C8430 7C 83 00 2E */ lwzx r4, r3, r0
/* 802CB4F4 002C8434 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802CB4F8 002C8438 4B FE 3F A5 */ bl Z2SeqMgr_NS_subBgmStart
/* 802CB4F8 002C8438 4B FE 3F A5 */ bl subBgmStart__8Z2SeqMgrFUl
/* 802CB4FC 002C843C 48 00 00 1C */ b lbl_802CB518
lbl_802CB500:
/* 802CB500 002C8440 54 00 10 3A */ slwi r0, r0, 2
@@ -760,7 +760,7 @@ lbl_802CB500:
/* 802CB508 002C8448 38 63 41 F8 */ addi r3, r3, lbl_804341F8@l
/* 802CB50C 002C844C 7C 83 00 2E */ lwzx r4, r3, r0
/* 802CB510 002C8450 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13)
/* 802CB514 002C8454 4B FE 3F 89 */ bl Z2SeqMgr_NS_subBgmStart
/* 802CB514 002C8454 4B FE 3F 89 */ bl subBgmStart__8Z2SeqMgrFUl
lbl_802CB518:
/* 802CB518 002C8458 38 00 FF FF */ li r0, -1
/* 802CB51C 002C845C B0 1F 00 90 */ sth r0, 0x90(r31)
asm/d/a/d_a_alink.s
+147 -4374
View File
File diff suppressed because it is too large Load Diff
asm/d/a/d_a_obj.s
+1 -1
View File
@@ -674,7 +674,7 @@ lbl_800379F8:
/* 80037A24 00034964 C0 62 83 A4 */ lfs f3, lbl_80451DA4-_SDA2_BASE_(r2)
/* 80037A28 00034968 FC 80 18 90 */ fmr f4, f3
/* 80037A2C 0003496C 39 00 00 00 */ li r8, 0
/* 80037A30 00034970 48 27 3F 55 */ bl Z2SeMgr_NS_seStart
/* 80037A30 00034970 48 27 3F 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_80037A34:
/* 80037A34 00034974 39 61 00 30 */ addi r11, r1, 0x30
/* 80037A38 00034978 48 32 A7 E1 */ bl func_80362218
asm/d/a/d_a_player.s
+1 -1
View File
@@ -1238,7 +1238,7 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F500 0015C440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F504 0015C444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F508 0015C448 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F50C 0015C44C 4B F4 12 39 */ bl daAlink_c_NS_setLookPosFromOut
/* 8015F50C 0015C44C 4B F4 12 39 */ bl setLookPosFromOut__9daAlink_cFP4cXyz
/* 8015F510 0015C450 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F514 0015C454 7C 08 03 A6 */ mtlr r0
/* 8015F518 0015C458 38 21 00 10 */ addi r1, r1, 0x10
asm/d/a/obj/d_a_obj_item.s
+11 -11
View File
@@ -2507,7 +2507,7 @@ lbl_8015D120:
/* 8015D144 0015A084 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D148 0015A088 FC 80 18 90 */ fmr f4, f3
/* 8015D14C 0015A08C 39 00 00 00 */ li r8, 0
/* 8015D150 0015A090 48 14 E8 35 */ bl Z2SeMgr_NS_seStart
/* 8015D150 0015A090 48 14 E8 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D154 0015A094 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D158 0015A098 4B F3 AD 35 */ bl execItemGet__FUc
/* 8015D15C 0015A09C 48 00 02 00 */ b lbl_8015D35C
@@ -2524,7 +2524,7 @@ lbl_8015D160:
/* 8015D184 0015A0C4 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D188 0015A0C8 FC 80 18 90 */ fmr f4, f3
/* 8015D18C 0015A0CC 39 00 00 00 */ li r8, 0
/* 8015D190 0015A0D0 48 14 E7 F5 */ bl Z2SeMgr_NS_seStart
/* 8015D190 0015A0D0 48 14 E7 F5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D194 0015A0D4 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D198 0015A0D8 4B F3 AC F5 */ bl execItemGet__FUc
/* 8015D19C 0015A0DC 48 00 01 C0 */ b lbl_8015D35C
@@ -2541,7 +2541,7 @@ lbl_8015D1A0:
/* 8015D1C4 0015A104 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D1C8 0015A108 FC 80 18 90 */ fmr f4, f3
/* 8015D1CC 0015A10C 39 00 00 00 */ li r8, 0
/* 8015D1D0 0015A110 48 14 E7 B5 */ bl Z2SeMgr_NS_seStart
/* 8015D1D0 0015A110 48 14 E7 B5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D1D4 0015A114 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D1D8 0015A118 4B F3 AC B5 */ bl execItemGet__FUc
/* 8015D1DC 0015A11C 48 00 01 80 */ b lbl_8015D35C
@@ -2558,7 +2558,7 @@ lbl_8015D1E0:
/* 8015D204 0015A144 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D208 0015A148 FC 80 18 90 */ fmr f4, f3
/* 8015D20C 0015A14C 39 00 00 00 */ li r8, 0
/* 8015D210 0015A150 48 14 E7 75 */ bl Z2SeMgr_NS_seStart
/* 8015D210 0015A150 48 14 E7 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D214 0015A154 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D218 0015A158 4B F3 AC 75 */ bl execItemGet__FUc
/* 8015D21C 0015A15C 48 00 01 40 */ b lbl_8015D35C
@@ -2575,7 +2575,7 @@ lbl_8015D220:
/* 8015D244 0015A184 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D248 0015A188 FC 80 18 90 */ fmr f4, f3
/* 8015D24C 0015A18C 39 00 00 00 */ li r8, 0
/* 8015D250 0015A190 48 14 E7 35 */ bl Z2SeMgr_NS_seStart
/* 8015D250 0015A190 48 14 E7 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D254 0015A194 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D258 0015A198 4B F3 AC 35 */ bl execItemGet__FUc
/* 8015D25C 0015A19C 48 00 01 00 */ b lbl_8015D35C
@@ -2592,7 +2592,7 @@ lbl_8015D260:
/* 8015D284 0015A1C4 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D288 0015A1C8 FC 80 18 90 */ fmr f4, f3
/* 8015D28C 0015A1CC 39 00 00 00 */ li r8, 0
/* 8015D290 0015A1D0 48 14 E6 F5 */ bl Z2SeMgr_NS_seStart
/* 8015D290 0015A1D0 48 14 E6 F5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D294 0015A1D4 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D298 0015A1D8 4B F3 AB F5 */ bl execItemGet__FUc
/* 8015D29C 0015A1DC 48 00 00 C0 */ b lbl_8015D35C
@@ -2609,7 +2609,7 @@ lbl_8015D2A0:
/* 8015D2C4 0015A204 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D2C8 0015A208 FC 80 18 90 */ fmr f4, f3
/* 8015D2CC 0015A20C 39 00 00 00 */ li r8, 0
/* 8015D2D0 0015A210 48 14 E6 B5 */ bl Z2SeMgr_NS_seStart
/* 8015D2D0 0015A210 48 14 E6 B5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D2D4 0015A214 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D2D8 0015A218 4B F3 AB B5 */ bl execItemGet__FUc
/* 8015D2DC 0015A21C 48 00 00 80 */ b lbl_8015D35C
@@ -2626,7 +2626,7 @@ lbl_8015D2E0:
/* 8015D304 0015A244 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D308 0015A248 FC 80 18 90 */ fmr f4, f3
/* 8015D30C 0015A24C 39 00 00 00 */ li r8, 0
/* 8015D310 0015A250 48 14 E6 75 */ bl Z2SeMgr_NS_seStart
/* 8015D310 0015A250 48 14 E6 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D314 0015A254 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D318 0015A258 4B F3 AB 75 */ bl execItemGet__FUc
/* 8015D31C 0015A25C 48 00 00 40 */ b lbl_8015D35C
@@ -2643,7 +2643,7 @@ lbl_8015D320:
/* 8015D344 0015A284 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D348 0015A288 FC 80 18 90 */ fmr f4, f3
/* 8015D34C 0015A28C 39 00 00 00 */ li r8, 0
/* 8015D350 0015A290 48 14 E6 35 */ bl Z2SeMgr_NS_seStart
/* 8015D350 0015A290 48 14 E6 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D354 0015A294 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D358 0015A298 4B F3 AB 35 */ bl execItemGet__FUc
lbl_8015D35C:
@@ -3061,7 +3061,7 @@ lbl_8015D8B8:
/* 8015D8EC 0015A82C C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D8F0 0015A830 FC 80 18 90 */ fmr f4, f3
/* 8015D8F4 0015A834 39 00 00 00 */ li r8, 0
/* 8015D8F8 0015A838 48 14 E0 8D */ bl Z2SeMgr_NS_seStart
/* 8015D8F8 0015A838 48 14 E0 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 8015D8FC 0015A83C 48 00 00 48 */ b lbl_8015D944
lbl_8015D900:
/* 8015D900 0015A840 88 1E 04 E2 */ lbz r0, 0x4e2(r30)
@@ -3080,7 +3080,7 @@ lbl_8015D900:
/* 8015D934 0015A874 C0 62 9B BC */ lfs f3, lbl_804535BC-_SDA2_BASE_(r2)
/* 8015D938 0015A878 FC 80 18 90 */ fmr f4, f3
/* 8015D93C 0015A87C 39 00 00 00 */ li r8, 0
/* 8015D940 0015A880 48 14 E0 45 */ bl Z2SeMgr_NS_seStart
/* 8015D940 0015A880 48 14 E0 45 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_8015D944:
/* 8015D944 0015A884 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8015D948 0015A888 83 C1 00 18 */ lwz r30, 0x18(r1)
asm/d/bright/d_bright_check.s
+1 -1
View File
@@ -432,7 +432,7 @@ lbl_8019353C:
/* 80193560 001904A0 C0 62 A0 08 */ lfs f3, lbl_80453A08-_SDA2_BASE_(r2)
/* 80193564 001904A4 FC 80 18 90 */ fmr f4, f3
/* 80193568 001904A8 39 00 00 00 */ li r8, 0
/* 8019356C 001904AC 48 11 84 19 */ bl Z2SeMgr_NS_seStart
/* 8019356C 001904AC 48 11 84 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 80193570 001904B0 38 00 00 01 */ li r0, 1
/* 80193574 001904B4 98 1F 00 19 */ stb r0, 0x19(r31)
/* 80193578 001904B8 38 00 00 00 */ li r0, 0
asm/d/com/inf/d_com_inf_game.s
+2 -2
View File
@@ -1911,7 +1911,7 @@ dComIfG_resetToOpening:
/* 8002CD44 00029C84 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8002CD48 00029C88 7C 08 02 A6 */ mflr r0
/* 8002CD4C 00029C8C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8002CD50 00029C90 80 8D 86 F8 */ lwz r4, lbl_80450C78-_SDA_BASE_(r13)
/* 8002CD50 00029C90 80 8D 86 F8 */ lwz r4, m_Do_Reset_NS_mDoRst_NS_mResetData-_SDA_BASE_(r13)
/* 8002CD54 00029C94 88 04 00 11 */ lbz r0, 0x11(r4)
/* 8002CD58 00029C98 2C 00 00 00 */ cmpwi r0, 0
/* 8002CD5C 00029C9C 40 82 00 20 */ bne lbl_8002CD7C
@@ -1932,7 +1932,7 @@ lbl_8002CD84:
/* 8002CD90 00029CD0 38 63 03 D0 */ addi r3, r3, 0x3d0
/* 8002CD94 00029CD4 38 80 00 1E */ li r4, 0x1e
/* 8002CD98 00029CD8 38 A0 00 00 */ li r5, 0
/* 8002CD9C 00029CDC 48 28 26 6D */ bl Z2SeqMgr_NS_bgmStop
/* 8002CD9C 00029CDC 48 28 26 6D */ bl bgmStop__8Z2SeqMgrFUll
/* 8002CDA0 00029CE0 4B FD A4 E5 */ bl mDoAud_resetProcess
/* 8002CDA4 00029CE4 38 60 00 01 */ li r3, 1
lbl_8002CDA8:
asm/d/d_attention.s
+1 -1
View File
@@ -3305,7 +3305,7 @@ dAttention_c_NS_lockSoundStart:
/* 80072DB8 0006FCF8 C0 62 8C 90 */ lfs f3, lbl_80452690-_SDA2_BASE_(r2)
/* 80072DBC 0006FCFC FC 80 18 90 */ fmr f4, f3
/* 80072DC0 0006FD00 39 00 00 00 */ li r8, 0
/* 80072DC4 0006FD04 48 23 8B C1 */ bl Z2SeMgr_NS_seStart
/* 80072DC4 0006FD04 48 23 8B C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_80072DC8:
/* 80072DC8 0006FD08 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80072DCC 0006FD0C 7C 08 03 A6 */ mtlr r0
asm/d/d_bomb.s
-55
View File
@@ -1,55 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 80031f94
/* 80031F94 0002EED4 38 80 00 00 */ li r4, 0
/* 80031F98 0002EED8 80 A3 04 9C */ lwz r5, 0x49c(r3)
/* 80031F9C 0002EEDC 54 A0 04 A5 */ rlwinm. r0, r5, 0, 0x12, 0x12
/* 80031FA0 0002EEE0 40 82 00 20 */ bne lbl_80031FC0
/* 80031FA4 0002EEE4 54 A0 02 D7 */ rlwinm. r0, r5, 0, 0xb, 0xb
/* 80031FA8 0002EEE8 40 82 00 18 */ bne lbl_80031FC0
/* 80031FAC 0002EEEC 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80031FB0 0002EEF0 28 00 00 02 */ cmplwi r0, 2
/* 80031FB4 0002EEF4 41 82 00 0C */ beq lbl_80031FC0
/* 80031FB8 0002EEF8 28 00 00 01 */ cmplwi r0, 1
/* 80031FBC 0002EEFC 40 82 00 08 */ bne lbl_80031FC4
lbl_80031FC0:
/* 80031FC0 0002EF00 38 80 00 01 */ li r4, 1
lbl_80031FC4:
/* 80031FC4 0002EF04 7C 83 23 78 */ mr r3, r4
/* 80031FC8 0002EF08 4E 80 00 20 */ blr
/* 80031FCC 0002EF0C 38 80 00 00 */ li r4, 0
/* 80031FD0 0002EF10 A8 03 00 08 */ lha r0, 8(r3)
/* 80031FD4 0002EF14 2C 00 02 21 */ cmpwi r0, 0x221
/* 80031FD8 0002EF18 40 82 00 14 */ bne lbl_80031FEC
/* 80031FDC 0002EF1C 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80031FE0 0002EF20 28 00 00 04 */ cmplwi r0, 4
/* 80031FE4 0002EF24 40 82 00 08 */ bne lbl_80031FEC
/* 80031FE8 0002EF28 38 80 00 01 */ li r4, 1
lbl_80031FEC:
/* 80031FEC 0002EF2C 7C 83 23 78 */ mr r3, r4
/* 80031FF0 0002EF30 4E 80 00 20 */ blr
/* 80031FF4 0002EF34 38 80 00 00 */ li r4, 0
/* 80031FF8 0002EF38 A8 03 00 08 */ lha r0, 8(r3)
/* 80031FFC 0002EF3C 2C 00 02 21 */ cmpwi r0, 0x221
/* 80032000 0002EF40 40 82 00 14 */ bne lbl_80032014
/* 80032004 0002EF44 80 03 0B 4C */ lwz r0, 0xb4c(r3)
/* 80032008 0002EF48 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 8003200C 0002EF4C 41 82 00 08 */ beq lbl_80032014
/* 80032010 0002EF50 38 80 00 01 */ li r4, 1
lbl_80032014:
/* 80032014 0002EF54 7C 83 23 78 */ mr r3, r4
/* 80032018 0002EF58 4E 80 00 20 */ blr
/* 8003201C 0002EF5C 38 80 00 00 */ li r4, 0
/* 80032020 0002EF60 A8 03 00 08 */ lha r0, 8(r3)
/* 80032024 0002EF64 2C 00 02 21 */ cmpwi r0, 0x221
/* 80032028 0002EF68 40 82 00 14 */ bne lbl_8003203C
/* 8003202C 0002EF6C 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80032030 0002EF70 28 00 00 07 */ cmplwi r0, 7
/* 80032034 0002EF74 40 82 00 08 */ bne lbl_8003203C
/* 80032038 0002EF78 38 80 00 01 */ li r4, 1
lbl_8003203C:
/* 8003203C 0002EF7C 7C 83 23 78 */ mr r3, r4
/* 80032040 0002EF80 4E 80 00 20 */ blr

Some files were not shown because too many files have changed in this diff Show More