mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 14:36:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_item (#18)

Browse Source 
* item_funcs ok

* item_getcheck_func ok

* remove unnecessary asm file

* execItemGet / checkItemGet ok, add enums for readability

* fix return types
This commit is contained in:
TakaRikka
2020-12-05 20:30:55 -08:00
committed by GitHub
parent fb1217e3f9
commit 2fbecbc1da
227 changed files with 11251 additions and 11624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/Z2AudioLib/Z2EnvSeMgr.s
+46 -46
View File
@@ -995,8 +995,8 @@ Z2EnvSeMgr_NS_framework:
/* 802C66EC 002C362C 88 1F 02 14 */ lbz r0, 0x214(r31)
/* 802C66F0 002C3630 28 00 00 12 */ cmplwi r0, 0x12
/* 802C66F4 002C3634 41 82 00 48 */ beq lbl_802C673C
/* 802C66F8 002C3638 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802C66FC 002C363C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802C66F8 002C3638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802C66FC 002C363C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802C6700 002C3640 3B A3 07 F0 */ addi r29, r3, 0x7f0
/* 802C6704 002C3644 7F A3 EB 78 */ mr r3, r29
/* 802C6708 002C3648 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -4998,8 +4998,8 @@ lbl_802CA014:
lbl_802CA04C:
/* 802CA04C 002C6F8C 28 00 00 67 */ cmplwi r0, 0x67
/* 802CA050 002C6F90 40 82 00 30 */ bne lbl_802CA080
/* 802CA054 002C6F94 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA058 002C6F98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA054 002C6F94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA058 002C6F98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA05C 002C6F9C 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA060 002C6FA0 38 80 00 08 */ li r4, 8
/* 802CA064 002C6FA4 4B D6 A7 FD */ bl isSwitch__12dSv_memBit_cCFi
@@ -5013,8 +5013,8 @@ lbl_802CA080:
/* 802CA080 002C6FC0 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA084 002C6FC4 28 00 00 68 */ cmplwi r0, 0x68
/* 802CA088 002C6FC8 40 82 00 30 */ bne lbl_802CA0B8
/* 802CA08C 002C6FCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA090 002C6FD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA08C 002C6FCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA090 002C6FD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA094 002C6FD4 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA098 002C6FD8 38 80 00 09 */ li r4, 9
/* 802CA09C 002C6FDC 4B D6 A7 C5 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5028,8 +5028,8 @@ lbl_802CA0B8:
/* 802CA0B8 002C6FF8 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA0BC 002C6FFC 28 00 00 69 */ cmplwi r0, 0x69
/* 802CA0C0 002C7000 40 82 00 48 */ bne lbl_802CA108
/* 802CA0C4 002C7004 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA0C8 002C7008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA0C4 002C7004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA0C8 002C7008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA0CC 002C700C 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA0D0 002C7010 7F 83 E3 78 */ mr r3, r28
/* 802CA0D4 002C7014 38 80 00 08 */ li r4, 8
@@ -5049,8 +5049,8 @@ lbl_802CA108:
/* 802CA108 002C7048 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA10C 002C704C 28 00 00 6A */ cmplwi r0, 0x6a
/* 802CA110 002C7050 40 82 06 6C */ bne lbl_802CA77C
/* 802CA114 002C7054 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA118 002C7058 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA114 002C7054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA118 002C7058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA11C 002C705C 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA120 002C7060 7F 83 E3 78 */ mr r3, r28
/* 802CA124 002C7064 38 80 00 09 */ li r4, 9
@@ -5069,8 +5069,8 @@ lbl_802CA108:
/* 802CA158 002C7098 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA15C 002C709C 28 00 00 64 */ cmplwi r0, 0x64
/* 802CA160 002C70A0 40 82 00 48 */ bne lbl_802CA1A8
/* 802CA164 002C70A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA168 002C70A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA164 002C70A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA168 002C70A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA16C 002C70AC 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA170 002C70B0 7F 83 E3 78 */ mr r3, r28
/* 802CA174 002C70B4 38 80 00 08 */ li r4, 8
@@ -5090,8 +5090,8 @@ lbl_802CA1A8:
/* 802CA1A8 002C70E8 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA1AC 002C70EC 28 00 00 65 */ cmplwi r0, 0x65
/* 802CA1B0 002C70F0 40 82 00 38 */ bne lbl_802CA1E8
/* 802CA1B4 002C70F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA1B8 002C70F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA1B4 002C70F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA1B8 002C70F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA1BC 002C70FC 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA1C0 002C7100 7F 83 E3 78 */ mr r3, r28
/* 802CA1C4 002C7104 38 80 00 08 */ li r4, 8
@@ -5104,8 +5104,8 @@ lbl_802CA1A8:
/* 802CA1E0 002C7120 2C 03 00 00 */ cmpwi r3, 0
/* 802CA1E4 002C7124 41 82 00 38 */ beq lbl_802CA21C
lbl_802CA1E8:
/* 802CA1E8 002C7128 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA1EC 002C712C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA1E8 002C7128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA1EC 002C712C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA1F0 002C7130 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA1F4 002C7134 7F 83 E3 78 */ mr r3, r28
/* 802CA1F8 002C7138 38 80 00 08 */ li r4, 8
@@ -5143,8 +5143,8 @@ lbl_802CA26C:
/* 802CA26C 002C71AC 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA270 002C71B0 28 00 00 67 */ cmplwi r0, 0x67
/* 802CA274 002C71B4 40 82 00 2C */ bne lbl_802CA2A0
/* 802CA278 002C71B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA27C 002C71BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA278 002C71B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA27C 002C71BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA280 002C71C0 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA284 002C71C4 38 80 00 08 */ li r4, 8
/* 802CA288 002C71C8 4B D6 A5 D9 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5157,8 +5157,8 @@ lbl_802CA2A0:
/* 802CA2A0 002C71E0 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA2A4 002C71E4 28 00 00 68 */ cmplwi r0, 0x68
/* 802CA2A8 002C71E8 40 82 00 2C */ bne lbl_802CA2D4
/* 802CA2AC 002C71EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA2B0 002C71F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA2AC 002C71EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA2B0 002C71F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA2B4 002C71F4 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA2B8 002C71F8 38 80 00 09 */ li r4, 9
/* 802CA2BC 002C71FC 4B D6 A5 A5 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5171,8 +5171,8 @@ lbl_802CA2D4:
/* 802CA2D4 002C7214 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA2D8 002C7218 28 00 00 69 */ cmplwi r0, 0x69
/* 802CA2DC 002C721C 40 82 00 48 */ bne lbl_802CA324
/* 802CA2E0 002C7220 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA2E4 002C7224 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA2E0 002C7220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA2E4 002C7224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA2E8 002C7228 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA2EC 002C722C 7F 83 E3 78 */ mr r3, r28
/* 802CA2F0 002C7230 38 80 00 08 */ li r4, 8
@@ -5192,8 +5192,8 @@ lbl_802CA324:
/* 802CA324 002C7264 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA328 002C7268 28 00 00 6B */ cmplwi r0, 0x6b
/* 802CA32C 002C726C 40 82 00 44 */ bne lbl_802CA370
/* 802CA330 002C7270 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA334 002C7274 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA330 002C7270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA334 002C7274 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA338 002C7278 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA33C 002C727C 7F 83 E3 78 */ mr r3, r28
/* 802CA340 002C7280 38 80 00 08 */ li r4, 8
@@ -5212,8 +5212,8 @@ lbl_802CA370:
/* 802CA370 002C72B0 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA374 002C72B4 28 00 00 6A */ cmplwi r0, 0x6a
/* 802CA378 002C72B8 40 82 00 48 */ bne lbl_802CA3C0
/* 802CA37C 002C72BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA380 002C72C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA37C 002C72BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA380 002C72C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA384 002C72C4 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA388 002C72C8 7F 83 E3 78 */ mr r3, r28
/* 802CA38C 002C72CC 38 80 00 09 */ li r4, 9
@@ -5233,8 +5233,8 @@ lbl_802CA3C0:
/* 802CA3C0 002C7300 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA3C4 002C7304 28 00 00 6C */ cmplwi r0, 0x6c
/* 802CA3C8 002C7308 40 82 03 B4 */ bne lbl_802CA77C
/* 802CA3CC 002C730C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA3D0 002C7310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA3CC 002C730C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA3D0 002C7310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA3D4 002C7314 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA3D8 002C7318 7F 83 E3 78 */ mr r3, r28
/* 802CA3DC 002C731C 38 80 00 09 */ li r4, 9
@@ -5250,8 +5250,8 @@ lbl_802CA3C0:
/* 802CA404 002C7344 7F E4 FB 78 */ mr r4, r31
/* 802CA408 002C7348 4B FE 47 69 */ bl Z2MultiSeMgr_NS_registMultiSePos
/* 802CA40C 002C734C 48 00 03 70 */ b lbl_802CA77C
/* 802CA410 002C7350 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA414 002C7354 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA410 002C7350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA414 002C7354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA418 002C7358 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA41C 002C735C 38 80 00 08 */ li r4, 8
/* 802CA420 002C7360 4B D6 A4 41 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5271,8 +5271,8 @@ lbl_802CA448:
/* 802CA454 002C7394 7F E4 FB 78 */ mr r4, r31
/* 802CA458 002C7398 4B FE 47 19 */ bl Z2MultiSeMgr_NS_registMultiSePos
/* 802CA45C 002C739C 48 00 03 20 */ b lbl_802CA77C
/* 802CA460 002C73A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA464 002C73A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA460 002C73A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA464 002C73A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA468 002C73A8 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA46C 002C73AC 7F 83 E3 78 */ mr r3, r28
/* 802CA470 002C73B0 38 80 00 09 */ li r4, 9
@@ -5316,8 +5316,8 @@ lbl_802CA4E0:
/* 802CA4FC 002C743C 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA500 002C7440 28 00 00 64 */ cmplwi r0, 0x64
/* 802CA504 002C7444 40 82 00 30 */ bne lbl_802CA534
/* 802CA508 002C7448 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA50C 002C744C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA508 002C7448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA50C 002C744C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA510 002C7450 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA514 002C7454 38 80 00 31 */ li r4, 0x31
/* 802CA518 002C7458 4B D6 A3 49 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5331,8 +5331,8 @@ lbl_802CA534:
/* 802CA534 002C7474 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA538 002C7478 28 00 00 67 */ cmplwi r0, 0x67
/* 802CA53C 002C747C 40 82 00 30 */ bne lbl_802CA56C
/* 802CA540 002C7480 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA544 002C7484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA540 002C7480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA544 002C7484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA548 002C7488 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA54C 002C748C 38 80 00 31 */ li r4, 0x31
/* 802CA550 002C7490 4B D6 A3 11 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5346,8 +5346,8 @@ lbl_802CA56C:
/* 802CA56C 002C74AC 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA570 002C74B0 28 00 00 68 */ cmplwi r0, 0x68
/* 802CA574 002C74B4 40 82 00 30 */ bne lbl_802CA5A4
/* 802CA578 002C74B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA57C 002C74BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA578 002C74B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA57C 002C74BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA580 002C74C0 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA584 002C74C4 38 80 00 08 */ li r4, 8
/* 802CA588 002C74C8 4B D6 A2 D9 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5361,8 +5361,8 @@ lbl_802CA5A4:
/* 802CA5A4 002C74E4 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 802CA5A8 002C74E8 28 00 00 6B */ cmplwi r0, 0x6b
/* 802CA5AC 002C74EC 40 82 01 D0 */ bne lbl_802CA77C
/* 802CA5B0 002C74F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA5B4 002C74F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA5B0 002C74F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA5B4 002C74F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA5B8 002C74F8 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA5BC 002C74FC 38 80 00 31 */ li r4, 0x31
/* 802CA5C0 002C7500 4B D6 A2 A1 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5372,8 +5372,8 @@ lbl_802CA5A4:
/* 802CA5D0 002C7510 7F E4 FB 78 */ mr r4, r31
/* 802CA5D4 002C7514 4B FE 45 9D */ bl Z2MultiSeMgr_NS_registMultiSePos
/* 802CA5D8 002C7518 48 00 01 A4 */ b lbl_802CA77C
/* 802CA5DC 002C751C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA5E0 002C7520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA5DC 002C751C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA5E0 002C7520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA5E4 002C7524 38 63 09 58 */ addi r3, r3, 0x958
/* 802CA5E8 002C7528 38 80 00 09 */ li r4, 9
/* 802CA5EC 002C752C 4B D6 A2 75 */ bl isSwitch__12dSv_memBit_cCFi
@@ -5408,8 +5408,8 @@ lbl_802CA644:
/* 802CA654 002C7594 7F E4 FB 78 */ mr r4, r31
/* 802CA658 002C7598 4B FE 45 19 */ bl Z2MultiSeMgr_NS_registMultiSePos
/* 802CA65C 002C759C 48 00 01 20 */ b lbl_802CA77C
/* 802CA660 002C75A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA664 002C75A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA660 002C75A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA664 002C75A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA668 002C75A8 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA66C 002C75AC 7F 83 E3 78 */ mr r3, r28
/* 802CA670 002C75B0 38 80 00 08 */ li r4, 8
@@ -5435,8 +5435,8 @@ lbl_802CA6B0:
/* 802CA6BC 002C75FC 7F E4 FB 78 */ mr r4, r31
/* 802CA6C0 002C7600 4B FE 44 B1 */ bl Z2MultiSeMgr_NS_registMultiSePos
/* 802CA6C4 002C7604 48 00 00 B8 */ b lbl_802CA77C
/* 802CA6C8 002C7608 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802CA6CC 002C760C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802CA6C8 002C7608 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802CA6CC 002C760C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802CA6D0 002C7610 3B 83 09 58 */ addi r28, r3, 0x958
/* 802CA6D4 002C7614 7F 83 E3 78 */ mr r3, r28
/* 802CA6D8 002C7618 38 80 00 30 */ li r4, 0x30
asm/Z2AudioLib/Z2SceneMgr.s
+6 -6
View File
@@ -22,8 +22,8 @@ JSUList_X1_:
.global dComIfGs_getStartPoint
dComIfGs_getStartPoint:
/* 802B999C 002B68DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802B99A0 002B68E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802B999C 002B68DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802B99A0 002B68E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802B99A4 002B68E4 A8 63 0D B8 */ lha r3, 0xdb8(r3)
/* 802B99A8 002B68E8 4E 80 00 20 */ blr
@@ -104,8 +104,8 @@ dComIfGs_isSaveSwitch:
/* 802B9A98 002B69D8 7C 08 02 A6 */ mflr r0
/* 802B9A9C 002B69DC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802B9AA0 002B69E0 7C 64 1B 78 */ mr r4, r3
/* 802B9AA4 002B69E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802B9AA8 002B69E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802B9AA4 002B69E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802B9AA8 002B69E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802B9AAC 002B69EC 38 63 09 58 */ addi r3, r3, 0x958
/* 802B9AB0 002B69F0 4B D7 AD B1 */ bl isSwitch__12dSv_memBit_cCFi
/* 802B9AB4 002B69F4 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -347,8 +347,8 @@ Z2SceneMgr_NS__load1stWaveInner_1:
/* 802B9DB4 002B6CF4 4B FF 3B 99 */ bl Z2SeMgr_NS_seStopAll
/* 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, lbl_804061C0@ha
/* 802B9DC4 002B6D04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802B9DC0 002B6D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802B9DC4 002B6D04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802B9DC8 002B6D08 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 802B9DCC 002B6D0C 3C 80 80 3A */ lis r4, lbl_803A7288@ha
/* 802B9DD0 002B6D10 38 84 72 88 */ addi r4, r4, lbl_803A7288@l
asm/Z2AudioLib/Z2StatusMgr.s
+2 -2
View File
@@ -38,8 +38,8 @@ Z2StatusMgr_NS_processHeartGaugeSound:
/* 802B5F7C 002B2EBC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802B5F80 002B2EC0 7C 08 02 A6 */ mflr r0
/* 802B5F84 002B2EC4 90 01 00 24 */ stw r0, 0x24(r1)
/* 802B5F88 002B2EC8 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 802B5F8C 002B2ECC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 802B5F88 002B2EC8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 802B5F8C 002B2ECC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 802B5F90 002B2ED0 88 04 4F AD */ lbz r0, 0x4fad(r4)
/* 802B5F94 002B2ED4 28 00 00 00 */ cmplwi r0, 0
/* 802B5F98 002B2ED8 40 82 01 24 */ bne lbl_802B60BC