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

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 23:30:55 -05: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
asm/bss.s
+2 -2
View File
@@ -146,8 +146,8 @@ lbl_804061A0:
.global lbl_804061B4
lbl_804061B4:
.skip 0xC
.global lbl_804061C0
lbl_804061C0:
.global g_dComIfG_gameInfo
g_dComIfG_gameInfo:
.skip 0x1DE10
.global lbl_80423FD0
lbl_80423FD0:
asm/c/c_damagereaction.s
+2 -2
View File
@@ -83,8 +83,8 @@ lbl_8001829C:
/* 800182A8 000151E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800182AC 000151EC 7C 08 02 A6 */ mflr r0
/* 800182B0 000151F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 800182B4 000151F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800182B8 000151F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800182B4 000151F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800182B8 000151F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800182BC 000151FC 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 800182C0 00015200 28 00 00 00 */ cmplwi r0, 0
/* 800182C4 00015204 41 82 00 50 */ beq lbl_80018314
asm/d/a/d_a_alink.s
+2086 -2086
View File
File diff suppressed because it is too large Load Diff
asm/d/a/d_a_itembase.s
+6 -6
View File
@@ -36,8 +36,8 @@ daItemBase_c_NS_CreateItemHeap:
/* 80144788 001416C8 AB 61 00 4A */ lha r27, 0x4a(r1)
/* 8014478C 001416CC 7F C3 F3 78 */ mr r3, r30
/* 80144790 001416D0 7C A4 07 34 */ extsh r4, r5
/* 80144794 001416D4 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80144798 001416D8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80144794 001416D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80144798 001416D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8014479C 001416DC 3F 85 00 02 */ addis r28, r5, 2
/* 801447A0 001416E0 3B 9C C2 F8 */ addi r28, r28, -15624
/* 801447A4 001416E4 7F 85 E3 78 */ mr r5, r28
@@ -373,8 +373,8 @@ lbl_80144B7C:
/* 80144C70 00141BB0 7C 08 03 A6 */ mtlr r0
/* 80144C74 00141BB4 38 21 00 10 */ addi r1, r1, 0x10
/* 80144C78 00141BB8 4E 80 00 20 */ blr
/* 80144C7C 00141BBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80144C80 00141BC0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80144C7C 00141BBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80144C80 00141BC0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80144C84 00141BC4 80 04 5F 88 */ lwz r0, 0x5f88(r4)
/* 80144C88 00141BC8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80144C8C 00141BCC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -385,8 +385,8 @@ lbl_80144B7C:
.global daItemBase_c_NS_setListEnd
daItemBase_c_NS_setListEnd:
/* 80144CA0 00141BE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80144CA4 00141BE4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80144CA0 00141BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80144CA4 00141BE4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80144CA8 00141BE8 80 04 5F 80 */ lwz r0, 0x5f80(r4)
/* 80144CAC 00141BEC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80144CB0 00141BF0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
asm/d/a/d_a_npc.s
+166 -166
View File
File diff suppressed because it is too large Load Diff
asm/d/a/d_a_obj.s
+4 -4
View File
@@ -16,8 +16,8 @@ daObj_NS_eff_break_tsubo:
/* 80037058 00033F98 3C 60 80 38 */ lis r3, lbl_803792A8@ha
/* 8003705C 00033F9C 38 63 92 A8 */ addi r3, r3, lbl_803792A8@l
/* 80037060 00033FA0 38 80 00 20 */ li r4, 0x20
/* 80037064 00033FA4 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80037068 00033FA8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80037064 00033FA4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80037068 00033FA8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8003706C 00033FAC 3F 45 00 02 */ addis r26, r5, 2
/* 80037070 00033FB0 3B 5A C2 F8 */ addi r26, r26, -15624
/* 80037074 00033FB4 7F 45 D3 78 */ mr r5, r26
@@ -33,8 +33,8 @@ daObj_NS_eff_break_tsubo:
/* 8003709C 00033FDC 7C 7A 1B 78 */ mr r26, r3
/* 800370A0 00033FE0 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
/* 800370A4 00033FE4 7C 04 07 74 */ extsb r4, r0
/* 800370A8 00033FE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800370AC 00033FEC 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 800370A8 00033FE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800370AC 00033FEC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 800370B0 00033FF0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28)
/* 800370B4 00033FF4 38 0D 89 10 */ addi r0, r13, lbl_80450E90-_SDA_BASE_
/* 800370B8 00033FF8 90 01 00 08 */ stw r0, 8(r1)
asm/d/a/d_a_player.s
+54 -54
View File
@@ -164,8 +164,8 @@ lbl_8015E6D4:
/* 8015E6E8 0015B628 38 60 00 00 */ li r3, 0
/* 8015E6EC 0015B62C 48 00 01 78 */ b lbl_8015E864
lbl_8015E6F0:
/* 8015E6F0 0015B630 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015E6F4 0015B634 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015E6F0 0015B630 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015E6F4 0015B634 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015E6F8 0015B638 88 04 4F AD */ lbz r0, 0x4fad(r4)
/* 8015E6FC 0015B63C 28 00 00 00 */ cmplwi r0, 0
/* 8015E700 0015B640 41 82 00 10 */ beq lbl_8015E710
@@ -208,8 +208,8 @@ lbl_8015E730:
/* 8015E78C 0015B6CC 38 60 00 01 */ li r3, 1
/* 8015E790 0015B6D0 48 00 00 D4 */ b lbl_8015E864
lbl_8015E794:
/* 8015E794 0015B6D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015E798 0015B6D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015E794 0015B6D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015E798 0015B6D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015E79C 0015B6DC 83 A3 5D B4 */ lwz r29, 0x5db4(r3)
/* 8015E7A0 0015B6E0 28 1C 00 00 */ cmplwi r28, 0
/* 8015E7A4 0015B6E4 41 82 00 18 */ beq lbl_8015E7BC
@@ -846,8 +846,8 @@ daPy_anmHeap_c_NS_loadData:
/* 8015EFA0 0015BEE0 A0 03 00 04 */ lhz r0, 4(r3)
/* 8015EFA4 0015BEE4 28 00 FF FF */ cmplwi r0, 0xffff
/* 8015EFA8 0015BEE8 40 82 00 4C */ bne lbl_8015EFF4
/* 8015EFAC 0015BEEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015EFB0 0015BEF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015EFAC 0015BEEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015EFB0 0015BEF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015EFB4 0015BEF4 80 63 5C AC */ lwz r3, 0x5cac(r3)
/* 8015EFB8 0015BEF8 80 9E 00 0C */ lwz r4, 0xc(r30)
/* 8015EFBC 0015BEFC 80 BE 00 08 */ lwz r5, 8(r30)
@@ -869,8 +869,8 @@ lbl_8015EFF4:
/* 8015EFF8 0015BF38 40 82 00 28 */ bne lbl_8015F020
/* 8015EFFC 0015BF3C 3C 60 80 40 */ lis r3, lbl_80406194@ha
/* 8015F000 0015BF40 38 63 61 94 */ addi r3, r3, lbl_80406194@l
/* 8015F004 0015BF44 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 8015F008 0015BF48 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 8015F004 0015BF44 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 8015F008 0015BF48 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015F00C 0015BF4C 3C A5 00 02 */ addis r5, r5, 2
/* 8015F010 0015BF50 38 C0 00 80 */ li r6, 0x80
/* 8015F014 0015BF54 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -883,8 +883,8 @@ lbl_8015F020:
/* 8015F02C 0015BF6C 7C 63 02 14 */ add r3, r3, r0
/* 8015F030 0015BF70 80 63 FF FC */ lwz r3, -4(r3)
/* 8015F034 0015BF74 54 C4 04 3E */ clrlwi r4, r6, 0x10
/* 8015F038 0015BF78 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 8015F03C 0015BF7C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 8015F038 0015BF78 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 8015F03C 0015BF7C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015F040 0015BF80 3C A5 00 02 */ addis r5, r5, 2
/* 8015F044 0015BF84 38 C0 00 80 */ li r6, 0x80
/* 8015F048 0015BF88 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1109,8 +1109,8 @@ daPy_sightPacket_c_NS_setSight:
/* 8015F348 0015C288 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l
/* 8015F34C 0015C28C 38 9F 00 14 */ addi r4, r31, 0x14
/* 8015F350 0015C290 48 1E 71 61 */ bl PSMTXCopy
/* 8015F354 0015C294 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F358 0015C298 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F354 0015C294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F358 0015C298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F35C 0015C29C 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 8015F360 0015C2A0 38 83 02 3C */ addi r4, r3, 0x23c
/* 8015F364 0015C2A4 38 A3 02 40 */ addi r5, r3, 0x240
@@ -1132,8 +1132,8 @@ daPy_sightPacket_c_NS_setSightImage:
.global daPy_py_c_NS_checkMasterSwordEquip
daPy_py_c_NS_checkMasterSwordEquip:
/* 8015F398 0015C2D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F39C 0015C2DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F398 0015C2D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F39C 0015C2DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F3A0 0015C2E0 88 03 00 14 */ lbz r0, 0x14(r3)
/* 8015F3A4 0015C2E4 38 60 00 00 */ li r3, 0
/* 8015F3A8 0015C2E8 28 00 00 29 */ cmplwi r0, 0x29
@@ -1148,8 +1148,8 @@ lbl_8015F3BC:
.global daPy_py_c_NS_checkWoodShieldEquip
daPy_py_c_NS_checkWoodShieldEquip:
/* 8015F3C4 0015C304 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F3C8 0015C308 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F3C4 0015C304 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F3C8 0015C308 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F3CC 0015C30C 88 63 00 15 */ lbz r3, 0x15(r3)
/* 8015F3D0 0015C310 38 80 00 01 */ li r4, 1
/* 8015F3D4 0015C314 38 03 FF D6 */ addi r0, r3, -42
@@ -1166,8 +1166,8 @@ lbl_8015F3F4:
.global daPy_py_c_NS_getAttentionOffsetY
daPy_py_c_NS_getAttentionOffsetY:
/* 8015F3FC 0015C33C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F400 0015C340 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F3FC 0015C33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F400 0015C340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F404 0015C344 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F408 0015C348 80 03 05 74 */ lwz r0, 0x574(r3)
/* 8015F40C 0015C34C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
@@ -1180,8 +1180,8 @@ lbl_8015F41C:
.global daPy_py_c_NS_checkNowWolfEyeUp
daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F424 0015C364 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F428 0015C368 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F424 0015C364 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F428 0015C368 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F42C 0015C36C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F430 0015C370 A8 63 30 AC */ lha r3, 0x30ac(r3)
/* 8015F434 0015C374 4E 80 00 20 */ blr
@@ -1189,8 +1189,8 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F43C 0015C37C 7C 08 02 A6 */ mflr r0
/* 8015F440 0015C380 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F444 0015C384 7C 66 1B 78 */ mr r6, r3
/* 8015F448 0015C388 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F44C 0015C38C 38 E3 61 C0 */ addi r7, r3, lbl_804061C0@l
/* 8015F448 0015C388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F44C 0015C38C 38 E3 61 C0 */ addi r7, r3, g_dComIfG_gameInfo@l
/* 8015F450 0015C390 80 67 5D B4 */ lwz r3, 0x5db4(r7)
/* 8015F454 0015C394 88 E7 4F AD */ lbz r7, 0x4fad(r7)
/* 8015F458 0015C398 30 07 FF FF */ addic r0, r7, -1
@@ -1207,8 +1207,8 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F484 0015C3C4 7C 67 1B 78 */ mr r7, r3
/* 8015F488 0015C3C8 7C 80 23 78 */ mr r0, r4
/* 8015F48C 0015C3CC 7C A6 2B 78 */ mr r6, r5
/* 8015F490 0015C3D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F494 0015C3D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F490 0015C3D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F494 0015C3D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F498 0015C3D8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F49C 0015C3DC 7C E4 3B 78 */ mr r4, r7
/* 8015F4A0 0015C3E0 7C 05 03 78 */ mr r5, r0
@@ -1220,8 +1220,8 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F4B8 0015C3F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F4BC 0015C3FC 7C 08 02 A6 */ mflr r0
/* 8015F4C0 0015C400 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F4C4 0015C404 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F4C8 0015C408 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F4C4 0015C404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F4C8 0015C408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F4CC 0015C40C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F4D0 0015C410 38 00 00 00 */ li r0, 0
/* 8015F4D4 0015C414 98 03 2F A3 */ stb r0, 0x2fa3(r3)
@@ -1235,8 +1235,8 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F4F4 0015C434 7C 08 02 A6 */ mflr r0
/* 8015F4F8 0015C438 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F4FC 0015C43C 7C 64 1B 78 */ mr r4, r3
/* 8015F500 0015C440 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F504 0015C444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 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
/* 8015F510 0015C450 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1247,8 +1247,8 @@ daPy_py_c_NS_checkNowWolfEyeUp:
/* 8015F524 0015C464 7C 08 02 A6 */ mflr r0
/* 8015F528 0015C468 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F52C 0015C46C 7C 64 1B 78 */ mr r4, r3
/* 8015F530 0015C470 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F534 0015C474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F530 0015C470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F534 0015C474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F538 0015C478 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F53C 0015C47C 81 83 06 28 */ lwz r12, 0x628(r3)
/* 8015F540 0015C480 81 8C 01 18 */ lwz r12, 0x118(r12)
@@ -1278,8 +1278,8 @@ daPy_py_c_NS_linkGrabSubjectNoDraw:
lbl_8015F594:
/* 8015F594 0015C4D4 3B A0 FF FF */ li r29, -1
lbl_8015F598:
/* 8015F598 0015C4D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F59C 0015C4DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F598 0015C4D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F59C 0015C4DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F5A0 0015C4E0 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 8015F5A4 0015C4E4 81 83 06 28 */ lwz r12, 0x628(r3)
/* 8015F5A8 0015C4E8 81 8C 00 FC */ lwz r12, 0xfc(r12)
@@ -1291,8 +1291,8 @@ lbl_8015F598:
lbl_8015F5C0:
/* 8015F5C0 0015C500 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8015F5C4 0015C504 41 82 00 2C */ beq lbl_8015F5F0
/* 8015F5C8 0015C508 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F5CC 0015C50C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F5C8 0015C508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F5CC 0015C50C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F5D0 0015C510 88 03 5D B0 */ lbz r0, 0x5db0(r3)
/* 8015F5D4 0015C514 7C 00 07 74 */ extsb r0, r0
/* 8015F5D8 0015C518 1C 00 00 38 */ mulli r0, r0, 0x38
@@ -1314,8 +1314,8 @@ lbl_8015F5F0:
/* 8015F614 0015C554 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F618 0015C558 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015F61C 0015C55C 3B E0 00 00 */ li r31, 0
/* 8015F620 0015C560 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015F624 0015C564 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015F620 0015C560 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015F624 0015C564 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015F628 0015C568 80 84 5D B4 */ lwz r4, 0x5db4(r4)
/* 8015F62C 0015C56C 80 04 05 74 */ lwz r0, 0x574(r4)
/* 8015F630 0015C570 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
@@ -1334,8 +1334,8 @@ lbl_8015F648:
.global daPy_py_c_NS_checkRoomRestartStart
daPy_py_c_NS_checkRoomRestartStart:
/* 8015F660 0015C5A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F664 0015C5A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F660 0015C5A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F664 0015C5A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F668 0015C5A8 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F66C 0015C5AC 54 00 07 3E */ clrlwi r0, r0, 0x1c
/* 8015F670 0015C5B0 28 00 00 04 */ cmplwi r0, 4
@@ -1360,8 +1360,8 @@ daPy_py_c_NS_checkCarryStartLightBallA:
/* 8015F6A8 0015C5E8 4B FF FF B9 */ bl daPy_py_c_NS_checkRoomRestartStart
/* 8015F6AC 0015C5EC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015F6B0 0015C5F0 40 82 00 54 */ bne lbl_8015F704
/* 8015F6B4 0015C5F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F6B8 0015C5F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F6B4 0015C5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F6B8 0015C5F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F6BC 0015C5FC 37 E3 4E 20 */ addic. r31, r3, 0x4e20
/* 8015F6C0 0015C600 41 82 00 44 */ beq lbl_8015F704
/* 8015F6C4 0015C604 7F E3 FB 78 */ mr r3, r31
@@ -1384,8 +1384,8 @@ lbl_8015F704:
/* 8015F704 0015C644 38 60 00 00 */ li r3, 0
/* 8015F708 0015C648 48 00 00 14 */ b lbl_8015F71C
lbl_8015F70C:
/* 8015F70C 0015C64C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F710 0015C650 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F70C 0015C64C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F710 0015C650 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F714 0015C654 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F718 0015C658 54 03 02 D6 */ rlwinm r3, r0, 0, 0xb, 0xb
lbl_8015F71C:
@@ -1404,8 +1404,8 @@ daPy_py_c_NS_checkCarryStartLightBallB:
/* 8015F740 0015C680 4B FF FF 21 */ bl daPy_py_c_NS_checkRoomRestartStart
/* 8015F744 0015C684 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015F748 0015C688 40 82 00 54 */ bne lbl_8015F79C
/* 8015F74C 0015C68C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F750 0015C690 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F74C 0015C68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F750 0015C690 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F754 0015C694 37 E3 4E 20 */ addic. r31, r3, 0x4e20
/* 8015F758 0015C698 41 82 00 44 */ beq lbl_8015F79C
/* 8015F75C 0015C69C 7F E3 FB 78 */ mr r3, r31
@@ -1428,8 +1428,8 @@ lbl_8015F79C:
/* 8015F79C 0015C6DC 38 60 00 00 */ li r3, 0
/* 8015F7A0 0015C6E0 48 00 00 14 */ b lbl_8015F7B4
lbl_8015F7A4:
/* 8015F7A4 0015C6E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F7A8 0015C6E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F7A4 0015C6E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F7A8 0015C6E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F7AC 0015C6EC 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F7B0 0015C6F0 54 03 03 18 */ rlwinm r3, r0, 0, 0xc, 0xc
lbl_8015F7B4:
@@ -1500,8 +1500,8 @@ lbl_8015F88C:
/* 8015F89C 0015C7DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F8A0 0015C7E0 7C 08 02 A6 */ mflr r0
/* 8015F8A4 0015C7E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F8A8 0015C7E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F8AC 0015C7EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F8A8 0015C7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F8AC 0015C7EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F8B0 0015C7F0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F8B4 0015C7F4 4B F8 09 91 */ bl daAlink_c_NS_checkBoomerangChargeEnd
/* 8015F8B8 0015C7F8 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1513,8 +1513,8 @@ lbl_8015F88C:
.global daPy_py_c_NS_getThrowBoomerangActor
daPy_py_c_NS_getThrowBoomerangActor:
/* 8015F8D0 0015C810 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F8D4 0015C814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F8D0 0015C810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F8D4 0015C814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F8D8 0015C818 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F8DC 0015C81C 80 63 28 38 */ lwz r3, 0x2838(r3)
/* 8015F8E0 0015C820 4E 80 00 20 */ blr
@@ -1522,8 +1522,8 @@ daPy_py_c_NS_getThrowBoomerangActor:
/* 8015F8E8 0015C828 7C 08 02 A6 */ mflr r0
/* 8015F8EC 0015C82C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F8F0 0015C830 7C 64 1B 78 */ mr r4, r3
/* 8015F8F4 0015C834 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F8F8 0015C838 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F8F4 0015C834 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F8F8 0015C838 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F8FC 0015C83C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F900 0015C840 4B F8 08 CD */ bl daAlink_c_NS_cancelBoomerangLock
/* 8015F904 0015C844 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1535,8 +1535,8 @@ daPy_py_c_NS_getThrowBoomerangActor:
/* 8015F91C 0015C85C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F920 0015C860 7C 60 1B 78 */ mr r0, r3
/* 8015F924 0015C864 7C 86 23 78 */ mr r6, r4
/* 8015F928 0015C868 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015F92C 0015C86C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015F928 0015C868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015F92C 0015C86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015F930 0015C870 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F934 0015C874 7C 04 03 78 */ mr r4, r0
/* 8015F938 0015C878 38 A0 00 00 */ li r5, 0
asm/d/a/no/chg/d_a_no_chg_room.s
+12 -12
View File
@@ -11,8 +11,8 @@ isLoadRoom:
/* 801451F8 00142138 39 61 00 20 */ addi r11, r1, 0x20
/* 801451FC 0014213C 48 21 CF DD */ bl _savegpr_28
/* 80145200 00142140 7C 7C 1B 78 */ mr r28, r3
/* 80145204 00142144 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80145208 00142148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80145204 00142144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80145208 00142148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8014520C 0014214C 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 80145210 00142150 81 8C 00 30 */ lwz r12, 0x30(r12)
/* 80145214 00142154 7D 89 03 A6 */ mtctr r12
@@ -81,8 +81,8 @@ daNocrm_c_NS_execute:
/* 801452E8 00142228 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 801452EC 0014222C 93 C1 00 38 */ stw r30, 0x38(r1)
/* 801452F0 00142230 7C 7F 1B 78 */ mr r31, r3
/* 801452F4 00142234 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801452F8 00142238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801452F4 00142234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801452F8 00142238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801452FC 0014223C 83 C3 5D AC */ lwz r30, 0x5dac(r3)
/* 80145300 00142240 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
/* 80145304 00142244 D0 01 00 20 */ stfs f0, 0x20(r1)
@@ -97,8 +97,8 @@ daNocrm_c_NS_execute:
/* 80145328 00142268 4E 80 04 21 */ bctrl
/* 8014532C 0014226C 28 03 00 00 */ cmplwi r3, 0
/* 80145330 00142270 41 82 00 1C */ beq lbl_8014534C
/* 80145334 00142274 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80145338 00142278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80145334 00142274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80145338 00142278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8014533C 0014227C 80 63 5D B8 */ lwz r3, 0x5db8(r3)
/* 80145340 00142280 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
/* 80145344 00142284 D0 01 00 24 */ stfs f0, 0x24(r1)
@@ -151,8 +151,8 @@ lbl_801453E8:
/* 801453F4 00142334 88 1F 05 CA */ lbz r0, 0x5ca(r31)
/* 801453F8 00142338 28 00 00 00 */ cmplwi r0, 0
/* 801453FC 0014233C 41 82 00 28 */ beq lbl_80145424
/* 80145400 00142340 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80145404 00142344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80145400 00142340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80145404 00142344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80145408 00142348 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 8014540C 0014234C 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 80145410 00142350 7D 89 03 A6 */ mtctr r12
@@ -198,8 +198,8 @@ lbl_8014548C:
/* 80145494 001423D4 38 81 00 14 */ addi r4, r1, 0x14
/* 80145498 001423D8 38 A1 00 08 */ addi r5, r1, 8
/* 8014549C 001423DC 48 20 18 D1 */ bl PSMTXMultVec
/* 801454A0 001423E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801454A4 001423E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801454A0 001423E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801454A4 001423E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801454A8 001423E8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801454AC 001423EC 38 81 00 08 */ addi r4, r1, 8
/* 801454B0 001423F0 A8 BE 04 E6 */ lha r5, 0x4e6(r30)
@@ -258,8 +258,8 @@ lbl_80145540:
/* 80145560 001424A0 48 20 18 0D */ bl PSMTXMultVec
/* 80145564 001424A4 38 61 00 08 */ addi r3, r1, 8
/* 80145568 001424A8 4B ED 87 55 */ bl fopAcM_gc_c_NS_gndCheck
/* 8014556C 001424AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80145570 001424B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8014556C 001424AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80145570 001424B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80145574 001424B4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80145578 001424B8 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha
/* 8014557C 001424BC 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l
asm/d/a/npc/d_a_npc_cd.s
+16 -16
View File
@@ -266,8 +266,8 @@ lbl_80156384:
/* 80156394 001532D4 7C 84 02 14 */ add r4, r4, r0
/* 80156398 001532D8 80 84 00 04 */ lwz r4, 4(r4)
lbl_8015639C:
/* 8015639C 001532DC 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801563A0 001532E0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 8015639C 001532DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801563A0 001532E0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801563A4 001532E4 3C A5 00 02 */ addis r5, r5, 2
/* 801563A8 001532E8 38 C0 00 80 */ li r6, 0x80
/* 801563AC 001532EC 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -892,8 +892,8 @@ lbl_80156CD4:
/* 80156D28 00153C68 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80156D2C 00153C6C 93 C1 00 08 */ stw r30, 8(r1)
/* 80156D30 00153C70 7C 7E 1B 78 */ mr r30, r3
/* 80156D34 00153C74 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80156D38 00153C78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80156D34 00153C74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80156D38 00153C78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80156D3C 00153C7C 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 80156D40 00153C80 7F E3 FB 78 */ mr r3, r31
/* 80156D44 00153C84 38 9E 07 24 */ addi r4, r30, 0x724
@@ -914,8 +914,8 @@ lbl_80156CD4:
/* 80156D80 00153CC0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80156D84 00153CC4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80156D88 00153CC8 7C 7F 1B 78 */ mr r31, r3
/* 80156D8C 00153CCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80156D90 00153CD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80156D8C 00153CCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80156D90 00153CD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80156D94 00153CD4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80156D98 00153CD8 38 9F 07 24 */ addi r4, r31, 0x724
/* 80156D9C 00153CDC 4B F1 E3 65 */ bl dBgS_NS_GetRoomId
@@ -1085,8 +1085,8 @@ lbl_80156FF0:
/* 8015700C 00153F4C 88 1F 09 E8 */ lbz r0, 0x9e8(r31)
/* 80157010 00153F50 28 00 00 00 */ cmplwi r0, 0
/* 80157014 00153F54 41 82 00 24 */ beq lbl_80157038
/* 80157018 00153F58 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015701C 00153F5C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80157018 00153F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015701C 00153F5C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80157020 00153F60 80 04 5F 88 */ lwz r0, 0x5f88(r4)
/* 80157024 00153F64 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80157028 00153F68 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1099,8 +1099,8 @@ lbl_80157038:
/* 80157040 00153F80 88 1F 09 E8 */ lbz r0, 0x9e8(r31)
/* 80157044 00153F84 28 00 00 00 */ cmplwi r0, 0
/* 80157048 00153F88 41 82 00 24 */ beq lbl_8015706C
/* 8015704C 00153F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80157050 00153F90 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 8015704C 00153F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80157050 00153F90 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80157054 00153F94 80 04 5F 80 */ lwz r0, 0x5f80(r4)
/* 80157058 00153F98 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 8015705C 00153F9C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1376,8 +1376,8 @@ daNpcCd_c_NS_setHitodamaParticle:
/* 80157444 00154384 3B E0 00 00 */ li r31, 0
/* 80157448 00154388 3B A0 00 00 */ li r29, 0
/* 8015744C 0015438C 3B 80 00 00 */ li r28, 0
/* 80157450 00154390 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80157454 00154394 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l
/* 80157450 00154390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80157454 00154394 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l
lbl_80157458:
/* 80157458 00154398 80 7A 5D 3C */ lwz r3, 0x5d3c(r26)
/* 8015745C 0015439C 38 00 00 FF */ li r0, 0xff
@@ -1450,8 +1450,8 @@ daNpcCd_c_NS_getNpcMdlDataP:
lbl_80157558:
/* 80157558 00154498 80 65 00 00 */ lwz r3, 0(r5)
/* 8015755C 0015449C 80 85 00 04 */ lwz r4, 4(r5)
/* 80157560 001544A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80157564 001544A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80157560 001544A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80157564 001544A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80157568 001544A8 3C A5 00 02 */ addis r5, r5, 2
/* 8015756C 001544AC 38 C0 00 80 */ li r6, 0x80
/* 80157570 001544B0 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1482,8 +1482,8 @@ lbl_801575C0:
/* 801575C4 00154504 2C 04 00 00 */ cmpwi r4, 0
/* 801575C8 00154508 40 81 00 24 */ ble lbl_801575EC
/* 801575CC 0015450C 80 63 00 00 */ lwz r3, 0(r3)
/* 801575D0 00154510 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801575D4 00154514 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801575D0 00154510 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801575D4 00154514 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801575D8 00154518 3C A5 00 02 */ addis r5, r5, 2
/* 801575DC 0015451C 38 C0 00 80 */ li r6, 0x80
/* 801575E0 00154520 38 A5 C2 F8 */ addi r5, r5, -15624
asm/d/a/npc/d_a_npc_cd2.s
+24 -24
View File
@@ -225,8 +225,8 @@ lbl_80157FC8:
/* 80157FD0 00154F10 38 80 00 05 */ li r4, 5
lbl_80157FD4:
/* 80157FD4 00154F14 7F C3 F3 78 */ mr r3, r30
/* 80157FD8 00154F18 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80157FDC 00154F1C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80157FD8 00154F18 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80157FDC 00154F1C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80157FE0 00154F20 3C A5 00 02 */ addis r5, r5, 2
/* 80157FE4 00154F24 38 C0 00 80 */ li r6, 0x80
/* 80157FE8 00154F28 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -531,8 +531,8 @@ lbl_801583E4:
/* 801583EC 0015532C 38 60 00 00 */ li r3, 0
/* 801583F0 00155330 48 00 00 1C */ b lbl_8015840C
lbl_801583F4:
/* 801583F4 00155334 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801583F8 00155338 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801583F4 00155334 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801583F8 00155338 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801583FC 0015533C 3C A5 00 02 */ addis r5, r5, 2
/* 80158400 00155340 38 C0 00 80 */ li r6, 0x80
/* 80158404 00155344 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1162,8 +1162,8 @@ lbl_80158D40:
/* 80158D94 00155CD4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80158D98 00155CD8 93 C1 00 08 */ stw r30, 8(r1)
/* 80158D9C 00155CDC 7C 7E 1B 78 */ mr r30, r3
/* 80158DA0 00155CE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80158DA4 00155CE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80158DA0 00155CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80158DA4 00155CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80158DA8 00155CE8 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 80158DAC 00155CEC 7F E3 FB 78 */ mr r3, r31
/* 80158DB0 00155CF0 38 9E 07 28 */ addi r4, r30, 0x728
@@ -1184,8 +1184,8 @@ lbl_80158D40:
/* 80158DEC 00155D2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80158DF0 00155D30 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80158DF4 00155D34 7C 7F 1B 78 */ mr r31, r3
/* 80158DF8 00155D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80158DFC 00155D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80158DF8 00155D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80158DFC 00155D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80158E00 00155D40 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80158E04 00155D44 38 9F 07 28 */ addi r4, r31, 0x728
/* 80158E08 00155D48 4B F1 C2 F9 */ bl dBgS_NS_GetRoomId
@@ -1432,8 +1432,8 @@ lbl_80159178:
/* 80159194 001560D4 88 1F 0A C6 */ lbz r0, 0xac6(r31)
/* 80159198 001560D8 28 00 00 00 */ cmplwi r0, 0
/* 8015919C 001560DC 41 82 00 24 */ beq lbl_801591C0
/* 801591A0 001560E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801591A4 001560E4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 801591A0 001560E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801591A4 001560E4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 801591A8 001560E8 80 04 5F 88 */ lwz r0, 0x5f88(r4)
/* 801591AC 001560EC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 801591B0 001560F0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1467,8 +1467,8 @@ lbl_80159214:
/* 80159214 00156154 88 1F 0A C6 */ lbz r0, 0xac6(r31)
/* 80159218 00156158 28 00 00 00 */ cmplwi r0, 0
/* 8015921C 0015615C 41 82 00 24 */ beq lbl_80159240
/* 80159220 00156160 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80159224 00156164 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80159220 00156160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80159224 00156164 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80159228 00156168 80 04 5F 80 */ lwz r0, 0x5f80(r4)
/* 8015922C 0015616C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80159230 00156170 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1748,8 +1748,8 @@ daNpcCd2_c_NS_setHitodamaParticle:
/* 80159628 00156568 3B E0 00 00 */ li r31, 0
/* 8015962C 0015656C 3B A0 00 00 */ li r29, 0
/* 80159630 00156570 3B 80 00 00 */ li r28, 0
/* 80159634 00156574 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80159638 00156578 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l
/* 80159634 00156574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80159638 00156578 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l
lbl_8015963C:
/* 8015963C 0015657C 80 7A 5D 3C */ lwz r3, 0x5d3c(r26)
/* 80159640 00156580 38 00 00 FF */ li r0, 0xff
@@ -1861,8 +1861,8 @@ lbl_801597A8:
/* 801597D0 00156710 7C 7F 1B 78 */ mr r31, r3
/* 801597D4 00156714 38 00 00 00 */ li r0, 0
/* 801597D8 00156718 90 0D 8A 84 */ stw r0, lbl_80451004-_SDA_BASE_(r13)
/* 801597DC 0015671C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801597E0 00156720 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801597DC 0015671C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801597E0 00156720 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801597E4 00156724 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 801597E8 00156728 4B EC 0F 29 */ bl fopAcM_searchActorAngleY
/* 801597EC 0015672C B0 6D 8A 8C */ sth r3, lbl_8045100C-_SDA_BASE_(r13)
@@ -1886,8 +1886,8 @@ lbl_801597A8:
/* 8015982C 0015676C 39 61 00 20 */ addi r11, r1, 0x20
/* 80159830 00156770 48 20 89 AD */ bl _savegpr_29
/* 80159834 00156774 7C 7D 1B 78 */ mr r29, r3
/* 80159838 00156778 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015983C 0015677C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80159838 00156778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015983C 0015677C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80159840 00156780 80 7F 5D AC */ lwz r3, 0x5dac(r31)
/* 80159844 00156784 C0 3D 04 D4 */ lfs f1, 0x4d4(r29)
/* 80159848 00156788 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
@@ -1952,8 +1952,8 @@ daNpcCd2_c_NS_getNpcMdlDataP:
lbl_8015991C:
/* 8015991C 0015685C 80 65 00 00 */ lwz r3, 0(r5)
/* 80159920 00156860 80 85 00 04 */ lwz r4, 4(r5)
/* 80159924 00156864 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159928 00156868 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159924 00156864 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159928 00156868 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015992C 0015686C 3C A5 00 02 */ addis r5, r5, 2
/* 80159930 00156870 38 C0 00 80 */ li r6, 0x80
/* 80159934 00156874 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1984,8 +1984,8 @@ lbl_80159984:
/* 80159988 001568C8 2C 04 00 00 */ cmpwi r4, 0
/* 8015998C 001568CC 40 81 00 24 */ ble lbl_801599B0
/* 80159990 001568D0 80 63 00 00 */ lwz r3, 0(r3)
/* 80159994 001568D4 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159998 001568D8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159994 001568D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159998 001568D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015999C 001568DC 3C A5 00 02 */ addis r5, r5, 2
/* 801599A0 001568E0 38 C0 00 80 */ li r6, 0x80
/* 801599A4 001568E4 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -2018,8 +2018,8 @@ lbl_801599F8:
/* 801599FC 0015693C 2C 04 FF FF */ cmpwi r4, -1
/* 80159A00 00156940 41 82 00 24 */ beq lbl_80159A24
/* 80159A04 00156944 80 63 00 00 */ lwz r3, 0(r3)
/* 80159A08 00156948 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159A0C 0015694C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159A08 00156948 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159A0C 0015694C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80159A10 00156950 3C A5 00 02 */ addis r5, r5, 2
/* 80159A14 00156954 38 C0 00 80 */ li r6, 0x80
/* 80159A18 00156958 38 A5 C2 F8 */ addi r5, r5, -15624
asm/d/a/obj/d_a_obj_item.s
+86 -86
View File
@@ -18,8 +18,8 @@ Reflect:
/* 8015ADF4 00157D34 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 8015ADF8 00157D38 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 8015ADFC 00157D3C 90 01 00 5C */ stw r0, 0x5c(r1)
/* 8015AE00 00157D40 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015AE04 00157D44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015AE00 00157D40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015AE04 00157D44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015AE08 00157D48 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8015AE0C 00157D4C 38 A1 00 4C */ addi r5, r1, 0x4c
/* 8015AE10 00157D50 4B F1 99 35 */ bl cBgS_NS_GetTriPla
@@ -351,8 +351,8 @@ itemGetCoCallBack:
/* 8015B27C 001581BC 41 82 00 8C */ beq lbl_8015B308
/* 8015B280 001581C0 28 1E 00 00 */ cmplwi r30, 0
/* 8015B284 001581C4 41 82 00 84 */ beq lbl_8015B308
/* 8015B288 001581C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B28C 001581CC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 8015B288 001581C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B28C 001581CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 8015B290 001581D0 80 64 5D B4 */ lwz r3, 0x5db4(r4)
/* 8015B294 001581D4 A8 03 00 08 */ lha r0, 8(r3)
/* 8015B298 001581D8 A8 7E 00 08 */ lha r3, 8(r30)
@@ -373,8 +373,8 @@ lbl_8015B2D0:
/* 8015B2D0 00158210 A8 1E 00 08 */ lha r0, 8(r30)
/* 8015B2D4 00158214 2C 00 00 EE */ cmpwi r0, 0xee
/* 8015B2D8 00158218 40 82 00 30 */ bne lbl_8015B308
/* 8015B2DC 0015821C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B2E0 00158220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B2DC 0015821C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B2E0 00158220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015B2E4 00158224 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 8015B2E8 00158228 81 83 06 28 */ lwz r12, 0x628(r3)
/* 8015B2EC 0015822C 81 8C 01 88 */ lwz r12, 0x188(r12)
@@ -417,8 +417,8 @@ lbl_8015B364:
/* 8015B36C 001582AC 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf
/* 8015B370 001582B0 41 82 00 3C */ beq lbl_8015B3AC
lbl_8015B374:
/* 8015B374 001582B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B378 001582B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B374 001582B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B378 001582B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015B37C 001582BC 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 8015B380 001582C0 28 00 00 00 */ cmplwi r0, 0
/* 8015B384 001582C4 40 82 00 3C */ bne lbl_8015B3C0
@@ -582,8 +582,8 @@ lbl_8015B5B8:
/* 8015B5C0 00158500 80 9F 09 3C */ lwz r4, 0x93c(r31)
/* 8015B5C4 00158504 2C 04 00 FF */ cmpwi r4, 0xff
/* 8015B5C8 00158508 41 82 00 3C */ beq lbl_8015B604
/* 8015B5CC 0015850C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B5D0 00158510 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B5CC 0015850C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B5D0 00158510 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015B5D4 00158514 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015B5D8 00158518 7C 05 07 74 */ extsb r5, r0
/* 8015B5DC 0015851C 4B ED 9D 85 */ bl isSwitch__10dSv_info_cCFii
@@ -624,8 +624,8 @@ lbl_8015B65C:
/* 8015B65C 0015859C 80 1F 09 9C */ lwz r0, 0x99c(r31)
/* 8015B660 001585A0 28 00 00 00 */ cmplwi r0, 0
/* 8015B664 001585A4 40 82 00 54 */ bne lbl_8015B6B8
/* 8015B668 001585A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B66C 001585AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B668 001585A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B66C 001585AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015B670 001585B0 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 8015B674 001585B4 38 1F 09 98 */ addi r0, r31, 0x998
/* 8015B678 001585B8 90 01 00 08 */ stw r0, 8(r1)
@@ -660,8 +660,8 @@ lbl_8015B6B8:
/* 8015B6E8 00158628 C0 1F 05 00 */ lfs f0, 0x500(r31)
/* 8015B6EC 0015862C D0 01 00 28 */ stfs f0, 0x28(r1)
/* 8015B6F0 00158630 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015B6F4 00158634 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015B6F8 00158638 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015B6F4 00158634 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015B6F8 00158638 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015B6FC 0015863C 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015B700 00158640 4B F1 B3 AD */ bl dBgS_Acch_NS_CrrPos
/* 8015B704 00158644 80 1F 05 B8 */ lwz r0, 0x5b8(r31)
@@ -832,8 +832,8 @@ lbl_8015B948:
/* 8015B96C 001588AC 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 8015B970 001588B0 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f
/* 8015B974 001588B4 90 1F 09 20 */ stw r0, 0x920(r31)
/* 8015B978 001588B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015B97C 001588BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015B978 001588B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015B97C 001588BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015B980 001588C0 80 9F 09 20 */ lwz r4, 0x920(r31)
/* 8015B984 001588C4 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015B988 001588C8 7C 05 07 74 */ extsb r5, r0
@@ -1001,8 +1001,8 @@ lbl_8015BBC4:
/* 8015BBD4 00158B14 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb
/* 8015BBD8 00158B18 40 82 00 2C */ bne lbl_8015BC04
/* 8015BBDC 00158B1C 7F E3 FB 78 */ mr r3, r31
/* 8015BBE0 00158B20 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015BBE4 00158B24 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015BBE0 00158B20 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015BBE4 00158B24 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015BBE8 00158B28 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 8015BBEC 00158B2C 4B EB EB F5 */ bl fopAcM_searchActorDistance
/* 8015BBF0 00158B30 C0 02 9B 90 */ lfs f0, lbl_80453590-_SDA2_BASE_(r2)
@@ -1045,8 +1045,8 @@ lbl_8015BC54:
/* 8015BC7C 00158BBC 38 81 00 08 */ addi r4, r1, 8
/* 8015BC80 00158BC0 7C 85 23 78 */ mr r5, r4
/* 8015BC84 00158BC4 48 1E B0 E9 */ bl PSMTXMultVec
/* 8015BC88 00158BC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015BC8C 00158BCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015BC88 00158BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015BC8C 00158BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015BC90 00158BD0 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 8015BC94 00158BD4 28 1F 00 00 */ cmplwi r31, 0
/* 8015BC98 00158BD8 41 82 00 0C */ beq lbl_8015BCA4
@@ -1267,8 +1267,8 @@ lbl_8015BF9C:
/* 8015BF9C 00158EDC 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015BFA0 00158EE0 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015BFA4 00158EE4 48 11 32 39 */ bl cM3dGCyl_NS_SetC
/* 8015BFA8 00158EE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015BFAC 00158EEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015BFA8 00158EE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015BFAC 00158EEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015BFB0 00158EF0 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015BFB4 00158EF4 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015BFB8 00158EF8 48 10 8B F1 */ bl cCcS_NS_Set
@@ -1322,8 +1322,8 @@ daItem_c_NS_procInitSimpleGetDemo:
/* 8015C060 00158FA0 90 01 00 24 */ stw r0, 0x24(r1)
/* 8015C064 00158FA4 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8015C068 00158FA8 7C 7F 1B 78 */ mr r31, r3
/* 8015C06C 00158FAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C070 00158FB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C06C 00158FAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C070 00158FB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C074 00158FB4 80 83 5D AC */ lwz r4, 0x5dac(r3)
/* 8015C078 00158FB8 38 61 00 08 */ addi r3, r1, 8
/* 8015C07C 00158FBC 48 00 1F 5D */ bl daPy_py_c_NS_getItemPos
@@ -1380,8 +1380,8 @@ daItem_c_NS_procMainSimpleGetDemo:
/* 8015C13C 0015907C 90 01 00 34 */ stw r0, 0x34(r1)
/* 8015C140 00159080 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 8015C144 00159084 7C 7F 1B 78 */ mr r31, r3
/* 8015C148 00159088 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C14C 0015908C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C148 00159088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C14C 0015908C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C150 00159090 80 83 5D AC */ lwz r4, 0x5dac(r3)
/* 8015C154 00159094 38 61 00 08 */ addi r3, r1, 8
/* 8015C158 00159098 48 00 1E 81 */ bl daPy_py_c_NS_getItemPos
@@ -1405,8 +1405,8 @@ daItem_c_NS_procMainSimpleGetDemo:
/* 8015C1A0 001590E0 40 80 00 08 */ bge lbl_8015C1A8
/* 8015C1A4 001590E4 D0 3F 04 D4 */ stfs f1, 0x4d4(r31)
lbl_8015C1A8:
/* 8015C1A8 001590E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C1AC 001590EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C1A8 001590E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C1AC 001590EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C1B0 001590F0 80 63 5D 74 */ lwz r3, 0x5d74(r3)
/* 8015C1B4 001590F4 A8 03 02 30 */ lha r0, 0x230(r3)
/* 8015C1B8 001590F8 B0 1F 04 E4 */ sth r0, 0x4e4(r31)
@@ -1489,8 +1489,8 @@ lbl_8015C240:
/* 8015C2D4 00159214 3C 04 00 01 */ addis r0, r4, 1
/* 8015C2D8 00159218 28 00 FF FF */ cmplwi r0, 0xffff
/* 8015C2DC 0015921C 41 82 00 C8 */ beq lbl_8015C3A4
/* 8015C2E0 00159220 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C2E4 00159224 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C2E0 00159220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C2E4 00159224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C2E8 00159228 38 63 4E C8 */ addi r3, r3, 0x4ec8
/* 8015C2EC 0015922C 4B EE 74 01 */ bl dEvt_control_c_NS_setPtI_Id
/* 8015C2F0 00159230 48 00 00 B4 */ b lbl_8015C3A4
@@ -1512,7 +1512,7 @@ lbl_8015C31C:
/* 8015C328 00159268 41 82 00 18 */ beq lbl_8015C340
/* 8015C32C 0015926C 88 7E 09 2A */ lbz r3, 0x92a(r30)
/* 8015C330 00159270 38 80 00 01 */ li r4, 1
/* 8015C334 00159274 4B F3 BB AD */ bl checkItemGet
/* 8015C334 00159274 4B F3 BB AD */ bl checkItemGet__FUci
/* 8015C338 00159278 2C 03 00 00 */ cmpwi r3, 0
/* 8015C33C 0015927C 41 82 00 4C */ beq lbl_8015C388
lbl_8015C340:
@@ -1520,7 +1520,7 @@ lbl_8015C340:
/* 8015C344 00159284 4B EB D9 75 */ bl fopAcM_delete_X1_
/* 8015C348 00159288 88 7E 09 2A */ lbz r3, 0x92a(r30)
/* 8015C34C 0015928C 38 80 00 01 */ li r4, 1
/* 8015C350 00159290 4B F3 BB 91 */ bl checkItemGet
/* 8015C350 00159290 4B F3 BB 91 */ bl checkItemGet__FUci
/* 8015C354 00159294 7C 7F 1B 78 */ mr r31, r3
/* 8015C358 00159298 7F C3 F3 78 */ mr r3, r30
/* 8015C35C 0015929C 4B FF FC FD */ bl daItem_c_NS_procInitSimpleGetDemo
@@ -1528,8 +1528,8 @@ lbl_8015C340:
/* 8015C364 001592A4 48 00 0D 45 */ bl daItem_c_NS_itemGet
/* 8015C368 001592A8 2C 1F 00 00 */ cmpwi r31, 0
/* 8015C36C 001592AC 40 82 00 38 */ bne lbl_8015C3A4
/* 8015C370 001592B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C374 001592B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C370 001592B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C374 001592B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C378 001592B8 38 63 00 CC */ addi r3, r3, 0xcc
/* 8015C37C 001592BC 88 9E 09 2A */ lbz r4, 0x92a(r30)
/* 8015C380 001592C0 4B ED 7B 15 */ bl offFirstBit__21dSv_player_get_item_cFUc
@@ -1555,8 +1555,8 @@ lbl_8015C3A4:
/* 8015C3C8 00159308 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015C3CC 0015930C 93 C1 00 08 */ stw r30, 8(r1)
/* 8015C3D0 00159310 7C 7E 1B 78 */ mr r30, r3
/* 8015C3D4 00159314 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C3D8 00159318 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 8015C3D4 00159314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C3D8 00159318 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 8015C3DC 0015931C 38 7F 4F F8 */ addi r3, r31, 0x4ff8
/* 8015C3E0 00159320 3C 80 80 39 */ lis r4, lbl_80393D88@ha
/* 8015C3E4 00159324 38 84 3D 88 */ addi r4, r4, lbl_80393D88@l
@@ -1645,8 +1645,8 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C520 00159460 39 61 00 20 */ addi r11, r1, 0x20
/* 8015C524 00159464 48 20 5C B9 */ bl _savegpr_29
/* 8015C528 00159468 7C 7D 1B 78 */ mr r29, r3
/* 8015C52C 0015946C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C530 00159470 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 8015C52C 0015946C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C530 00159470 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 8015C534 00159474 83 DF 5D AC */ lwz r30, 0x5dac(r31)
/* 8015C538 00159478 38 7D 09 60 */ addi r3, r29, 0x960
/* 8015C53C 0015947C 38 9D 04 D0 */ addi r4, r29, 0x4d0
@@ -1676,8 +1676,8 @@ lbl_8015C594:
/* 8015C598 001594D8 4B FF F8 C9 */ bl daItem_c_NS_procInitNormal
lbl_8015C59C:
/* 8015C59C 001594DC 38 7D 05 8C */ addi r3, r29, 0x58c
/* 8015C5A0 001594E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015C5A4 001594E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015C5A0 001594E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015C5A4 001594E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015C5A8 001594E8 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015C5AC 001594EC 4B F1 A5 01 */ bl dBgS_Acch_NS_CrrPos
/* 8015C5B0 001594F0 38 7D 09 60 */ addi r3, r29, 0x960
@@ -1686,8 +1686,8 @@ lbl_8015C59C:
/* 8015C5BC 001594FC 38 7D 09 04 */ addi r3, r29, 0x904
/* 8015C5C0 00159500 38 9D 04 D0 */ addi r4, r29, 0x4d0
/* 8015C5C4 00159504 48 11 2C 19 */ bl cM3dGCyl_NS_SetC
/* 8015C5C8 00159508 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C5CC 0015950C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C5C8 00159508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C5CC 0015950C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C5D0 00159510 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015C5D4 00159514 38 9D 07 E0 */ addi r4, r29, 0x7e0
/* 8015C5D8 00159518 48 10 85 D1 */ bl cCcS_NS_Set
@@ -1728,8 +1728,8 @@ lbl_8015C62C:
/* 8015C650 00159590 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015C654 00159594 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015C658 00159598 7C 7F 1B 78 */ mr r31, r3
/* 8015C65C 0015959C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C660 001595A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C65C 0015959C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C660 001595A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C664 001595A4 80 9F 09 3C */ lwz r4, 0x93c(r31)
/* 8015C668 001595A8 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015C66C 001595AC 7C 05 07 74 */ extsb r5, r0
@@ -1737,8 +1737,8 @@ lbl_8015C62C:
/* 8015C674 001595B4 2C 03 00 00 */ cmpwi r3, 0
/* 8015C678 001595B8 41 82 00 7C */ beq lbl_8015C6F4
/* 8015C67C 001595BC 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015C680 001595C0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015C684 001595C4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015C680 001595C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015C684 001595C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015C688 001595C8 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015C68C 001595CC 4B F1 A4 21 */ bl dBgS_Acch_NS_CrrPos
/* 8015C690 001595D0 80 1F 05 B8 */ lwz r0, 0x5b8(r31)
@@ -1851,8 +1851,8 @@ lbl_8015C78C:
/* 8015C810 00159750 4B FF F6 51 */ bl daItem_c_NS_procInitNormal
/* 8015C814 00159754 48 00 02 6C */ b lbl_8015CA80
lbl_8015C818:
/* 8015C818 00159758 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015C81C 0015975C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C818 00159758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C81C 0015975C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C820 00159760 83 C3 5D AC */ lwz r30, 0x5dac(r3)
/* 8015C824 00159764 7F C3 F3 78 */ mr r3, r30
/* 8015C828 00159768 81 9E 06 28 */ lwz r12, 0x628(r30)
@@ -2022,8 +2022,8 @@ lbl_8015CA80:
/* 8015CA80 001599C0 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015CA84 001599C4 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015CA88 001599C8 48 11 27 55 */ bl cM3dGCyl_NS_SetC
/* 8015CA8C 001599CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015CA90 001599D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015CA8C 001599CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CA90 001599D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015CA94 001599D4 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015CA98 001599D8 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015CA9C 001599DC 48 10 81 0D */ bl cCcS_NS_Set
@@ -2081,8 +2081,8 @@ lbl_8015CB44:
/* 8015CB58 00159A98 40 82 00 74 */ bne lbl_8015CBCC
/* 8015CB5C 00159A9C 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b
/* 8015CB60 00159AA0 40 82 00 6C */ bne lbl_8015CBCC
/* 8015CB64 00159AA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015CB68 00159AA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015CB64 00159AA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CB68 00159AA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015CB6C 00159AAC 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8015CB70 00159AB0 38 9E 06 7C */ addi r4, r30, 0x67c
/* 8015CB74 00159AB4 4B F1 7F CD */ bl dBgS_NS_ChkMoveBG_NoDABg
@@ -2261,8 +2261,8 @@ lbl_8015CDAC:
/* 8015CDD8 00159D18 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015CDDC 00159D1C 7C 7F 1B 78 */ mr r31, r3
/* 8015CDE0 00159D20 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015CDE4 00159D24 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015CDE8 00159D28 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015CDE4 00159D24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015CDE8 00159D28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015CDEC 00159D2C 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015CDF0 00159D30 4B F1 9C BD */ bl dBgS_Acch_NS_CrrPos
/* 8015CDF4 00159D34 80 1F 05 B8 */ lwz r0, 0x5b8(r31)
@@ -2376,8 +2376,8 @@ lbl_8015CF68:
/* 8015CF74 00159EB4 48 00 01 35 */ bl daItem_c_NS_itemGet
/* 8015CF78 00159EB8 48 00 00 C4 */ b lbl_8015D03C
lbl_8015CF7C:
/* 8015CF7C 00159EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015CF80 00159EC0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 8015CF7C 00159EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CF80 00159EC0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 8015CF84 00159EC4 80 7E 5D AC */ lwz r3, 0x5dac(r30)
/* 8015CF88 00159EC8 81 83 06 28 */ lwz r12, 0x628(r3)
/* 8015CF8C 00159ECC 81 8C 01 90 */ lwz r12, 0x190(r12)
@@ -2395,7 +2395,7 @@ lbl_8015CF7C:
lbl_8015CFBC:
/* 8015CFBC 00159EFC 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015CFC0 00159F00 38 80 00 01 */ li r4, 1
/* 8015CFC4 00159F04 4B F3 AF 1D */ bl checkItemGet
/* 8015CFC4 00159F04 4B F3 AF 1D */ bl checkItemGet__FUci
/* 8015CFC8 00159F08 2C 03 00 00 */ cmpwi r3, 0
/* 8015CFCC 00159F0C 41 82 00 08 */ beq lbl_8015CFD4
/* 8015CFD0 00159F10 3B A0 00 01 */ li r29, 1
@@ -2406,8 +2406,8 @@ lbl_8015CFD4:
/* 8015CFE0 00159F20 48 00 00 C9 */ bl daItem_c_NS_itemGet
/* 8015CFE4 00159F24 2C 1D 00 00 */ cmpwi r29, 0
/* 8015CFE8 00159F28 40 82 00 54 */ bne lbl_8015D03C
/* 8015CFEC 00159F2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015CFF0 00159F30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015CFEC 00159F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CFF0 00159F30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015CFF4 00159F34 38 63 00 CC */ addi r3, r3, 0xcc
/* 8015CFF8 00159F38 88 9F 09 2A */ lbz r4, 0x92a(r31)
/* 8015CFFC 00159F3C 4B ED 6E 99 */ bl offFirstBit__21dSv_player_get_item_cFUc
@@ -2415,7 +2415,7 @@ lbl_8015CFD4:
lbl_8015D004:
/* 8015D004 00159F44 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D008 00159F48 38 80 00 01 */ li r4, 1
/* 8015D00C 00159F4C 4B F3 AE D5 */ bl checkItemGet
/* 8015D00C 00159F4C 4B F3 AE D5 */ bl checkItemGet__FUci
/* 8015D010 00159F50 2C 03 00 00 */ cmpwi r3, 0
/* 8015D014 00159F54 40 82 00 10 */ bne lbl_8015D024
/* 8015D018 00159F58 7F E3 FB 78 */ mr r3, r31
@@ -2430,8 +2430,8 @@ lbl_8015D024:
lbl_8015D038:
/* 8015D038 00159F78 4B FF F1 C9 */ bl daItem_c_NS_procInitGetDemoEvent
lbl_8015D03C:
/* 8015D03C 00159F7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015D040 00159F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015D03C 00159F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015D040 00159F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015D044 00159F84 80 9F 09 20 */ lwz r4, 0x920(r31)
/* 8015D048 00159F88 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 8015D04C 00159F8C 7C 05 07 74 */ extsb r5, r0
@@ -2509,7 +2509,7 @@ lbl_8015D120:
/* 8015D14C 0015A08C 39 00 00 00 */ li r8, 0
/* 8015D150 0015A090 48 14 E8 35 */ bl Z2SeMgr_NS_seStart
/* 8015D154 0015A094 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D158 0015A098 4B F3 AD 35 */ bl execItemGet
/* 8015D158 0015A098 4B F3 AD 35 */ bl execItemGet__FUc
/* 8015D15C 0015A09C 48 00 02 00 */ b lbl_8015D35C
lbl_8015D160:
/* 8015D160 0015A0A0 38 00 00 70 */ li r0, 0x70
@@ -2526,7 +2526,7 @@ lbl_8015D160:
/* 8015D18C 0015A0CC 39 00 00 00 */ li r8, 0
/* 8015D190 0015A0D0 48 14 E7 F5 */ bl Z2SeMgr_NS_seStart
/* 8015D194 0015A0D4 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D198 0015A0D8 4B F3 AC F5 */ bl execItemGet
/* 8015D198 0015A0D8 4B F3 AC F5 */ bl execItemGet__FUc
/* 8015D19C 0015A0DC 48 00 01 C0 */ b lbl_8015D35C
lbl_8015D1A0:
/* 8015D1A0 0015A0E0 38 00 00 71 */ li r0, 0x71
@@ -2543,7 +2543,7 @@ lbl_8015D1A0:
/* 8015D1CC 0015A10C 39 00 00 00 */ li r8, 0
/* 8015D1D0 0015A110 48 14 E7 B5 */ bl Z2SeMgr_NS_seStart
/* 8015D1D4 0015A114 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D1D8 0015A118 4B F3 AC B5 */ bl execItemGet
/* 8015D1D8 0015A118 4B F3 AC B5 */ bl execItemGet__FUc
/* 8015D1DC 0015A11C 48 00 01 80 */ b lbl_8015D35C
lbl_8015D1E0:
/* 8015D1E0 0015A120 38 00 00 71 */ li r0, 0x71
@@ -2560,7 +2560,7 @@ lbl_8015D1E0:
/* 8015D20C 0015A14C 39 00 00 00 */ li r8, 0
/* 8015D210 0015A150 48 14 E7 75 */ bl Z2SeMgr_NS_seStart
/* 8015D214 0015A154 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D218 0015A158 4B F3 AC 75 */ bl execItemGet
/* 8015D218 0015A158 4B F3 AC 75 */ bl execItemGet__FUc
/* 8015D21C 0015A15C 48 00 01 40 */ b lbl_8015D35C
lbl_8015D220:
/* 8015D220 0015A160 38 00 00 72 */ li r0, 0x72
@@ -2577,7 +2577,7 @@ lbl_8015D220:
/* 8015D24C 0015A18C 39 00 00 00 */ li r8, 0
/* 8015D250 0015A190 48 14 E7 35 */ bl Z2SeMgr_NS_seStart
/* 8015D254 0015A194 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D258 0015A198 4B F3 AC 35 */ bl execItemGet
/* 8015D258 0015A198 4B F3 AC 35 */ bl execItemGet__FUc
/* 8015D25C 0015A19C 48 00 01 00 */ b lbl_8015D35C
lbl_8015D260:
/* 8015D260 0015A1A0 38 00 00 72 */ li r0, 0x72
@@ -2594,7 +2594,7 @@ lbl_8015D260:
/* 8015D28C 0015A1CC 39 00 00 00 */ li r8, 0
/* 8015D290 0015A1D0 48 14 E6 F5 */ bl Z2SeMgr_NS_seStart
/* 8015D294 0015A1D4 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D298 0015A1D8 4B F3 AB F5 */ bl execItemGet
/* 8015D298 0015A1D8 4B F3 AB F5 */ bl execItemGet__FUc
/* 8015D29C 0015A1DC 48 00 00 C0 */ b lbl_8015D35C
lbl_8015D2A0:
/* 8015D2A0 0015A1E0 38 00 00 72 */ li r0, 0x72
@@ -2611,7 +2611,7 @@ lbl_8015D2A0:
/* 8015D2CC 0015A20C 39 00 00 00 */ li r8, 0
/* 8015D2D0 0015A210 48 14 E6 B5 */ bl Z2SeMgr_NS_seStart
/* 8015D2D4 0015A214 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D2D8 0015A218 4B F3 AB B5 */ bl execItemGet
/* 8015D2D8 0015A218 4B F3 AB B5 */ bl execItemGet__FUc
/* 8015D2DC 0015A21C 48 00 00 80 */ b lbl_8015D35C
lbl_8015D2E0:
/* 8015D2E0 0015A220 38 00 00 72 */ li r0, 0x72
@@ -2628,7 +2628,7 @@ lbl_8015D2E0:
/* 8015D30C 0015A24C 39 00 00 00 */ li r8, 0
/* 8015D310 0015A250 48 14 E6 75 */ bl Z2SeMgr_NS_seStart
/* 8015D314 0015A254 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D318 0015A258 4B F3 AB 75 */ bl execItemGet
/* 8015D318 0015A258 4B F3 AB 75 */ bl execItemGet__FUc
/* 8015D31C 0015A25C 48 00 00 40 */ b lbl_8015D35C
lbl_8015D320:
/* 8015D320 0015A260 38 00 00 18 */ li r0, 0x18
@@ -2645,7 +2645,7 @@ lbl_8015D320:
/* 8015D34C 0015A28C 39 00 00 00 */ li r8, 0
/* 8015D350 0015A290 48 14 E6 35 */ bl Z2SeMgr_NS_seStart
/* 8015D354 0015A294 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015D358 0015A298 4B F3 AB 35 */ bl execItemGet
/* 8015D358 0015A298 4B F3 AB 35 */ bl execItemGet__FUc
lbl_8015D35C:
/* 8015D35C 0015A29C 83 E1 00 3C */ lwz r31, 0x3c(r1)
/* 8015D360 0015A2A0 80 01 00 44 */ lwz r0, 0x44(r1)
@@ -2666,8 +2666,8 @@ lbl_8015D384:
/* 8015D38C 0015A2CC 41 82 00 08 */ beq lbl_8015D394
/* 8015D390 0015A2D0 38 C0 00 00 */ li r6, 0
lbl_8015D394:
/* 8015D394 0015A2D4 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015D398 0015A2D8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015D394 0015A2D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015D398 0015A2D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015D39C 0015A2DC 88 04 4F AD */ lbz r0, 0x4fad(r4)
/* 8015D3A0 0015A2E0 28 00 00 00 */ cmplwi r0, 0
/* 8015D3A4 0015A2E4 41 82 00 08 */ beq lbl_8015D3AC
@@ -2720,8 +2720,8 @@ daItem_c_NS_checkYogan:
/* 8015D43C 0015A37C EC 01 00 2A */ fadds f0, f1, f0
/* 8015D440 0015A380 FC 02 00 40 */ fcmpo cr0, f2, f0
/* 8015D444 0015A384 40 81 00 28 */ ble lbl_8015D46C
/* 8015D448 0015A388 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015D44C 0015A38C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015D448 0015A388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015D44C 0015A38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015D450 0015A390 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8015D454 0015A394 38 9F 07 0C */ addi r4, r31, 0x70c
/* 8015D458 0015A398 4B F1 79 F9 */ bl dBgS_NS_GetPolyAtt0
@@ -2758,8 +2758,8 @@ daItem_c_NS_itemActionForRupee:
/* 8015D4B8 0015A3F8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015D4BC 0015A3FC 7C 7F 1B 78 */ mr r31, r3
/* 8015D4C0 0015A400 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015D4C4 0015A404 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015D4C8 0015A408 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015D4C4 0015A404 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015D4C8 0015A408 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015D4CC 0015A40C 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015D4D0 0015A410 4B F1 95 DD */ bl dBgS_Acch_NS_CrrPos
/* 8015D4D4 0015A414 7F E3 FB 78 */ mr r3, r31
@@ -2828,8 +2828,8 @@ daItem_c_NS_itemActionForHeart:
/* 8015D5B4 0015A4F4 D0 1F 05 00 */ stfs f0, 0x500(r31)
lbl_8015D5B8:
/* 8015D5B8 0015A4F8 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015D5BC 0015A4FC 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015D5C0 0015A500 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015D5BC 0015A4FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015D5C0 0015A500 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015D5C4 0015A504 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015D5C8 0015A508 4B F1 94 E5 */ bl dBgS_Acch_NS_CrrPos
/* 8015D5CC 0015A50C 80 7F 05 B8 */ lwz r3, 0x5b8(r31)
@@ -2891,8 +2891,8 @@ daItem_c_NS_itemActionForArrow:
/* 8015D694 0015A5D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015D698 0015A5D8 7C 7F 1B 78 */ mr r31, r3
/* 8015D69C 0015A5DC 38 7F 05 8C */ addi r3, r31, 0x58c
/* 8015D6A0 0015A5E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015D6A4 0015A5E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015D6A0 0015A5E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015D6A4 0015A5E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015D6A8 0015A5E8 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015D6AC 0015A5EC 4B F1 94 01 */ bl dBgS_Acch_NS_CrrPos
/* 8015D6B0 0015A5F0 7F E3 FB 78 */ mr r3, r31
@@ -2922,8 +2922,8 @@ daItem_c_NS_itemActionForBoomerang:
/* 8015D700 0015A640 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015D704 0015A644 7C 08 02 A6 */ mflr r0
/* 8015D708 0015A648 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015D70C 0015A64C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8015D710 0015A650 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8015D70C 0015A64C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015D710 0015A650 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015D714 0015A654 38 84 0F 38 */ addi r4, r4, 0xf38
/* 8015D718 0015A658 38 63 05 8C */ addi r3, r3, 0x58c
/* 8015D71C 0015A65C 4B F1 93 91 */ bl dBgS_Acch_NS_CrrPos
@@ -3148,7 +3148,7 @@ daItem_c_NS_initAction:
/* 8015DA1C 0015A95C 7F E3 FB 78 */ mr r3, r31
/* 8015DA20 0015A960 48 00 04 19 */ bl daItem_c_NS_initAngle
/* 8015DA24 0015A964 88 7F 09 2A */ lbz r3, 0x92a(r31)
/* 8015DA28 0015A968 4B F3 DD 55 */ bl isHeart
/* 8015DA28 0015A968 4B F3 DD 55 */ bl isHeart__FUc
/* 8015DA2C 0015A96C 2C 03 00 00 */ cmpwi r3, 0
/* 8015DA30 0015A970 41 82 00 5C */ beq lbl_8015DA8C
/* 8015DA34 0015A974 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
@@ -3306,8 +3306,8 @@ daItem_c_NS_initSpeed:
/* 8015DC60 0015ABA0 48 20 45 7D */ bl _savegpr_29
/* 8015DC64 0015ABA4 7C 7D 1B 78 */ mr r29, r3
/* 8015DC68 0015ABA8 7C 9E 23 78 */ mr r30, r4
/* 8015DC6C 0015ABAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015DC70 0015ABB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015DC6C 0015ABAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015DC70 0015ABB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015DC74 0015ABB4 83 E3 5D AC */ lwz r31, 0x5dac(r3)
/* 8015DC78 0015ABB8 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
/* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX
asm/d/bg/d_bg_s.s
+12 -12
View File
@@ -746,8 +746,8 @@ dBgS_NS_ChkMoveBG:
/* 80074AC0 00071A00 7C 08 02 A6 */ mflr r0
/* 80074AC4 00071A04 90 01 00 14 */ stw r0, 0x14(r1)
/* 80074AC8 00071A08 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80074ACC 00071A0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80074AD0 00071A10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80074ACC 00071A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80074AD0 00071A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80074AD4 00071A14 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80074AD8 00071A18 4B FF FB 51 */ bl cBgS_NS_GetBgWBasePointer
/* 80074ADC 00071A1C 7C 7F 1B 79 */ or. r31, r3, r3
@@ -784,8 +784,8 @@ dBgS_NS_ChkMoveBG_NoDABg:
/* 80074B40 00071A80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80074B44 00071A84 7C 08 02 A6 */ mflr r0
/* 80074B48 00071A88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80074B4C 00071A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80074B50 00071A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80074B4C 00071A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80074B50 00071A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80074B54 00071A94 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80074B58 00071A98 4B FF FA D1 */ bl cBgS_NS_GetBgWBasePointer
/* 80074B5C 00071A9C 28 03 00 00 */ cmplwi r3, 0
@@ -2098,8 +2098,8 @@ dBgS_CheckBWallPoly:
/* 80075D1C 00072C5C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 80075D20 00072C60 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 80075D24 00072C64 90 01 00 18 */ stw r0, 0x18(r1)
/* 80075D28 00072C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80075D2C 00072C6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80075D28 00072C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80075D2C 00072C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80075D30 00072C70 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80075D34 00072C74 38 A1 00 08 */ addi r5, r1, 8
/* 80075D38 00072C78 4B FF EA 0D */ bl cBgS_NS_GetTriPla
@@ -2131,8 +2131,8 @@ dBgS_CheckBGroundPoly:
/* 80075D8C 00072CCC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 80075D90 00072CD0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 80075D94 00072CD4 90 01 00 18 */ stw r0, 0x18(r1)
/* 80075D98 00072CD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80075D9C 00072CDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80075D98 00072CD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80075D9C 00072CDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80075DA0 00072CE0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80075DA4 00072CE4 38 A1 00 08 */ addi r5, r1, 8
/* 80075DA8 00072CE8 4B FF E9 9D */ bl cBgS_NS_GetTriPla
@@ -2161,8 +2161,8 @@ lbl_80075DDC:
/* 80075DFC 00072D3C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 80075E00 00072D40 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 80075E04 00072D44 90 01 00 18 */ stw r0, 0x18(r1)
/* 80075E08 00072D48 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80075E0C 00072D4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80075E08 00072D48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80075E0C 00072D4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80075E10 00072D50 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80075E14 00072D54 38 A1 00 08 */ addi r5, r1, 8
/* 80075E18 00072D58 4B FF E9 2D */ bl cBgS_NS_GetTriPla
@@ -2194,8 +2194,8 @@ dBgS_GetNY:
/* 80075E6C 00072DAC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 80075E70 00072DB0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 80075E74 00072DB4 90 01 00 18 */ stw r0, 0x18(r1)
/* 80075E78 00072DB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80075E7C 00072DBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80075E78 00072DB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80075E7C 00072DBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80075E80 00072DC0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80075E84 00072DC4 38 A1 00 08 */ addi r5, r1, 8
/* 80075E88 00072DC8 4B FF E8 BD */ bl cBgS_NS_GetTriPla
asm/d/bg/d_bg_w.s
+2 -2
View File
@@ -5696,8 +5696,8 @@ lbl_8007E278:
/* 8007E29C 0007B1DC 88 1F 00 0C */ lbz r0, 0xc(r31)
/* 8007E2A0 0007B1E0 28 00 00 00 */ cmplwi r0, 0
/* 8007E2A4 0007B1E4 41 82 00 38 */ beq lbl_8007E2DC
/* 8007E2A8 0007B1E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8007E2AC 0007B1EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8007E2A8 0007B1E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8007E2AC 0007B1EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8007E2B0 0007B1F0 80 63 5D B8 */ lwz r3, 0x5db8(r3)
/* 8007E2B4 0007B1F4 28 03 00 00 */ cmplwi r3, 0
/* 8007E2B8 0007B1F8 41 82 00 24 */ beq lbl_8007E2DC
asm/d/bg/s/d_bg_s_acch.s
+2 -2
View File
@@ -567,8 +567,8 @@ dBgS_Acch_NS_LineCheck:
/* 80076670 000735B0 D0 01 01 3C */ stfs f0, 0x13c(r1)
/* 80076674 000735B4 C0 03 00 08 */ lfs f0, 8(r3)
/* 80076678 000735B8 D0 01 01 40 */ stfs f0, 0x140(r1)
/* 8007667C 000735BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80076680 000735C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8007667C 000735BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80076680 000735C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80076684 000735C4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80076688 000735C8 38 81 00 FC */ addi r4, r1, 0xfc
/* 8007668C 000735CC 4B FF EE 11 */ bl dBgS_NS_RoofChk
asm/d/bg/s/movebg/d_bg_s_movebg_actor.s
+6 -6
View File
@@ -84,8 +84,8 @@ lbl_80078730:
/* 8007873C 0007567C 41 82 00 58 */ beq lbl_80078794
/* 80078740 00075680 80 6D 89 F0 */ lwz r3, lbl_80450F70-_SDA_BASE_(r13)
/* 80078744 00075684 80 8D 89 F4 */ lwz r4, lbl_80450F74-_SDA_BASE_(r13)
/* 80078748 00075688 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 8007874C 0007568C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80078748 00075688 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 8007874C 0007568C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80078750 00075690 3C A5 00 02 */ addis r5, r5, 2
/* 80078754 00075694 38 C0 00 80 */ li r6, 0x80
/* 80078758 00075698 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -170,8 +170,8 @@ lbl_80078874:
/* 80078874 000757B4 80 9F 05 68 */ lwz r4, 0x568(r31)
/* 80078878 000757B8 28 04 00 00 */ cmplwi r4, 0
/* 8007887C 000757BC 41 82 00 28 */ beq lbl_800788A4
/* 80078880 000757C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80078884 000757C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80078880 000757C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80078884 000757C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80078888 000757C8 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8007888C 000757CC 7F E5 FB 78 */ mr r5, r31
/* 80078890 000757D0 4B FF C1 79 */ bl dBgS_NS_Regist
@@ -212,8 +212,8 @@ lbl_800788C4:
/* 80078914 00075854 48 1E F8 C1 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80078918 00075858 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007891C 0007585C 41 82 00 18 */ beq lbl_80078934
/* 80078920 00075860 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80078924 00075864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80078920 00075860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80078924 00075864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80078928 00075868 38 63 0F 38 */ addi r3, r3, 0xf38
/* 8007892C 0007586C 80 9E 05 68 */ lwz r4, 0x568(r30)
/* 80078930 00075870 4B FF B9 21 */ bl cBgS_NS_Release
asm/d/bg/w/d_bg_w_kcol.s
+2 -2
View File
@@ -470,8 +470,8 @@ lbl_8007ED94:
/* 8007ED94 0007BCD4 88 1F 00 0C */ lbz r0, 0xc(r31)
/* 8007ED98 0007BCD8 28 00 00 00 */ cmplwi r0, 0
/* 8007ED9C 0007BCDC 41 82 00 38 */ beq lbl_8007EDD4
/* 8007EDA0 0007BCE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8007EDA4 0007BCE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8007EDA0 0007BCE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8007EDA4 0007BCE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8007EDA8 0007BCE8 80 63 5D B8 */ lwz r3, 0x5db8(r3)
/* 8007EDAC 0007BCEC 28 03 00 00 */ cmplwi r3, 0
/* 8007EDB0 0007BCF0 41 82 00 24 */ beq lbl_8007EDD4
asm/d/bright/d_bright_check.s
+4 -4
View File
@@ -450,8 +450,8 @@ dBrightCheck_c_NS__draw:
/* 80193598 001904D8 7C 08 02 A6 */ mflr r0
/* 8019359C 001904DC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801935A0 001904E0 7C 66 1B 78 */ mr r6, r3
/* 801935A4 001904E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801935A8 001904E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801935A4 001904E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801935A8 001904E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801935AC 001904EC 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801935B0 001904F0 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801935B4 001904F4 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -464,8 +464,8 @@ dBrightCheck_c_NS__draw:
/* 801935D0 00190510 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801935D4 00190514 7C 08 02 A6 */ mflr r0
/* 801935D8 00190518 90 01 00 14 */ stw r0, 0x14(r1)
/* 801935DC 0019051C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801935E0 00190520 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801935DC 0019051C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801935E0 00190520 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801935E4 00190524 80 84 5F 50 */ lwz r4, 0x5f50(r4)
/* 801935E8 00190528 80 63 00 04 */ lwz r3, 4(r3)
/* 801935EC 0019052C C0 22 A0 00 */ lfs f1, lbl_80453A00-_SDA2_BASE_(r2)

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